Minor update

sberyozkin · May 29, 2024 · cac1e30 · cac1e30
1 parent 9ae780f
commit cac1e30
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UploadResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UploadResource.java
@@ -17,6 +17,7 @@ public class UploadResource {
 
     @GET
     @RolesAllowed("admin")
+    @Path("/data")
     @Produces(MediaType.APPLICATION_JSON)
     public String bearerCertificateCustomValidator() {
         return "granted:" + identity.getRoles();

diff --git a/...-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UploadsTokenChainValidator.java b/...-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UploadsTokenChainValidator.java
@@ -15,13 +15,13 @@
 
 @ApplicationScoped
 @Unremovable
-@TenantFeature("uploads")
+@TenantFeature("uploadw")
 public class UploadsTokenChainValidator implements TokenCertificateValidator {
 
     @Override
     public void validate(OidcTenantConfig oidcConfig, List<X509Certificate> chain, String tokenClaims)
             throws CertificateException {
-        if (!"uploads".equals(oidcConfig.tenantId.get())) {
+        if (!"uploadw".equals(oidcConfig.tenantId.get())) {
             throw new RuntimeException("Unexpected tenant id");
         }
         String leafCertificateThumbprint = TrustStoreUtils.calculateThumprint(chain.get(0));

diff --git a/integration-tests/oidc-wiremock/src/main/resources/application.properties b/integration-tests/oidc-wiremock/src/main/resources/application.properties
@@ -207,9 +207,9 @@ quarkus.oidc.bearer-certificate-full-chain.certificate-chain.trust-store-passwor
 quarkus.oidc.bearer-chain-custom-validator.certificate-chain.trust-store-file=truststore.p12
 quarkus.oidc.bearer-chain-custom-validator.certificate-chain.trust-store-password=storepassword
 
-quarkus.oidc.uploads.tenant-paths=/upload/*
-quarkus.oidc.uploads.certificate-chain.trust-store-file=truststore.p12
-quarkus.oidc.uploads.certificate-chain.trust-store-password=storepassword
+quarkus.oidc.uploadw.tenant-paths=/upload/*
+quarkus.oidc.uploadw.certificate-chain.trust-store-file=truststore.p12
+quarkus.oidc.uploadw.certificate-chain.trust-store-password=storepassword
 
 quarkus.oidc.bearer-certificate-full-chain-root-only-wrongcname.certificate-chain.trust-store-file=truststore-rootcert.p12
 quarkus.oidc.bearer-certificate-full-chain-root-only-wrongcname.certificate-chain.trust-store-password=storepassword

diff --git a/...ests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java b/...ests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
@@ -232,7 +232,7 @@ public void testCertChainWithCustomValidatorUpload() throws Exception {
                 subjectPrivateKey, true);
 
         RestAssured.given().auth().oauth2(accessToken)
-                .when().get("/upload")
+                .when().get("/upload/data")
                 .then()
                 .statusCode(200)
                 .body(Matchers.containsString("admin"));
@@ -243,7 +243,7 @@ public void testCertChainWithCustomValidatorUpload() throws Exception {
                 subjectPrivateKey, false);
 
         RestAssured.given().auth().oauth2(accessToken)
-                .when().get("/upload")
+                .when().get("/upload/data")
                 .then()
                 .statusCode(401);