Improve URLToPath (#408)

- handle http:// scheme
- cut out colons
- make filename lowercase

Signed-off-by: Cody Soyland <[email protected]>

Author: codysoyland

pkg/tuf/client.go

@@ -199,9 +199,10 @@ func URLToPath(url string) string {
 	// Strip scheme, replace slashes with dashes
 	// e.g. https://github.github.com/prod-tuf-root -> github.github.com-prod-tuf-root
 	fn := url
-	if len(fn) > 8 && fn[:8] == "https://" {
-		fn = fn[8:]
-	}
+	fn, _ = strings.CutPrefix(fn, "https://")
+	fn, _ = strings.CutPrefix(fn, "http://")
 	fn = strings.ReplaceAll(fn, "/", "-")
-	return fn
+	fn = strings.ReplaceAll(fn, ":", "-")
+
+	return strings.ToLower(fn)
 }

pkg/tuf/client_test.go

@@ -17,17 +17,16 @@ package tuf
 import (
 	"crypto"
 	"crypto/sha256"
+	"fmt"
 	"net/url"
+	"os"
+	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
 
-	"fmt"
-	"os"
-	"path/filepath"
-
 	"github.com/sigstore/sigstore/pkg/signature"
 	"github.com/stretchr/testify/assert"
 	"github.com/theupdateframework/go-tuf/v2/metadata"
@@ -463,3 +462,49 @@ func (r *testRepo) SetTimestamp(date time.Time) {
 		r.t.Fatal(err)
 	}
 }
+
+func TestURLToPath(t *testing.T) {
+	tests := []struct {
+		name string
+		url  string
+		want string
+	}{
+		{
+			name: "no-change",
+			url:  "example.com",
+			want: "example.com",
+		},
+		{
+			name: "simple",
+			url:  "https://example.com",
+			want: "example.com",
+		},
+		{
+			name: "simple with path",
+			url:  "https://example.com/foo/bar",
+			want: "example.com-foo-bar",
+		},
+		{
+			name: "http scheme",
+			url:  "http://example.com/foo/bar",
+			want: "example.com-foo-bar",
+		},
+		{
+			name: "different port",
+			url:  "http://example.com:8080/foo/bar",
+			want: "example.com-8080-foo-bar",
+		},
+		{
+			name: "lowercase",
+			url:  "http://EXAMPLE.COM:8080/foo/bar",
+			want: "example.com-8080-foo-bar",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := URLToPath(tt.url); got != tt.want {
+				t.Errorf("URLToPath() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}