Merge pull request #62 from italia/show-metadata-url-in-admin-ui

Show metadata url in admin UI
italia · Mar 8, 2024 · 0a22faf · 0a22faf
2 parents 407fbc4 + 8d9cb31
commit 0a22faf
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 4 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+target
+.github
+.vscode
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.lscorcia</groupId>
     <artifactId>keycloak-spid-provider</artifactId>
-    <version>24.0.1-BIS-SNAPSHOT</version>
+    <version>24.0.1.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Keycloak SPID Service Provider</name>

diff --git a/src/main/java/org/keycloak/broker/spid/SpidIdentityProviderConfig.java b/src/main/java/org/keycloak/broker/spid/SpidIdentityProviderConfig.java
@@ -19,6 +19,7 @@
 import java.util.List;
 
 import org.keycloak.broker.saml.SAMLIdentityProviderConfig;
+import org.keycloak.broker.spid.metadata.SpidSpMetadataResourceProviderFactory;
 import org.keycloak.models.IdentityProviderModel;
 import org.keycloak.provider.ProviderConfigProperty;
 import org.keycloak.provider.ProviderConfigurationBuilder;
@@ -47,6 +48,7 @@ public class SpidIdentityProviderConfig extends SAMLIdentityProviderConfig  {
     public static final String BILLING_CONTACT_SITE_PROVINCE = "billingContactSiteProvince";
     public static final String BILLING_CONTACT_SITE_COUNTRY = "billingContactSiteCountry";
     public static final String SPID_RESPONSE_DEBUG_ENABLED = "debugEnabled";
+    public static final String METADATA_URL = "metadataUrl";
 
     public SpidIdentityProviderConfig(){
     }
@@ -233,6 +235,15 @@ public void setDebugEnabled(boolean isDebugEnabled) {
 
     public static List<ProviderConfigProperty> getConfigProperties() {
         return ProviderConfigurationBuilder.create()
+
+        .property()
+        .name(METADATA_URL)
+        .type(ProviderConfigProperty.STRING_TYPE)
+        .defaultValue("/realms/<realm>/" + SpidSpMetadataResourceProviderFactory.ID)
+        .label("identity-provider.saml.url.metadata")
+        .helpText("identity-provider.saml.url.metadata.tooltip")
+        .add()
+
         .property()
         .name(ORGANIZATION_NAMES)
         .type(ProviderConfigProperty.STRING_TYPE)
@@ -386,7 +397,7 @@ public static List<ProviderConfigProperty> getConfigProperties() {
         .label("identity-provider.spid.debug-enabled")
         .helpText("identity-provider.spid.debug-enabled.tooltip")
         .add()
-        
+
         .build();
     }
 

diff --git a/src/main/java/org/keycloak/broker/spid/SpidIdentityProviderFactory.java b/src/main/java/org/keycloak/broker/spid/SpidIdentityProviderFactory.java
@@ -26,6 +26,7 @@
 
 import org.keycloak.Config.Scope;
 import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
+import org.keycloak.broker.spid.metadata.SpidSpMetadataResourceProvider;
 import org.keycloak.dom.saml.v2.assertion.AttributeType;
 import org.keycloak.dom.saml.v2.metadata.EndpointType;
 import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType;
@@ -63,6 +64,7 @@ public String getName() {
 
     @Override
     public SpidIdentityProvider create(KeycloakSession session, IdentityProviderModel model) {
+        model.getConfig().put(SpidIdentityProviderConfig.METADATA_URL, SpidSpMetadataResourceProvider.getMetadataURL(session).toString());
         return new SpidIdentityProvider(session, new SpidIdentityProviderConfig(model), destinationValidator);
     }
 

diff --git a/src/main/java/org/keycloak/broker/spid/metadata/SpidSpMetadataResourceProvider.java b/src/main/java/org/keycloak/broker/spid/metadata/SpidSpMetadataResourceProvider.java
@@ -358,4 +358,11 @@ private static String md5hex(String data)
     public void close() {
     }
 
+    public static URI getMetadataURL(KeycloakSession session) {
+        UriInfo uriInfo = session.getContext().getUri();
+        return uriInfo.getBaseUriBuilder()
+                    .path("realms").path(session.getContext().getRealm().getName())
+                    .path(SpidSpMetadataResourceProviderFactory.ID)
+                    .build();
+    }
 }
diff --git a/src/main/resources/theme-resources/messages/messages_en.properties b/src/main/resources/theme-resources/messages/messages_en.properties
@@ -180,4 +180,7 @@ identity-provider.spid.site.countryCode.billing=Headquarter Country Code (Billin
 identity-provider.spid.site.countryCode.billing.tooltip=Headquarter Country Code ISO alpha-2 (Billing). Default value is 'it'
 # Debug
 identity-provider.spid.debug-enabled=Show detailed SPID response errors
-identity-provider.spid.debug-enabled.tooltip=If enabled, shows the actual SPID check error code instead of a generic error message
+identity-provider.spid.debug-enabled.tooltip=If enabled, shows the actual SPID check error code instead of a generic error message
+
+identity-provider.saml.url.metadata=Metadata URL
+identity-provider.saml.url.metadata.tooltip=URL of the generated SAML metadata
diff --git a/src/main/resources/theme-resources/messages/messages_it.properties b/src/main/resources/theme-resources/messages/messages_it.properties
@@ -180,4 +180,7 @@ identity-provider.spid.site.countryCode.billing=Headquarter Country Code (Billin
 identity-provider.spid.site.countryCode.billing.tooltip=Headquarter Country Code ISO alpha-2 (Billing). Default value is 'it'
 # Debug
 identity-provider.spid.debug-enabled=Show detailed SPID response errors
-identity-provider.spid.debug-enabled.tooltip=If enabled, shows the actual SPID check error code instead of a generic error message
+identity-provider.spid.debug-enabled.tooltip=If enabled, shows the actual SPID check error code instead of a generic error message
+
+identity-provider.saml.url.metadata=Metadata URL
+identity-provider.saml.url.metadata.tooltip=URL of the generated SAML metadata