fixed security policy merging for hint and focus identification modules

Evolveum · Feb 17, 2023 · 01832a6 · 01832a6
1 parent 4c6410c
commit 01832a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd
@@ -1902,7 +1902,10 @@
             <xsd:element name="authenticationSequenceName" type="xsd:string" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
-                        Defined authentication sequence, which will be use for reset credential.
+                        Defines authentication sequence, which will be use for reset credential.
+                        Since 4.7: it's better to specify sequence identifier here instead of sequence name
+                        as name attribute becomes deprecated in some objects which are used for
+                        authentication configuration starting from 4.7 version (e.g. in AuthenticationSequenceType)
                     </xsd:documentation>
                     <xsd:appinfo>
                         <a:since>4.1</a:since>

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
@@ -333,6 +333,8 @@ private void mergeAuthenticationModules(AuthenticationsPolicyType mergedAuthenti
         mergeAuthenticationModuleList(mergedAuthentication.getModules().getSecurityQuestionsForm(), modules.getSecurityQuestionsForm());
         mergeAuthenticationModuleList(mergedAuthentication.getModules().getSmsNonce(), modules.getSmsNonce());
         mergeAuthenticationModuleList(mergedAuthentication.getModules().getAttributeVerification(), modules.getAttributeVerification());
+        mergeAuthenticationModuleList(mergedAuthentication.getModules().getHint(), modules.getHint());
+        mergeAuthenticationModuleList(mergedAuthentication.getModules().getFocusIdentification(), modules.getFocusIdentification());
     }
 
     private <AM extends AbstractAuthenticationModuleType> void mergeAuthenticationModuleList(List<AM> mergedList, List<AM> listToProcess) {