[ELY-2290] Update OidcClientConfiguration#resetUrls to handle the cas…

…e where the provider-url or auth-server-url isn't valid
wildfly-security · Jan 17, 2022 · d156262 · d156262
1 parent 997b176
commit d156262
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/ElytronMessages.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/ElytronMessages.java
@@ -204,7 +204,9 @@ interface ElytronMessages extends BasicLogger {
     @Message(id = 23048, value = "Invalid URI: '%s'")
     RuntimeException invalidUri(String uri);
 
-
+    @LogMessage(level = WARN)
+    @Message(id = 23049, value = "Invalid 'auth-server-url' or 'provider-url': '%s'")
+    void invalidAuthServerUrlOrProviderUrl(String url);
 
 }
 
diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcClientConfiguration.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcClientConfiguration.java
@@ -191,12 +191,16 @@ protected void resetUrls() {
         jwksUrl = null;
         relativeUrls = null;
         if (providerUrl != null || authServerBaseUrl != null) {
-            URI uri = URI.create(providerUrl != null? providerUrl : authServerBaseUrl);
-            if (uri.getHost() == null) {
-                relativeUrls = RelativeUrlsUsed.ALWAYS;
-            } else {
-                // We have absolute URI in config
-                relativeUrls = RelativeUrlsUsed.NEVER;
+            try {
+                URI uri = URI.create(providerUrl != null ? providerUrl : authServerBaseUrl);
+                if (uri.getHost() == null) {
+                    relativeUrls = RelativeUrlsUsed.ALWAYS;
+                } else {
+                    // We have absolute URI in config
+                    relativeUrls = RelativeUrlsUsed.NEVER;
+                }
+            } catch (Exception e) {
+                log.invalidAuthServerUrlOrProviderUrl(providerUrl != null ? providerUrl : authServerBaseUrl);
             }
         }
     }