Merge pull request #27342 from sberyozkin/do_not_report_basic_quarkus…

…_realm Do not set 'realm=Quarkus' in Basic auth challenge
quarkusio · Aug 18, 2022 · 8787a2a · 8787a2a
2 parents 3f34f11 + c8843a7
commit 8787a2a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/...eployment/src/test/java/io/quarkus/vertx/http/security/CombinedFormBasicAuthTestCase.java b/...eployment/src/test/java/io/quarkus/vertx/http/security/CombinedFormBasicAuthTestCase.java
@@ -23,6 +23,7 @@ public class CombinedFormBasicAuthTestCase {
 
     private static final String APP_PROPS = "" +
             "quarkus.http.auth.basic=true\n" +
+            "quarkus.http.auth.realm=TestRealm\n" +
             "quarkus.http.auth.form.enabled=true\n" +
             "quarkus.http.auth.form.login-page=login\n" +
             "quarkus.http.auth.form.error-page=error\n" +
@@ -154,7 +155,7 @@ public void testBasicAuthFailure() {
                 .then()
                 .assertThat()
                 .statusCode(401)
-                .header("WWW-Authenticate", equalTo("basic realm=\"Quarkus\""));
+                .header("WWW-Authenticate", equalTo("basic realm=\"TestRealm\""));
 
     }
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AuthConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AuthConfig.java
@@ -29,8 +29,8 @@ public class AuthConfig {
     /**
      * The authentication realm
      */
-    @ConfigItem(defaultValue = "Quarkus")
-    public String realm;
+    @ConfigItem
+    public Optional<String> realm;
 
     /**
      * The HTTP permissions

diff --git a/...me/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java b/...me/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java
@@ -95,7 +95,7 @@ public BasicAuthenticationMechanism(final String realmName, final boolean silent
 
     public BasicAuthenticationMechanism(final String realmName, final boolean silent,
             Charset charset, Map<Pattern, Charset> userAgentCharsets) {
-        this.challenge = BASIC_PREFIX + "realm=\"" + realmName + "\"";
+        this.challenge = realmName == null ? BASIC : BASIC_PREFIX + "realm=\"" + realmName + "\"";
         this.silent = silent;
         this.charset = charset;
         this.userAgentCharsets = Collections.unmodifiableMap(new LinkedHashMap<>(userAgentCharsets));

diff --git a/...tp/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java b/...tp/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java
@@ -279,7 +279,8 @@ public Supplier<?> setupBasicAuth(HttpBuildTimeConfig buildTimeConfig) {
         return new Supplier<BasicAuthenticationMechanism>() {
             @Override
             public BasicAuthenticationMechanism get() {
-                return new BasicAuthenticationMechanism(buildTimeConfig.auth.realm, buildTimeConfig.auth.form.enabled);
+                return new BasicAuthenticationMechanism(buildTimeConfig.auth.realm.orElse(null),
+                        buildTimeConfig.auth.form.enabled);
             }
         };
     }

diff --git a/...gration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java b/...gration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
@@ -75,7 +75,7 @@ public void testBasicAuthWrongPassword() {
                 .when().get("/api/users/me")
                 .then()
                 .statusCode(401)
-                .header("WWW-Authenticate", equalTo("basic realm=\"Quarkus\""));
+                .header("WWW-Authenticate", equalTo("basic"));
     }
 
     @Test
@@ -144,7 +144,7 @@ public void testVerificationFailedNoBearerTokenAndBasicCreds() {
         RestAssured.given()
                 .when().get("/api/users/me").then()
                 .statusCode(401)
-                .header("WWW-Authenticate", equalTo("basic realm=\"Quarkus\""));
+                .header("WWW-Authenticate", equalTo("basic"));
     }
 
     @Test
@@ -171,7 +171,7 @@ public void testBearerAuthFailureWhereBasicIsRequired() {
                 .when().get("/basic-only")
                 .then()
                 .statusCode(401)
-                .header("WWW-Authenticate", equalTo("basic realm=\"Quarkus\""));
+                .header("WWW-Authenticate", equalTo("basic"));
     }
 
     @Test