Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Jan 25, 2024 · a240036 · a240036
2 parents 5639076 + 3f4c438
commit a240036
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 23 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageSelfRegistration.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageSelfRegistration.java
@@ -229,16 +229,18 @@ protected void submitRegistration(AjaxRequestTarget target) {
         saveUser(result);
         result.computeStatus();
 
-        if (result.getStatus() == OperationResultStatus.SUCCESS) {
+        if (result.getStatus() == OperationResultStatus.SUCCESS || result.getStatus() == OperationResultStatus.HANDLED_ERROR) {
             getSession()
                     .success(createStringResource("PageSelfRegistration.registration.success").getString());
-
-            String sequenceIdentifier = getSelfRegistrationConfiguration().getAdditionalAuthentication();
-            if (SecurityUtils.sequenceExists(getSelfRegistrationConfiguration().getAuthenticationPolicy(), sequenceIdentifier)) {
-                target.add(PageSelfRegistration.this);
-            }
-            LOGGER.trace("Registration for user {} was successfull.", getUserModel().getObject());
-            isSubmitted = true;
+            afterUserRegistration(target);
+        } else if (result.getStatus() == OperationResultStatus.IN_PROGRESS) {
+            getSession()
+                    .info(createStringResource("PageSelfRegistration.registration.inprogress").getString());
+            afterUserRegistration(target);
+        } else if (result.getStatus() == OperationResultStatus.WARNING) {
+            getSession()
+                    .warn(createStringResource("PageSelfRegistration.registration.success").getString());
+            afterUserRegistration(target);
         } else {
             String message;
             if (result.getUserFriendlyMessage() != null) {
@@ -254,12 +256,20 @@ protected void submitRegistration(AjaxRequestTarget target) {
             target.add(getFeedbackPanel());
             LOGGER.error("Failed to register user {}. Reason {}", getUserModel().getObject(), result.getMessage());
             return;
-
         }
         target.add(getFeedbackPanel());
         target.add(PageSelfRegistration.this);
     }
 
+    private void afterUserRegistration(AjaxRequestTarget target) {
+        String sequenceIdentifier = getSelfRegistrationConfiguration().getAdditionalAuthentication();
+        if (SecurityUtils.sequenceExists(getSelfRegistrationConfiguration().getAuthenticationPolicy(), sequenceIdentifier)) {
+            target.add(PageSelfRegistration.this);
+        }
+        LOGGER.trace("Registration for user {} was successfull.", getUserModel().getObject());
+        isSubmitted = true;
+    }
+
     @Override
     protected String getArchetypeOid() {
         var authentication = SecurityContextHolder.getContext().getAuthentication();

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
@@ -38,7 +38,7 @@ public class SqaleUtils {
      */
     public static final String SCHEMA_AUDIT_CHANGE_NUMBER = "schemaAuditChangeNumber";
 
-    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 25;
+    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 26;
 
     public static final int CURRENT_SCHEMA_AUDIT_CHANGE_NUMBER = 8;
 

diff --git a/...rest/src/test/java/com/evolveum/midpoint/testing/rest/AbstractRestServiceInitializer.java b/...rest/src/test/java/com/evolveum/midpoint/testing/rest/AbstractRestServiceInitializer.java
@@ -51,25 +51,25 @@ public abstract class AbstractRestServiceInitializer extends AbstractGuiIntegrat
 
     public static final File USER_ADMINISTRATOR_FILE = new File(BASE_REPO_DIR, "user-administrator.xml");
     public static final String USER_ADMINISTRATOR_USERNAME = "administrator";
-    public static final String USER_ADMINISTRATOR_PASSWORD = "5ecr3t";
+    public static final String USER_ADMINISTRATOR_PASSWORD = "Test5ecr3t";
 
     // No authorization
     public static final File USER_NOBODY_FILE = new File(BASE_REPO_DIR, "user-nobody.xml");
     public static final String USER_NOBODY_OID = "ffb9729c-d48b-11e4-9720-001e8c717e5b";
     public static final String USER_NOBODY_USERNAME = "nobody";
-    public static final String USER_NOBODY_PASSWORD = "nopassword";
+    public static final String USER_NOBODY_PASSWORD = "N0pa55word";
 
     // REST authorization only
     public static final File USER_CYCLOPS_FILE = new File(BASE_REPO_DIR, "user-cyclops.xml");
     public static final String USER_CYCLOPS_OID = "6020bb52-d48e-11e4-9eaf-001e8c717e5b";
     public static final String USER_CYCLOPS_USERNAME = "cyclops";
-    public static final String USER_CYCLOPS_PASSWORD = "cyclopassword";
+    public static final String USER_CYCLOPS_PASSWORD = "Cycl0pa55word";
 
     // REST and reader authorization
     public static final File USER_SOMEBODY_FILE = new File(BASE_REPO_DIR, "user-somebody.xml");
     public static final String USER_SOMEBODY_OID = "a5f3e3c8-d48b-11e4-8d88-001e8c717e5b";
     public static final String USER_SOMEBODY_USERNAME = "somebody";
-    public static final String USER_SOMEBODY_PASSWORD = "somepassword";
+    public static final String USER_SOMEBODY_PASSWORD = "S0m3pa55word";
 
     // other
     public static final File USER_JACK_FILE = new File(BASE_REPO_DIR, "user-jack.xml");

diff --git a/...c/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java b/...c/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java
@@ -61,7 +61,7 @@ public void testChallengeResponse() {
                 + "\"answer\" : ["
                 + "{ "
                 + "\"qid\" : \"http://midpoint.evolveum.com/xml/ns/public/security/question-2#q001\","
-                + "\"qans\" : \"5ecr3t\""
+                + "\"qans\" : \"Test5ecr3t\""
                 + "},"
                 + "{ "
                 + "\"qid\" : \"http://midpoint.evolveum.com/xml/ns/public/security/question-2#q002\","

diff --git a/testing/rest/src/test/resources/repo/user-administrator.xml b/testing/rest/src/test/resources/repo/user-administrator.xml
@@ -22,14 +22,14 @@ xmlns:t='http://prism.evolveum.com/xml/ns/public/types-3'
     <c:credentials xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <c:password>
             <c:value xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <clearValue>5ecr3t</clearValue>
+                <clearValue>Test5ecr3t</clearValue>
             </c:value>
         </c:password>
         <securityQuestions>
             <questionAnswer>
                 <questionIdentifier>http://midpoint.evolveum.com/xml/ns/public/security/question-2#q001</questionIdentifier>
                 <questionAnswer>
-                    <t:clearValue>5ecr3t</t:clearValue>
+                    <t:clearValue>Test5ecr3t</t:clearValue>
                 </questionAnswer>
             </questionAnswer>
             <questionAnswer>

diff --git a/testing/rest/src/test/resources/repo/user-cyclops.xml b/testing/rest/src/test/resources/repo/user-cyclops.xml
@@ -21,14 +21,14 @@
     <c:credentials xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <c:password>
             <c:value xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <clearValue>cyclopassword</clearValue>
+                <clearValue>Cycl0pa55word</clearValue>
             </c:value>
         </c:password>
         <securityQuestions>
             <questionAnswer>
                 <questionIdentifier>http://midpoint.evolveum.com/xml/ns/public/security/question-2#q001</questionIdentifier>
                 <questionAnswer>
-                    <t:clearValue>cyclopassword</t:clearValue>
+                    <t:clearValue>Cycl0pa55word</t:clearValue>
                 </questionAnswer>
             </questionAnswer>
         </securityQuestions>

diff --git a/testing/rest/src/test/resources/repo/user-nobody.xml b/testing/rest/src/test/resources/repo/user-nobody.xml
@@ -18,14 +18,14 @@
     <c:credentials xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <c:password>
             <c:value xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <clearValue>nopassword</clearValue>
+                <clearValue>N0pa55word</clearValue>
             </c:value>
         </c:password>
         <securityQuestions>
             <questionAnswer>
                 <questionIdentifier>http://midpoint.evolveum.com/xml/ns/public/security/question-2#q001</questionIdentifier>
                 <questionAnswer>
-                    <t:clearValue>nopassword</t:clearValue>
+                    <t:clearValue>N0pa55word</t:clearValue>
                 </questionAnswer>
             </questionAnswer>
         </securityQuestions>

diff --git a/testing/rest/src/test/resources/repo/user-somebody.xml b/testing/rest/src/test/resources/repo/user-somebody.xml
@@ -25,14 +25,14 @@
     <c:credentials xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <c:password>
             <c:value xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <clearValue>somepassword</clearValue>
+                <clearValue>S0m3pa55word</clearValue>
             </c:value>
         </c:password>
         <securityQuestions>
             <questionAnswer>
                 <questionIdentifier>http://midpoint.evolveum.com/xml/ns/public/security/question-2#q001</questionIdentifier>
                 <questionAnswer>
-                    <t:clearValue>somepassword</t:clearValue>
+                    <t:clearValue>S0m3pa55word</t:clearValue>
                 </questionAnswer>
             </questionAnswer>
         </securityQuestions>