Merge branch '39196' into 'main'

fix: update the logic for comparing the urls and tokens

See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/6296

Merged-by: Axel von Bertoldi <avonbertoldi@gitlab.com>
Approved-by: Timo Furrer <tfurrer@gitlab.com>
Approved-by: Axel von Bertoldi <avonbertoldi@gitlab.com>
Reviewed-by: Axel von Bertoldi <avonbertoldi@gitlab.com>
Reviewed-by: GitLab Duo <gitlab-duo@gitlab.com>
Co-authored-by: kumaraayush9810 <kumaraayush9810@gmail.com>

Author: Axel von Bertoldi

common/config.go

@@ -2132,7 +2132,13 @@ func (c *RunnerCredentials) Log() *logrus.Entry {
 }
 
 func (c *RunnerCredentials) SameAs(other *RunnerCredentials) bool {
-	return c.URL == other.URL && c.Token == other.Token
+	if c.Token != other.Token {
+		return false
+	}
+	if wildcardURL(c.URL) || wildcardURL(other.URL) {
+		return true
+	}
+	return c.URL == other.URL
 }
 
 func (c *RunnerConfig) String() string {
@@ -2623,3 +2629,13 @@ func parseVariable(text string) (variable spec.Variable, err error) {
 	}
 	return
 }
+
+// wildcardURL checks if the URL is a wildcard URL
+func wildcardURL(url string) bool {
+	switch url {
+	case "", "*":
+		return true
+	default:
+		return false
+	}
+}

common/config_test.go

@@ -3738,3 +3738,184 @@ func TestInvalidParseVariable(t *testing.T) {
 	_, err := parseVariable("some_other_key")
 	assert.Error(t, err)
 }
+
+func TestRunnerCredentials_SameAs(t *testing.T) {
+	tests := map[string]struct {
+		c      *RunnerCredentials
+		other  *RunnerCredentials
+		result bool
+	}{
+		"same token and same URL": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"same token but different URL": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.example.com",
+				Token: "token123",
+			},
+			result: false,
+		},
+		"different token but same URL": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token456",
+			},
+			result: false,
+		},
+		"different token and different URL": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.example.com",
+				Token: "token456",
+			},
+			result: false,
+		},
+		"same token, first URL is wildcard *": {
+			c: &RunnerCredentials{
+				URL:   "*",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"same token, second URL is wildcard *": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "*",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"same token, both URLs are wildcard *": {
+			c: &RunnerCredentials{
+				URL:   "*",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "*",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"same token, first URL is empty": {
+			c: &RunnerCredentials{
+				URL:   "",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"same token, second URL is empty": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"same token, both URLs are empty": {
+			c: &RunnerCredentials{
+				URL:   "",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"same token, empty and wildcard *": {
+			c: &RunnerCredentials{
+				URL:   "",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "*",
+				Token: "token123",
+			},
+			result: true,
+		},
+		"different token, first URL is wildcard *": {
+			c: &RunnerCredentials{
+				URL:   "*",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token456",
+			},
+			result: false,
+		},
+		"different token, second URL is wildcard *": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "*",
+				Token: "token456",
+			},
+			result: false,
+		},
+		"same token, URLs differ only by trailing slash": {
+			c: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.com/",
+				Token: "token123",
+			},
+			result: false,
+		},
+		"same token, URLs differ by protocol": {
+			c: &RunnerCredentials{
+				URL:   "http://gitlab.com",
+				Token: "token123",
+			},
+			other: &RunnerCredentials{
+				URL:   "https://gitlab.com",
+				Token: "token123",
+			},
+			result: false,
+		},
+	}
+
+	for name, tt := range tests {
+		t.Run(name, func(t *testing.T) {
+			result := tt.c.SameAs(tt.other)
+			assert.Equal(t, tt.result, result, "SameAs should return %v for this case", tt.result)
+		})
+	}
+}