fix rebase

ProgrammeVitam · Mar 29, 2024 · 67a8565 · 67a8565
1 parent fb3dff5
commit 67a8565
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 31 deletions.
diff --git a/api/api-iam/iam-internal/src/main/resources/application-dev.yml b/api/api-iam/iam-internal/src/main/resources/application-dev.yml
@@ -121,20 +121,6 @@ provisioning-client:
             key-password: changeme
             type: JKS
           hostname-verification: false
-    - idp-identifier: keycloak-idp
-      uri: https://localhost:8090/users
-      client:
-        secure: true
-        ssl-configuration:
-          keystore:
-            key-path: src/main/resources/dev/keystore_iam-internal.jks
-            key-password: changeme
-            type: JKS
-          truststore:
-            key-path: src/main/resources/dev/truststore_server.jks
-            key-password: changeme
-            type: JKS
-          hostname-verification: false
 
 address:
   max-street-length: 250

diff --git a/cas/cas-server/src/main/config/cas-server-application-dev.yml b/cas/cas-server/src/main/config/cas-server-application-dev.yml
@@ -206,7 +206,9 @@ logging:
     org.springframework.amqp: 'OFF'
     org.springframework.context.annotation: 'OFF'
     org.springframework.boot.devtools: 'OFF'
-    org.apereo.inspektr.audit.support: 'OFF'
+    org.apereo.inspektr.audit.support: 'INFO'
+    org.apereo.cas: 'DEBUG'
+    org.pac4j: 'DEBUG'
 
 # Cas CORS (necessary for mobile app)
 cas.http-web-request.cors.enabled: true

diff --git a/cas/cas-server/src/main/resources/static/js/password-checks.js b/cas/cas-server/src/main/resources/static/js/password-checks.js
@@ -37,6 +37,7 @@ function checkValidity(password) {
   var policyPatternRegex = new RegExp(policyPattern);
   var valid = policyPatternRegex.test(password);
   onConditionAddClassValid(valid, "#passwords-strongness");
+  checkInvalidCharacter(password);
 }
 
 function checkPasswordsEquality(password, confirmPassword) {
@@ -49,3 +50,20 @@ function checkRules() {
   checkValidity(password);
   checkPasswordsEquality(password, confirmPassword);
 }
+
+
+function checkInvalidCharacter(password) {
+  const invalidCharacterElement = document.getElementById(
+    "invalid-character-error"
+  );
+  if (invalidCharacterElement) {
+    const isValid = /^[\s\da-zA-Z!"#$%&£'()*+,-./:;<=>?@\]\[^_`{|}~]*$/.test(
+      password
+    );
+    if (isValid) {
+      invalidCharacterElement.style.display = "none";
+    } else {
+      invalidCharacterElement.style.display = "block";
+    }
+  }
+}
diff --git a/cas/cas-server/src/main/resources/templates/fragments/pwdupdateform.html b/cas/cas-server/src/main/resources/templates/fragments/pwdupdateform.html
@@ -54,6 +54,9 @@
                 Confirmer le nouveau mot de passe *
             </label>
         </div>
+        <div id="invalid-character-error" class="error-field" style="display: none">
+            <span th:text="#{screen.pm.init.security.policy}"></span>
+        </div>
         <div id="capslock-on" class="warning Text-normal-bold" style="display: none;">
             <i class="vitamui-icon vitamui-icon-anomalie"></i>
             <span th:text="#{screen.capslock.on}">CAPSLOCK ON</span>

diff --git a/deployment/roles/vitamui/templates/iam-internal/application.yml.j2 b/deployment/roles/vitamui/templates/iam-internal/application.yml.j2
@@ -144,19 +144,3 @@ password:
 address:
   max-street-length: {{ vitamui_platform_informations.address.max_street_length }}
 
-#FIXME to remove after tests
-provisioning-client:
-  identity-providers:
-    - idp-identifier: keycloak-idp
-      uri: https://5.196.26.165:8031/users
-      client:
-        secure: false
-        ssl-configuration:
-          keystore:
-            key-path: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
-            key-password: {{ password_keystore }}
-            type: JKS
-          truststore:
-            key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
-            key-password: {{ password_truststore }}
-          hostname-verification: false