schema cleanup: AuthenticationSequenceType.name attribute usage is re…

…moved
Evolveum · May 23, 2023 · 8a888a0 · 8a888a0
1 parent e24d500
commit 8a888a0
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 76 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/AbstractPageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/AbstractPageLogin.java
@@ -142,7 +142,7 @@ private String getSequenceName() {
     }
 
     private String getSequenceIdentifier(AuthenticationSequenceType seq) {
-        return StringUtils.isNotEmpty(seq.getIdentifier()) ? seq.getIdentifier() : seq.getName();
+        return seq.getIdentifier();
     }
 
     protected abstract void initCustomLayout();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageLogin.java
@@ -110,10 +110,6 @@ private String getPasswordResetUrl(SecurityPolicyType securityPolicy) {
 
         AuthenticationsPolicyType authenticationPolicy = securityPolicy.getAuthentication();
         AuthenticationSequenceType sequence = SecurityUtils.getSequenceByIdentifier(resetSequenceIdOrName, authenticationPolicy);
-        if (sequence == null) {
-            // this lookup by name will be (probably) eventually removed
-            sequence = SecurityUtils.getSequenceByName(resetSequenceIdOrName, authenticationPolicy);
-        }
         if (sequence == null) {
             LOGGER.warn("Password reset authentication sequence '{}' does not exist", resetSequenceIdOrName);
             return "";
@@ -164,11 +160,8 @@ private String getRegistrationUrl(SecurityPolicyType securityPolicy) {
             return "";
         }
 
-        AuthenticationSequenceType sequence = SecurityUtils.getSequenceByIdentifier(selfRegistrationPolicy.getAdditionalAuthenticationSequence(), securityPolicy.getAuthentication());
-        if (sequence == null) {
-            sequence = SecurityUtils.getSequenceByName(selfRegistrationPolicy.getAdditionalAuthenticationSequence(),
-                    securityPolicy.getAuthentication());
-        }
+        AuthenticationSequenceType sequence = SecurityUtils.getSequenceByIdentifier(
+                selfRegistrationPolicy.getAdditionalAuthenticationSequence(), securityPolicy.getAuthentication());
         if (sequence == null || sequence.getChannel() == null || sequence.getChannel().getUrlSuffix() == null) {
             return "";
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java
@@ -135,33 +135,6 @@ public static CsrfToken getCsrfToken() {
         return (CsrfToken) httpReq.getAttribute("_csrf");
     }
 
-    /**
-     * name attribute is deprecated, getSequenceByIdentifier should be used instead
-     * @param name
-     * @param authenticationPolicy
-     * @return
-     */
-    @Deprecated
-    public static AuthenticationSequenceType getSequenceByName(String name, AuthenticationsPolicyType authenticationPolicy) {
-        if (authenticationPolicy == null || authenticationPolicy.getSequence() == null
-                || authenticationPolicy.getSequence().isEmpty()) {
-            return null;
-        }
-
-        Validate.notBlank(name, "Name for searching of sequence is blank");
-        for (AuthenticationSequenceType sequence : authenticationPolicy.getSequence()) {
-            if (sequence != null) {
-                if (name.equals(sequence.getName()) || name.equals(sequence.getIdentifier())) {
-                    if (sequence.getModule() == null || sequence.getModule().isEmpty()) {
-                        return null;
-                    }
-                    return sequence;
-                }
-            }
-        }
-        return null;
-    }
-
     public static AuthenticationSequenceType getSequenceByIdentifier(String identifier, AuthenticationsPolicyType authenticationPolicy) {
         if (authenticationPolicy == null || CollectionUtils.isEmpty(authenticationPolicy.getSequence())) {
             return null;
@@ -192,6 +165,6 @@ private static String getPathForLogout(@NotNull String prefix) {
     }
 
     public static boolean sequenceExists(AuthenticationsPolicyType policy, String identifier) {
-        return getSequenceByIdentifier(identifier, policy) != null || getSequenceByName(identifier, policy) != null;
+        return getSequenceByIdentifier(identifier, policy) != null;
     }
 }
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java
@@ -121,7 +121,7 @@ public static AuthenticationsPolicyType createDefaultAuthenticationPolicy(
 
     public static AuthenticationSequenceType createDefaultSequence() {
         return new AuthenticationSequenceType()
-                .name(DEFAULT_SEQUENCE_IDENTIFIER)
+                .identifier(DEFAULT_SEQUENCE_IDENTIFIER)
                 .displayName(DEFAULT_SEQUENCE_DISPLAY_IDENTIFIER)
                 .beginChannel()
                     ._default(true)
@@ -156,7 +156,7 @@ public static AuthenticationSequenceType findSequenceByIdentifier(@NotNull Secur
                 .getAuthentication()
                 .getSequence()
                 .stream()
-                .filter(s -> identifier.equals(s.getIdentifier()) || identifier.equals(s.getName()))
+                .filter(s -> identifier.equals(s.getIdentifier()))
                 .findFirst()
                 .orElse(null);
     }

diff --git a/...src/main/java/com/evolveum/midpoint/authentication/api/config/MidpointAuthentication.java b/...src/main/java/com/evolveum/midpoint/authentication/api/config/MidpointAuthentication.java
@@ -107,7 +107,7 @@ public String getSequenceIdentifier() {
         if (sequence == null) {
             return null;
         }
-        return StringUtils.isNotEmpty(sequence.getIdentifier()) ? sequence.getIdentifier() : sequence.getName();
+        return sequence.getIdentifier();
     }
 
     public void setSequence(AuthenticationSequenceType sequence) {

diff --git a/...n-impl/src/main/java/com/evolveum/midpoint/authentication/impl/util/AuthSequenceUtil.java b/...n-impl/src/main/java/com/evolveum/midpoint/authentication/impl/util/AuthSequenceUtil.java
@@ -241,7 +241,7 @@ private static AuthenticationSequenceType searchSequenceComparingChannelId(Strin
                 sequencesWithSameChannel.add(sequence);
                 if (Boolean.TRUE.equals(sequence.getChannel().isDefault())) {
                     if (sequence.getModule() == null || sequence.getModule().isEmpty()) {
-                        LOGGER.error("Found sequence " + sequence.getName() + "not contains configuration for module");
+                        LOGGER.error("Found sequence " + sequence.getIdentifier() + "not contains configuration for module");
                         return null;
                     }
                     return sequence;
@@ -270,7 +270,7 @@ private static AuthenticationSequenceType searchSequenceComparingUrlSuffix(Strin
         for (AuthenticationSequenceType sequence : sequences) {
             if (sequence != null && sequence.getChannel() != null && urlSuffix.equals(sequence.getChannel().getUrlSuffix())) {
                 if (sequence.getModule() == null || sequence.getModule().isEmpty()) {
-                    LOGGER.error("Found sequence " + sequence.getName() + "not contains configuration for module");
+                    LOGGER.error("Found sequence " + sequence.getIdentifier() + "not contains configuration for module");
                     return null;
                 }
                 return sequence;
@@ -607,7 +607,7 @@ public static boolean isAllowUpdatingAuthBehavior(boolean isUpdatingDuringUnsucc
     }
 
     public static String getAuthSequenceIdentifier(@NotNull AuthenticationSequenceType seq) {
-        return StringUtils.isNotEmpty(seq.getIdentifier()) ? seq.getIdentifier() : seq.getName();
+        return seq.getIdentifier();
     }
 
     public static boolean isUrlForAuthProcessing(HttpServletRequest httpRequest) {

diff --git a/...ication-impl/src/test/java/com/evolveum/midpoint/authentication/TestAuthSequenceUtil.java b/...ication-impl/src/test/java/com/evolveum/midpoint/authentication/TestAuthSequenceUtil.java
@@ -29,18 +29,18 @@ public class TestAuthSequenceUtil extends AbstractHigherUnitTest {
     private List<AuthenticationSequenceType> getSequences() {
         List<AuthenticationSequenceType> sequences = new ArrayList<>();
         AuthenticationSequenceType sequence = new AuthenticationSequenceType();
-        sequence.setName("sequence1");
+        sequence.setIdentifier("sequence1");
         sequence.getNodeGroup().add(getReference("1"));
         sequence.setChannel(getChannel("gui1"));
         sequences.add(sequence);
         sequence = new AuthenticationSequenceType();
-        sequence.setName("sequence2");
+        sequence.setIdentifier("sequence2");
         sequence.getNodeGroup().add(getReference("1"));
         sequence.getNodeGroup().add(getReference("2"));
         sequence.setChannel(getChannel("gui2"));
         sequences.add(sequence);
         sequence = new AuthenticationSequenceType();
-        sequence.setName("sequence3");
+        sequence.setIdentifier("sequence3");
         sequence.setChannel(getChannel("gui3"));
         sequences.add(sequence);
         return sequences;

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
@@ -1671,7 +1671,7 @@ private String createPrefixLinkByAuthSequence(String channel, String nameOfSeque
         AuthenticationSequenceType sequenceByName = null;
         AuthenticationSequenceType defaultSequence = null;
         for (AuthenticationSequenceType sequenceType : sequences) {
-            String sequenceIdentifier = StringUtils.isNotEmpty(sequenceType.getIdentifier()) ? sequenceType.getIdentifier() : sequenceType.getName();
+            String sequenceIdentifier = sequenceType.getIdentifier();
             if (StringUtils.equals(sequenceIdentifier, nameOfSequence)) {
                 sequenceByName = sequenceType;
                 break;

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
@@ -415,8 +415,8 @@ private void mergeSequence(AuthenticationSequenceType sequence, AuthenticationSe
     }
 
     private boolean sequencesIdentifiersMatch(AuthenticationSequenceType sequence1, AuthenticationSequenceType sequence2) {
-        String identifier1 = StringUtils.isNotEmpty(sequence1.getIdentifier()) ? sequence1.getIdentifier() : sequence1.getName();
-        String identifier2 = StringUtils.isNotEmpty(sequence2.getIdentifier()) ? sequence2.getIdentifier() : sequence2.getName();
+        String identifier1 = sequence1.getIdentifier();
+        String identifier2 = sequence2.getIdentifier();
         return identifier1 != null && StringUtils.equals(identifier1, identifier2);
     }
 

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-default.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-default.xml
@@ -21,7 +21,7 @@
             </httpBasic>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -37,7 +37,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-disabled.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-disabled.xml
@@ -21,7 +21,7 @@
             </httpBasic>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -37,7 +37,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-enabled.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-enabled.xml
@@ -21,7 +21,7 @@
             </httpBasic>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -37,7 +37,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-issuer-uri.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-issuer-uri.xml
@@ -24,7 +24,7 @@
             </oidc>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -40,7 +40,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri-wrong-alg.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri-wrong-alg.xml
@@ -36,7 +36,7 @@
             </httpSecQ>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -52,7 +52,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri.xml
@@ -24,7 +24,7 @@
             </oidc>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -40,7 +40,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-public-key-wrong-alg.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-public-key-wrong-alg.xml
@@ -27,7 +27,7 @@
             </oidc>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -43,7 +43,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-public-key.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-public-key.xml
@@ -26,7 +26,7 @@
             </oidc>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -42,7 +42,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/...g/rest/src/test/resources/authentication/repo/security-policy-symmetric-key-wrong-alg.xml b/...g/rest/src/test/resources/authentication/repo/security-policy-symmetric-key-wrong-alg.xml
@@ -27,7 +27,7 @@
             </oidc>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -43,7 +43,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-symmetric-key.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-symmetric-key.xml
@@ -26,7 +26,7 @@
             </oidc>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -42,7 +42,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-unsuccessful.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-unsuccessful.xml
@@ -21,7 +21,7 @@
             </httpBasic>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -37,7 +37,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.

diff --git a/testing/rest/src/test/resources/repo/security-policy-no-history.xml b/testing/rest/src/test/resources/repo/security-policy-no-history.xml
@@ -28,7 +28,7 @@
             </httpSecQ>
         </modules>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <description>
                 Default GUI authentication sequence.
             </description>
@@ -44,7 +44,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <identifier>rest</identifier>
             <description>
                 Authentication sequence for REST service.
                 We want just OIDC auth here, HTTP basic as fallback.