handle GL_HOST without scheme

Signed-off-by: Spencer Schrock <sschrock@google.com>

clients/gitlabrepo/repo.go

@@ -62,20 +62,15 @@ func (r *repoURL) parse(input string) error {
 		t = input
 	}
 
-	// Allow skipping scheme for ease-of-use, default to https.
-	if !strings.Contains(t, "://") {
-		t = "https://" + t
-	}
-
-	u, e := url.Parse(t)
-	if e != nil {
-		return sce.WithMessage(sce.ErrScorecardInternal, fmt.Sprintf("url.Parse: %v", e))
+	u, err := url.Parse(withDefaultScheme(t))
+	if err != nil {
+		return sce.WithMessage(sce.ErrScorecardInternal, fmt.Sprintf("url.Parse: %v", err))
 	}
 
 	// fixup the URL, for situations where GL_HOST contains part of the path
 	// https://github.com/ossf/scorecard/issues/3696
 	if h := os.Getenv("GL_HOST"); h != "" {
-		hostURL, err := url.Parse(h)
+		hostURL, err := url.Parse(withDefaultScheme(h))
 		if err != nil {
 			return sce.WithMessage(sce.ErrScorecardInternal, fmt.Sprintf("url.Parse GL_HOST: %v", err))
 		}
@@ -99,6 +94,14 @@ func (r *repoURL) parse(input string) error {
 	return nil
 }
 
+// Allow skipping scheme for ease-of-use, default to https.
+func withDefaultScheme(uri string) string {
+	if strings.Contains(uri, "://") {
+		return uri
+	}
+	return "https://" + uri
+}
+
 // URI implements Repo.URI().
 func (r *repoURL) URI() string {
 	return fmt.Sprintf("%s/%s/%s", r.host, r.owner, r.project)

clients/gitlabrepo/repo_test.go

@@ -228,6 +228,14 @@ func TestRepoURL_parse_GL_HOST(t *testing.T) {
 			owner:   "ssdlc",
 			project: "scorecard-scanner",
 		},
+		{
+			name:    "GL_HOST has no scheme",
+			glHost:  "foo.com/bar/",
+			url:     "foo.com/bar/ssdlc/scorecard-scanner",
+			host:    "foo.com/bar",
+			owner:   "ssdlc",
+			project: "scorecard-scanner",
+		},
 	}
 
 	for _, tt := range tests {