fix(config-api): removed idp & sp metadatafile pattern & app s… (#7569)

* fix(config-api): removed idp & sp metadatafile pattern, log4j & app startp enhancement Signed-off-by: pujavs <pujas.works@gmail.com> * fix(config-api): removed idp & sp metadatafile pattern, log4j & app startp enhancement Signed-off-by: pujavs <pujas.works@gmail.com> --------- Signed-off-by: pujavs <pujas.works@gmail.com> Co-authored-by: Devrim <devrimyatar@gluu.org>
JanssenProject · Jan 31, 2024 · 06b1a7a · 06b1a7a
1 parent 7c0684a
commit 06b1a7a
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 63 deletions.
diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -7890,8 +7890,6 @@ components:
           type: string
         selected:
           type: boolean
-        whitePagesCanView:
-          type: boolean
         adminCanView:
           type: boolean
         userCanView:
@@ -7904,6 +7902,8 @@ components:
           type: boolean
         userCanAccess:
           type: boolean
+        whitePagesCanView:
+          type: boolean
         baseDn:
           type: string
     PatchRequest:
@@ -8695,8 +8695,6 @@ components:
           type: boolean
         lockMessageConfig:
           $ref: '#/components/schemas/LockMessageConfig'
-        fapi:
-          type: boolean
         allResponseTypesSupported:
           uniqueItems: true
           type: array
@@ -8706,6 +8704,8 @@ components:
             - code
             - token
             - id_token
+        fapi:
+          type: boolean
     AuthenticationFilter:
       required:
       - baseDn

diff --git a/jans-config-api/plugins/docs/kc-saml-plugin-swagger.yaml b/jans-config-api/plugins/docs/kc-saml-plugin-swagger.yaml
@@ -976,16 +976,12 @@ components:
           type: string
         idpMetadataTempDir:
           type: string
-        idpMetadataFilePattern:
-          type: string
         idpMetadataFile:
           type: string
         spMetadataDir:
           type: string
         spMetadataTempDir:
           type: string
-        spMetadataFilePattern:
-          type: string
         spMetadataFile:
           type: string
         ignoreValidation:

diff --git a/...plugin/src/main/java/io/jans/configapi/plugin/saml/model/config/SamlAppConfiguration.java b/...plugin/src/main/java/io/jans/configapi/plugin/saml/model/config/SamlAppConfiguration.java
@@ -30,12 +30,10 @@ public class SamlAppConfiguration implements Configuration {
     private String idpRootDir;
     private String idpMetadataDir;
     private String idpMetadataTempDir;
-    private String idpMetadataFilePattern;
     private String idpMetadataFile;
 
     private String spMetadataDir;
     private String spMetadataTempDir;
-    private String spMetadataFilePattern;
     private String spMetadataFile;
 
     private boolean ignoreValidation;
@@ -203,15 +201,7 @@ public String getIdpMetadataTempDir() {
     public void setIdpMetadataTempDir(String idpMetadataTempDir) {
         this.idpMetadataTempDir = idpMetadataTempDir;
     }
-
-    public String getIdpMetadataFilePattern() {
-        return idpMetadataFilePattern;
-    }
-
-    public void setIdpMetadataFilePattern(String idpMetadataFilePattern) {
-        this.idpMetadataFilePattern = idpMetadataFilePattern;
-    }
-
+
     public String getIdpMetadataFile() {
         return idpMetadataFile;
     }
@@ -236,14 +226,6 @@ public void setSpMetadataTempDir(String spMetadataTempDir) {
         this.spMetadataTempDir = spMetadataTempDir;
     }
 
-    public String getSpMetadataFilePattern() {
-        return spMetadataFilePattern;
-    }
-
-    public void setSpMetadataFilePattern(String spMetadataFilePattern) {
-        this.spMetadataFilePattern = spMetadataFilePattern;
-    }
-
     public String getSpMetadataFile() {
         return spMetadataFile;
     }
@@ -289,16 +271,13 @@ public String toString() {
         return "SamlAppConfiguration [applicationName=" + applicationName + ", samlTrustRelationshipDn="
                 + samlTrustRelationshipDn + ", trustedIdpDn=" + trustedIdpDn + ", enabled=" + enabled + ", selectedIdp="
                 + selectedIdp + ", serverUrl=" + serverUrl + ", realm=" + realm + ", clientId=" + clientId
-                + ", clientSecret=" + clientSecret + ", grantType=" + grantType + ", scope=" + scope + ", username="
-                + username + ", password=" + password + ", spMetadataUrl=" + spMetadataUrl + ", tokenUrl=" + tokenUrl
+                + ", grantType=" + grantType + ", scope=" + scope + ", username="
+                + username + ", spMetadataUrl=" + spMetadataUrl + ", tokenUrl=" + tokenUrl
                 + ", idpUrl=" + idpUrl + ", idpMetadataImportUrl=" + idpMetadataImportUrl + ", idpRootDir=" + idpRootDir
                 + ", idpMetadataDir=" + idpMetadataDir + ", idpMetadataTempDir=" + idpMetadataTempDir
-                + ", idpMetadataFilePattern=" + idpMetadataFilePattern + ", idpMetadataFile=" + idpMetadataFile
-                + ", spMetadataDir=" + spMetadataDir + ", spMetadataTempDir=" + spMetadataTempDir
-                + ", spMetadataFilePattern=" + spMetadataFilePattern + ", spMetadataFile=" + spMetadataFile
-                + ", ignoreValidation=" + ignoreValidation + ", idpMetadataMandatoryAttributes="
-                + idpMetadataMandatoryAttributes + ", kcAttributes=" + kcAttributes + ", kcSamlConfig=" + kcSamlConfig
-                + "]";
+                + ", idpMetadataFile=" + idpMetadataFile + ", spMetadataDir=" + spMetadataDir + ", spMetadataTempDir="
+                + spMetadataTempDir + ", spMetadataFile=" + spMetadataFile + ", ignoreValidation=" + ignoreValidation
+                + ", idpMetadataMandatoryAttributes=" + idpMetadataMandatoryAttributes + ", kcAttributes="
+                + kcAttributes + ", kcSamlConfig=" + kcSamlConfig + "]";
     }
-
 }
diff --git a/...kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlConfigService.java b/...kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlConfigService.java
@@ -4,6 +4,7 @@
 import io.jans.configapi.plugin.saml.configuration.SamlConfigurationFactory;
 import io.jans.configapi.plugin.saml.model.config.SamlAppConfiguration;
 import io.jans.configapi.plugin.saml.model.config.SamlConf;
+import io.jans.configapi.plugin.saml.util.Constants;
 import io.jans.orm.PersistenceEntryManager;
 import io.jans.util.exception.InvalidConfigurationException;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -259,13 +260,7 @@ public String getIdpMetadataTempDir() {
     }
 
     public String getIdpMetadataFilePattern() {
-        final SamlConf samlConf = getSamlConf();
-        SamlAppConfiguration samlAppConfiguration = samlConf.getDynamicConf();
-        String idpMetadataFilePattern = null;
-        if (samlAppConfiguration != null) {
-            idpMetadataFilePattern = samlAppConfiguration.getIdpMetadataFilePattern();
-        }
-        return idpMetadataFilePattern;
+        return Constants.IDP_METADATA_FILE_PATTERN;
     }
 
     public String getIdpMetadataFile() {
@@ -299,13 +294,7 @@ public String getSpMetadataTempDir() {
     }
 
     public String getSpMetadataFilePattern() {
-        final SamlConf samlConf = getSamlConf();
-        SamlAppConfiguration samlAppConfiguration = samlConf.getDynamicConf();
-        String spMetadataFilePattern = null;
-        if (samlAppConfiguration != null) {
-            spMetadataFilePattern = samlAppConfiguration.getSpMetadataFilePattern();
-        }
-        return spMetadataFilePattern;
+        return Constants.SP_METADATA_FILE_PATH;
     }
 
     public String getSpMetadataFile() {

diff --git a/...pi/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/util/Constants.java b/...pi/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/util/Constants.java
@@ -18,6 +18,8 @@ private Constants() {
     public static final String IDP_MODULE = "idp-module";
     public static final String SP_MODULE = "sp-module";
     public static final String REALM_MASTER = "master";
+    public static final String SP_METADATA_FILE_PATTERN = "%s-sp-metadata.xml";
+    public static final String IDP_METADATA_FILE_PATTERN = "%s-idp-metadata.xml";
 
     public static final String SAML_CONFIG = "/samlConfig";
     public static final String TRUST_RELATIONSHIP = "/trust-relationship";

diff --git a/...-config-api/server/src/main/java/io/jans/configapi/security/api/ApiProtectionService.java b/...-config-api/server/src/main/java/io/jans/configapi/security/api/ApiProtectionService.java
@@ -12,6 +12,7 @@
 import io.jans.configapi.service.auth.ScopeService;
 import io.jans.configapi.core.util.Jackson;
 import io.jans.configapi.core.util.ProtectionScopeType;
+import io.jans.orm.exception.EntryPersistenceException;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -169,8 +170,9 @@ private List<Scope> validateScope(String resourceName, ProtectionScopeType prote
 
             // ensure scope does not exists
             scope = scopeService.getScope(rsScope.getInum());
-            log.debug("Re-verify ConfigApiScope rsScope.getName():{} with rsScope.getInum():{} in DB - scope:{} ",
+            log.info("Re-verify ConfigApiScope rsScope.getName():{} with rsScope.getInum():{} in DB - scope:{} ",
                     rsScope.getName(), rsScope.getInum(), scope);
+
             if (scope == null) {
                 log.info("Scope - '{}' does not exist, hence creating it.", scope);
                 // Scope does not exists hence create Scope
@@ -181,7 +183,7 @@ private List<Scope> validateScope(String resourceName, ProtectionScopeType prote
                 scope.setInum(inum);
                 scope.setDn(scopeService.getDnForScope(inum));
                 scope.setScopeType(scopeType);
-                scopeService.addScope(scope);
+                addScope(scope);
             } else {
                 // Update resource
                 log.info("Scope - '{}' already exists, hence updating it.", rsScope.getName());
@@ -291,5 +293,13 @@ private List<String> getScopeWithDn(List<String> scopes) {
         }
         return scopeList;
     }
+
+    private void addScope(Scope scope) {
+        try {
+            scopeService.addScope(scope);
+        } catch (EntryPersistenceException ex) {
+            log.error("Error while adding scope:{} is:{}",scope, ex);
+        }
+    }
 
 }
diff --git a/jans-config-api/server/src/main/resources/log4j2.xml b/jans-config-api/server/src/main/resources/log4j2.xml
@@ -65,11 +65,7 @@
     </Appenders>
 
     <Loggers>
-        <Logger name="io.jans.configapi" level="${log4j.default.log.level}">
-            <AppenderRef ref="FILE" />
-        </Logger>
-
-		<Logger name="io.jans.configapi.core" level="${log4j.default.log.level}">
+        <Logger name="io.jans" level="${log4j.default.log.level}">
             <AppenderRef ref="FILE" />
         </Logger>
 
@@ -120,8 +116,7 @@
 			<AppenderRef ref="JANS_CONFIGAPI_SCRIPT_LOG_FILE" />
 		</logger>
 
-        <Root level="INFO">
-			<AppenderRef ref="FILE" />
+        <Root level="ERROR">
 			<AppenderRef ref="Console" />
         </Root>
 

diff --git a/jans-linux-setup/jans_setup/setup_app/installers/jans_saml.py b/jans-linux-setup/jans_setup/setup_app/installers/jans_saml.py
@@ -24,7 +24,6 @@
 Config.jans_idp_user_name = 'jans'
 Config.jans_idp_user_password = os.urandom(10).hex()
 Config.jans_idp_idp_root_dir = os.path.join(Config.jansOptFolder, 'idp')
-Config.jans_idp_idp_metadata_file_pattern = '%s-idp-metadata.xml'
 Config.jans_idp_ignore_validation = 'true'
 Config.jans_idp_idp_metadata_file = 'idp-metadata.xml'
 

diff --git a/jans-linux-setup/jans_setup/setup_app/utils/collect_properties.py b/jans-linux-setup/jans_setup/setup_app/utils/collect_properties.py
@@ -250,7 +250,6 @@ def collect(self):
                     ('jans_idp_idp_root_dir', 'idpRootDir'),
                     ('jans_idp_idp_metadata_root_dir', 'idpMetadataRootDir'),
                     ('jans_idp_idp_metadata_temp_dir', 'idpMetadataTempDir'),
-                    ('jans_idp_idp_metadata_file_pattern', 'idpMetadataFilePattern'),
                     ('jans_idp_idp_metadata_file', 'idpMetadataFile'),
                     ('jans_idp_sp_metadata_root_dir', 'spMetadataRootDir'),
                     ('jans_idp_sp_metadata_temp_dir', 'spMetadataTempDir'),

diff --git a/jans-linux-setup/jans_setup/templates/jans-saml/jans-saml-config.json b/jans-linux-setup/jans_setup/templates/jans-saml/jans-saml-config.json
@@ -19,11 +19,9 @@
   "idpRootDir":"/opt/jans/idp/",
   "idpMetadataDir":"/opt/idp/configs/keycloak/idp/metadata",
   "idpMetadataTempDir":"/opt/idp/configs/keycloak/idp/temp_metadata",
-  "idpMetadataFilePattern":"%s-idp-metadata.xml",
   "idpMetadataFile":"idp-metadata.xml",
   "spMetadataDir":"/opt/idp/configs/keycloak/sp/metadata",
   "spMetadataTempDir":"/opt/idp/configs/keycloak/sp/temp_metadata",
-  "spMetadataFilePattern":"%s-sp-metadata.xml",
   "spMetadataFile":"sp-metadata.xml",
   "ignoreValidation":"false",
   "idpMetadataMandatoryAttributes":[