Skip to content

Commit f9969c1

Browse files
authored
fix(spiffeid): require spiffe:// prefix when parsing IDs (#398)
Signed-off-by: Max Lambrecht <maxlambrecht@gmail.com>
1 parent 3ecb19b commit f9969c1

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

java-spiffe-core/src/main/java/io/spiffe/spiffeid/SpiffeId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static SpiffeId parse(final String id) {
7272
throw new IllegalArgumentException(EMPTY);
7373
}
7474

75-
if (!id.contains(SCHEME_PREFIX)) {
75+
if (!id.startsWith(SCHEME_PREFIX)) {
7676
throw new InvalidSpiffeIdException(WRONG_SCHEME);
7777
}
7878

java-spiffe-core/src/test/java/io/spiffe/spiffeid/SpiffeIdTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ static Stream<Arguments> provideInvalidSpiffeIds() {
9898
Arguments.of("spiffe://trustdomain/./other", "Path cannot contain dot segments"),
9999
Arguments.of("spiffe://trustdomain/../other", "Path cannot contain dot segments"),
100100
Arguments.of("spiffe://trustdomain/", "Path cannot have a trailing slash"),
101-
Arguments.of("spiffe://trustdomain/path/", "Path cannot have a trailing slash")
101+
Arguments.of("spiffe://trustdomain/path/", "Path cannot have a trailing slash"),
102+
Arguments.of("xspiffe://trustdomain/path", "Scheme is missing or invalid")
102103
);
103104
}
104105

0 commit comments

Comments
 (0)