Merge pull request #45442 from geoand/http-mech-bean

Move BasicAuthenticationMechanism to synthetic bean
quarkusio · Jan 9, 2025 · 75a1743 · 75a1743
2 parents 985ecf5 + ba997d7
commit 75a1743
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/...http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java b/...http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java
@@ -27,7 +27,6 @@
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
-import org.jboss.jandex.AnnotationTransformation;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
@@ -37,9 +36,7 @@
 import org.jboss.jandex.TypeVariable;
 import org.objectweb.asm.Opcodes;
 
-import io.quarkus.arc.DefaultBean;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
@@ -187,23 +184,28 @@ void detectBasicAuthImplicitlyRequired(HttpBuildTimeConfig buildTimeConfig,
     }
 
     @BuildStep(onlyIf = IsApplicationBasicAuthRequired.class)
-    AdditionalBeanBuildItem initBasicAuth(HttpBuildTimeConfig buildTimeConfig,
-            BuildProducer<AnnotationsTransformerBuildItem> annotationsTransformerProducer,
+    @Record(ExecutionTime.RUNTIME_INIT)
+    SyntheticBeanBuildItem initBasicAuth(HttpSecurityRecorder recorder,
+            HttpConfiguration runtimeConfig,
+            HttpBuildTimeConfig buildTimeConfig,
             BuildProducer<SecurityInformationBuildItem> securityInformationProducer) {
 
-        if (makeBasicAuthMechDefaultBean(buildTimeConfig)) {
-            //if not explicitly enabled we make this a default bean, so it is the fallback if nothing else is defined
-            annotationsTransformerProducer.produce(new AnnotationsTransformerBuildItem(AnnotationTransformation
-                    .forClasses()
-                    .whenClass(BASIC_AUTH_MECH_NAME)
-                    .transform(ctx -> ctx.add(DefaultBean.class))));
-        }
-
         if (buildTimeConfig.auth.basic.isPresent() && buildTimeConfig.auth.basic.get()) {
             securityInformationProducer.produce(SecurityInformationBuildItem.BASIC());
         }
 
-        return AdditionalBeanBuildItem.builder().setUnremovable().addBeanClass(BasicAuthenticationMechanism.class).build();
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(BasicAuthenticationMechanism.class)
+                .types(io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism.class)
+                .scope(Singleton.class)
+                .supplier(recorder.basicAuthenticationMechanismBean(runtimeConfig, buildTimeConfig.auth.form.enabled))
+                .setRuntimeInit()
+                .unremovable();
+        if (makeBasicAuthMechDefaultBean(buildTimeConfig)) {
+            configurator.defaultBean();
+        }
+
+        return configurator.done();
     }
 
     private static boolean makeBasicAuthMechDefaultBean(HttpBuildTimeConfig buildTimeConfig) {

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
@@ -29,9 +29,6 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
 import org.jboss.logging.Logger;
 
 import io.netty.handler.codec.http.HttpHeaderNames;
@@ -51,7 +48,6 @@
  * The authentication handler responsible for BASIC authentication as described by RFC2617
  *
  */
-@Singleton
 public class BasicAuthenticationMechanism implements HttpAuthenticationMechanism {
 
     private static final Logger log = Logger.getLogger(BasicAuthenticationMechanism.class);
@@ -75,7 +71,6 @@ public class BasicAuthenticationMechanism implements HttpAuthenticationMechanism
     private final Charset charset;
     private final Map<Pattern, Charset> userAgentCharsets;
 
-    @Inject
     BasicAuthenticationMechanism(HttpConfiguration runtimeConfig, HttpBuildTimeConfig buildTimeConfig) {
         this(runtimeConfig.auth.realm.orElse(null), buildTimeConfig.auth.form.enabled);
     }

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
@@ -514,4 +514,14 @@ private static Set<String> parseRoles(String value) {
         return Set.copyOf(roles);
     }
 
+    public Supplier<BasicAuthenticationMechanism> basicAuthenticationMechanismBean(HttpConfiguration runtimeConfig,
+            boolean formAuthEnabled) {
+        return new Supplier<>() {
+            @Override
+            public BasicAuthenticationMechanism get() {
+                return new BasicAuthenticationMechanism(runtimeConfig.auth.realm.orElse(null), formAuthEnabled);
+            }
+        };
+    }
+
 }