Skip to content

Commit 95340b7

Browse files
benbroadawaybenbroadaway
committed
Merge remote-tracking branch 'oss/master'
1 parent 240e363 commit 95340b7

File tree

105 files changed

+270
-154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+270
-154
lines changed

‎CHANGELOG.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# Change Log
22

3+
## [2.33.3] - 2025-10-14
4+
5+
### Changed
6+
7+
- repository: fix uri scheme restriction for ssh repo uris
8+
([#1226](https://github.com/walmartlabs/concord/pull/1226));
9+
10+
11+
12+
## [2.33.2] - 2025-10-09
13+
14+
### Changed
15+
16+
- concord-server: fix API key creation for the current user
17+
([#1222](https://github.com/walmartlabs/concord/pull/1222));
18+
19+
20+
21+
## [2.33.1] - 2025-10-06
22+
23+
### Changed
24+
25+
- pfed-sso: upgrade nimbus-jose-jwt version
26+
([#1219](https://github.com/walmartlabs/concord/pull/1219));
27+
- server: fix usernameSignature generation
28+
([#1221](https://github.com/walmartlabs/concord/pull/1221));
29+
30+
31+
332
## [2.33.0] - 2025-09-22
433

534
### Added

‎agent-operator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.33.1-SNAPSHOT</version>
9+
<version>2.33.4-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.33.1-SNAPSHOT</version>
9+
<version>2.33.4-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.33.1-SNAPSHOT</version>
9+
<version>2.33.4-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎client2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.33.1-SNAPSHOT</version>
9+
<version>2.33.4-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.33.1-SNAPSHOT</version>
9+
<version>2.33.4-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎common/src/main/java/com/walmartlabs/concord/common/AuthTokenProvider.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.net.URISyntaxException;
3232
import java.util.List;
3333
import java.util.Optional;
34+
import java.util.regex.Pattern;
3435

3536
public interface AuthTokenProvider {
3637

@@ -70,7 +71,8 @@ default URI addUserInfoToUri(URI repo, @Nullable Secret secret) {
7071

7172
@SuppressWarnings("ClassCanBeRecord")
7273
class OauthTokenProvider implements AuthTokenProvider {
73-
74+
// >0 length, printable ascii (no newlines, etc)
75+
private static final Pattern BASIC_STRING_PTN = Pattern.compile("[ -~]+");
7476
private final List<MappingAuthConfig> authConfigs;
7577

7678
@Inject
@@ -85,6 +87,16 @@ public boolean supports(URI repo, @Nullable Secret secret) {
8587

8688
@Override
8789
public Optional<ExternalAuthToken> getToken(URI repo, @Nullable Secret secret) {
90+
if (secret != null) {
91+
if (secret instanceof BinaryDataSecret bds) {
92+
return Optional.of(ExternalAuthToken.StaticToken.builder()
93+
.token(new String(bds.getData()))
94+
.build());
95+
} else {
96+
return Optional.empty();
97+
}
98+
}
99+
88100
return authConfigs.stream()
89101
.filter(auth -> auth.canHandle(repo))
90102
.filter(MappingAuthConfig.OauthAuthConfig.class::isInstance)
@@ -105,9 +117,8 @@ private boolean validateSecret(Secret secret) {
105117
// this class is not the place for handling key pairs or username/password
106118
return false;
107119
} else {
108-
String data = new String(bds.getData());
109-
// >0 length, printable ascii (no newlines, etc)
110-
return data.matches("[ -~]+");
120+
var data = new String(bds.getData());
121+
return BASIC_STRING_PTN.matcher(data).matches();
111122
}
112123
}
113124

‎config/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.33.1-SNAPSHOT</version>
9+
<version>2.33.4-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎console2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.walmartlabs.concord</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.33.1-SNAPSHOT</version>
8+
<version>2.33.4-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎dependency-manager/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.33.1-SNAPSHOT</version>
9+
<version>2.33.4-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

0 commit comments

Comments
 (0)