MID-8842 ninja - authentication name/identifier processor + test

Evolveum · Jul 26, 2023 · 528ad16 · 528ad16
1 parent a2d1f0e
commit 528ad16
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 2 deletions.
diff --git a/...in/java/com/evolveum/midpoint/schema/validator/processor/AuthenticationNameProcessor.java b/...in/java/com/evolveum/midpoint/schema/validator/processor/AuthenticationNameProcessor.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2010-2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.schema.validator.processor;
+
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.schema.validator.UpgradeObjectProcessor;
+import com.evolveum.midpoint.schema.validator.UpgradePhase;
+import com.evolveum.midpoint.schema.validator.UpgradePriority;
+import com.evolveum.midpoint.schema.validator.UpgradeType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractAuthenticationModuleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthenticationSequenceModuleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthenticationSequenceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SecurityPolicyType;
+
+@SuppressWarnings("unused")
+public class AuthenticationNameProcessor implements UpgradeObjectProcessor<SecurityPolicyType> {
+
+    @Override
+    public UpgradePhase getPhase() {
+        return UpgradePhase.BEFORE;
+    }
+
+    @Override
+    public UpgradePriority getPriority() {
+        return UpgradePriority.NECESSARY;
+    }
+
+    @Override
+    public UpgradeType getType() {
+        return UpgradeType.SEAMLESS;
+    }
+
+    @Override
+    public boolean isApplicable(PrismObject<?> object, ItemPath path) {
+        return matchParentTypeAndItemName(
+                object, path, AuthenticationSequenceType.class, AuthenticationSequenceType.F_NAME)
+                || matchParentTypeAndItemName(
+                object, path, AuthenticationSequenceModuleType.class, AuthenticationSequenceModuleType.F_NAME)
+                || matchParentTypeAndItemName(
+                object, path, AbstractAuthenticationModuleType.class, AbstractAuthenticationModuleType.F_NAME);
+    }
+
+    @Override
+    public boolean process(PrismObject<SecurityPolicyType> object, ItemPath path) throws Exception {
+        Object parent = getItemParent(object, path);
+        if (parent instanceof AuthenticationSequenceType) {
+            AuthenticationSequenceType auth = (AuthenticationSequenceType) parent;
+            auth.setIdentifier(auth.getName());
+            return true;
+        }
+
+        if (parent instanceof AuthenticationSequenceModuleType) {
+            AuthenticationSequenceModuleType module = (AuthenticationSequenceModuleType) parent;
+            module.setIdentifier(module.getName());
+            return true;
+        }
+
+        if (parent instanceof AbstractAuthenticationModuleType) {
+            AbstractAuthenticationModuleType module = (AbstractAuthenticationModuleType) parent;
+            module.setIdentifier(module.getName());
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/...src/test/java/com/evolveum/midpoint/schema/validator/processor/TestUpgradeProcessors.java b/...src/test/java/com/evolveum/midpoint/schema/validator/processor/TestUpgradeProcessors.java
@@ -196,9 +196,9 @@ public void test40TestRole() throws Exception {
     public void test50SecurityPolicy() throws Exception {
         testUpgradeValidator("security-policy.xml", result -> {
             Assertions.assertThat(result.getItems())
-                    .hasSize(1);
+                    .hasSize(3);
 
-            Assertions.assertThat(result.hasChanges()).isFalse();
+            Assertions.assertThat(result.hasChanges()).isTrue();
         });
     }
 

diff --git a/infra/schema/src/test/resources/validator/expected/security-policy.xml b/infra/schema/src/test/resources/validator/expected/security-policy.xml
@@ -13,8 +13,17 @@
     <authentication>
         <modules>
             <saml2 id="1">
+                <identifier>deprecated items</identifier>
                 <name>deprecated items</name>
             </saml2>
         </modules>
+        <sequence id="2">
+            <identifier>sequencename</identifier>
+            <name>sequencename</name>
+            <module id="3">
+                <identifier>deprecated items</identifier>
+                <name>deprecated items</name>
+            </module>
+        </sequence>
     </authentication>
 </securityPolicy>
diff --git a/infra/schema/src/test/resources/validator/processor/security-policy.xml b/infra/schema/src/test/resources/validator/processor/security-policy.xml
@@ -20,5 +20,11 @@
                 </network>
             </saml2>
         </modules>
+        <sequence id="2">
+            <name>sequencename</name>
+            <module id="3">
+                <name>deprecated items</name>
+            </module>
+        </sequence>
     </authentication>
 </securityPolicy>