up

Author: benbroadaway

it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/usernameSignature/concord.yml

@@ -0,0 +1,6 @@
+configuration:
+  runtime: "concord-v2"
+
+flows:
+  default:
+    - log: "signature: ${initiator.usernameSignature == null ? 'null' : initiator.usernameSignature}."

repository/src/main/java/com/walmartlabs/concord/repository/GitClientConfiguration.java

@@ -23,8 +23,8 @@
 import org.immutables.value.Value;
 
 import java.time.Duration;
-import java.util.Optional;
 import java.util.Set;
+import java.util.Optional;
 
 @Value.Immutable
 @Value.Style(jdkOnly = true)

repository/src/test/java/com/walmartlabs/concord/repository/GitUriTest.java

@@ -0,0 +1,109 @@
+package com.walmartlabs.concord.repository;
+
+/*-
+ * *****
+ * Concord
+ * -----
+ * Copyright (C) 2017 - 2025 Walmart Inc.
+ * -----
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =====
+ */
+
+import com.walmartlabs.concord.common.AuthTokenProvider;
+import com.walmartlabs.concord.common.secret.BinaryDataSecret;
+import com.walmartlabs.concord.sdk.Secret;
+import org.immutables.value.Value;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class GitUriTest {
+    private static final AuthTokenProvider AUTH_PROVIDER = authProvider(null);
+    private static final AuthTokenProvider RESTRICTED_AUTH_PROVIDER = authProvider("gitserver.local");
+
+    private static final GitClientConfiguration cfg = GitClientConfiguration.builder()
+            .oauthToken("mock-token")
+            .build();
+    private static final GitClient client = new GitClient(cfg, AUTH_PROVIDER);
+    private static Secret secret = new BinaryDataSecret("secret-mock-token".getBytes());
+
+    private static AuthTokenProvider authProvider(String urlPattern) {
+        var builder = TestOauthTokenConfig.builder()
+                .oauthToken("mock-token");
+
+        if (urlPattern != null) {
+            builder.oauthUrlPattern(urlPattern);
+        }
+
+        return new AuthTokenProvider.OauthTokenProvider(builder.build());
+    }
+
+    @Test
+    void testSsh() {
+        var sshWithUser = client.updateUrl("[email protected]:my-org/my-repo.git", null);
+        assertEquals("[email protected]:my-org/my-repo.git", sshWithUser);
+
+        var sshNoUser = client.updateUrl("gitserver.local:my-org/my-repo.git", null);
+        assertEquals("gitserver.local:my-org/my-repo.git",
+                sshNoUser);
+    }
+
+    @Test
+    void testHttps() {
+        var httpsDefault = client.updateUrl("https://gitserver.local/my-org/my-repo.git", null);
+        assertEquals("https://[email protected]/my-org/my-repo.git", httpsDefault);
+    }
+
+    @Test
+    void testHttpWithSecret() {
+        var httpsSecret = client.updateUrl("https://gitserver.local/my-org/my-repo.git", secret);
+        assertEquals("https://[email protected]/my-org/my-repo.git", httpsSecret);
+    }
+
+    @Test
+    void testUnrestrictedHost() {
+        var anonAuth = client.updateUrl("https://elsewhere.local/my-org/my-repo.git", null);
+        // backwards-compat, auth added
+        assertEquals("https://[email protected]/my-org/my-repo.git", anonAuth);
+
+        var url2 = client.updateUrl("https://gitserver.local/my-org/my-repo.git", null);
+        // auth added
+        assertEquals("https://[email protected]/my-org/my-repo.git", url2);
+
+    }
+
+    @Test
+    void testGitHostRestriction() {
+        var restrictedClient = new GitClient(GitClientConfiguration.builder()
+                .from(cfg)
+                .build(), RESTRICTED_AUTH_PROVIDER);
+
+        var anonAuth = restrictedClient.updateUrl("https://elsewhere.local/my-org/my-repo.git", null);
+        // unchanged
+        assertEquals("https://elsewhere.local/my-org/my-repo.git", anonAuth);
+
+        var url2 = restrictedClient.updateUrl("https://gitserver.local/my-org/my-repo.git", null);
+        // auth added
+        assertEquals("https://[email protected]/my-org/my-repo.git", url2);
+    }
+
+    @Value.Immutable
+    @Value.Style(jdkOnly = true)
+    interface TestOauthTokenConfig extends com.walmartlabs.concord.common.cfg.OauthTokenConfig {
+        static ImmutableTestOauthTokenConfig.Builder builder() {
+            return ImmutableTestOauthTokenConfig.builder();
+        }
+    }
+
+}