Redact url

main.go

@@ -94,6 +94,8 @@ func cloneRepo(cfg repoConfig) error {
 		)
 	}
 
+	redactedURL := redactURL(cfg.RepositoryURL)
+
 	// Activate SSH key is optional
 	if cfg.SSHRsaPrivateKey != "" {
 		if err := activatesshkey.Execute(activatesshkey.Config{
@@ -104,7 +106,7 @@ func cloneRepo(cfg repoConfig) error {
 			return newStepError(
 				"activate_ssh_key_failed",
 				err,
-				fmt.Sprintf("Activating SSH key for %s failed", cfg.RepositoryURL),
+				fmt.Sprintf("Activating SSH key for %s failed", redactedURL),
 			)
 		}
 	}
@@ -118,7 +120,7 @@ func cloneRepo(cfg repoConfig) error {
 		return newStepError(
 			"activate_git_http_credentials_failed",
 			err,
-			fmt.Sprintf("Activating Git HTTP credentials for %s failed", cfg.RepositoryURL),
+			fmt.Sprintf("Activating Git HTTP credentials for %s failed", redactedURL),
 		)
 	}
 
@@ -151,7 +153,7 @@ func cloneRepo(cfg repoConfig) error {
 		return newStepError(
 			"git_clone_failed",
 			err,
-			fmt.Sprintf("Git clone for %s - %s branch failed (ssh: %t, user: %t, pass: %t)", cfg.RepositoryURL, cfg.Branch, hasSSH, hasUser, hasPass),
+			fmt.Sprintf("Git clone for %s - %s branch failed (ssh: %t, user: %t, pass: %t)", redactedURL, cfg.Branch, hasSSH, hasUser, hasPass),
 		)
 	}
 

url.go

@@ -0,0 +1,15 @@
+package main
+
+import "strings"
+
+func redactURL(url string) string {
+	firstSeparator := "://"
+	firstIndex := strings.Index(url, firstSeparator)
+	secondIndex := strings.Index(url, "@")
+
+	if 0 < firstIndex && 0 < secondIndex && firstIndex < secondIndex {
+		url = url[:firstIndex+len(firstSeparator)] + "..." + url[secondIndex:]
+	}
+
+	return url
+}

url_test.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestURLRedacting(t *testing.T) {
+	tests := []struct {
+		url  string
+		want string
+	}{
+		{
+			url:  "https://user:[email protected]/org/project.git",
+			want: "https://[email protected]/org/project.git",
+		},
+		{
+			url:  "https://github.com/org/project.git",
+			want: "https://github.com/org/project.git",
+		},
+		{
+			url:  "[email protected]:Org/Applications.git",
+			want: "[email protected]:Org/Applications.git",
+		},
+	}
+
+	for _, tt := range tests {
+		got := redactURL(tt.url)
+		if !reflect.DeepEqual(got, tt.want) {
+			t.Errorf("redactURL() = %v, want %v", got, tt.want)
+		}
+	}
+}