Make Keycloak work on Graal 19.3.0

Remove some problematic substitutions and make bouncycastle classes initialized at runtime to work around security provider bug
quarkusio · Dec 4, 2019 · 85d8746 · 85d8746
1 parent 344e6fe
commit 85d8746
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 112 deletions.
diff --git a/ci-templates/stages.yml b/ci-templates/stages.yml
@@ -345,7 +345,7 @@ stages:
         parameters:
           poolSettings: ${{parameters.poolSettings}}
           expectUseVMs: ${{parameters.expectUseVMs}}
-          timeoutInMinutes: 25
+          timeoutInMinutes: 35
           modules:
             - kogito
             - kubernetes-client

diff --git a/.../runtime/src/main/java/io/quarkus/runtime/graal/SecurityServicesFeatureSubstitutions.java b/.../runtime/src/main/java/io/quarkus/runtime/graal/SecurityServicesFeatureSubstitutions.java
diff --git a/...loyment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java b/...loyment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java
@@ -33,7 +33,6 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import io.quarkus.keycloak.pep.runtime.PortWatcherRunTime;
 
 public class KeycloakReflectionBuildStep {
 
@@ -78,7 +77,12 @@ public void registerServiceProviders(BuildProducer<ServiceProviderBuildItem> ser
     }
 
     @BuildStep
-    RuntimeInitializedClassBuildItem runtimeInitializedClass() {
-        return new RuntimeInitializedClassBuildItem(PortWatcherRunTime.class.getName());
+    public void runtimeInit(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInit) {
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.BouncyIntegration"));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.PemUtils"));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.DerUtils"));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.KeystoreUtil"));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.CertificateUtils"));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.OCSPUtils"));
     }
 }
diff --git a/extensions/keycloak-authorization/runtime/pom.xml b/extensions/keycloak-authorization/runtime/pom.xml
@@ -44,10 +44,6 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>commons-logging-jboss-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
         </dependency>
          <dependency>
              <groupId>junit</groupId>

diff --git a/...thorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/PortWatcherRunTime.java b/...thorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/PortWatcherRunTime.java
diff --git a/...ation/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/PortWatcherSubstitutions.java b/...ation/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/PortWatcherSubstitutions.java