Upgrade to midPoint 4.8

docker · Nov 13, 2023 · eec5d1f · eec5d1f
1 parent c892404
commit eec5d1f
Showing 17 changed files with 405 additions and 334 deletions.
diff --git a/common.bash b/common.bash
@@ -1,3 +1,3 @@
 maintainer="i2incommon"
 imagename="midpoint"
-tag="4.7.2"
+tag="4.8"
diff --git a/demo/grouper/docker-compose.yml b/demo/grouper/docker-compose.yml
@@ -173,7 +173,7 @@ services:
      - CREATE_NEW_DATABASE=if_needed
 
   data_init:
-    image: i2incommon/midpoint:${tag:-4.7.2}
+    image: i2incommon/midpoint:${tag:-4.8}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -229,7 +229,7 @@ services:
     build:
       context: ./midpoint_server/
       args:
-        tag: ${tag:-4.7.2}
+        tag: ${tag:-4.8}
     depends_on:
      - data_init
      - midpoint_data

diff --git a/demo/grouper/midpoint_server/Dockerfile b/demo/grouper/midpoint_server/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=4.7.2
+ARG tag=4.8
 
 FROM i2incommon/midpoint:${tag}
 

diff --git a/...ver/container_files/mp-home/post-initial-objects/archetypes/300-archetype-affiliation.xml b/...ver/container_files/mp-home/post-initial-objects/archetypes/300-archetype-affiliation.xml
@@ -49,24 +49,4 @@
             </expression>
         </condition>
     </inducement>
-<!-- TODO MidPoint Basics Training, LAB 4-10: uncomment the following content -->
-<!--
-    <inducement>
-    	<description>
-    	This inducement applies for Users assigned to an Org with the "affiliation" archetype.
-    	It will create an account in "Staff Portal" by assignment of "Staff Portal Basic Role"
-    	</description>
-		<targetRef oid="1620de52-0142-11ea-aa66-9fa873ad13ff" type="c:RoleType" />
-		<order>2</order>
-		<condition>
-			<description>only if the organization's identifier is 'staff'</description>
-			<expression>
-				<script>
-					<code>assignmentPath[0].target.identifier == 'staff'</code>
-				</script>
-			</expression>
-		</condition>
-	</inducement>
--->
-<!-- TODO MidPoint Basics Training, LAB 4-10: end of to-be-uncommented content -->
 </archetype>
diff --git a/...container_files/mp-home/post-initial-objects/archetypes/300-archetype-external-person.xml b/...container_files/mp-home/post-initial-objects/archetypes/300-archetype-external-person.xml
@@ -6,6 +6,11 @@
         xmlns:org='http://midpoint.evolveum.com/xml/ns/public/common/org-3'>
     <name>External</name>
     <description>Non-academic person with no relation to the academy environment</description>
+	<assignment>
+		<assignmentRelation>
+			<holderType>UserType</holderType>
+		</assignmentRelation>
+	</assignment>
     <archetypePolicy>
     	<display>
     		<label>External</label>
@@ -17,9 +22,4 @@
     		</icon>
     	</display>
     </archetypePolicy>
-    <assignment>
-    	<assignmentRelation>
-    		<holderType>UserType</holderType>
-    	</assignmentRelation>
-    </assignment>
 </archetype>
diff --git a/...rver/container_files/mp-home/post-initial-objects/archetypes/300-archetype-sis-person.xml b/...rver/container_files/mp-home/post-initial-objects/archetypes/300-archetype-sis-person.xml
@@ -6,6 +6,11 @@
         xmlns:org='http://midpoint.evolveum.com/xml/ns/public/common/org-3'>
     <name>SIS Person</name>
     <description>Person with a relation to the academy environment, coming from the SIS database</description>
+	<assignment>
+		<assignmentRelation>
+			<holderType>UserType</holderType>
+		</assignmentRelation>
+	</assignment>
     <archetypePolicy>
     	<display>
     		<label>SIS Person</label>
@@ -17,9 +22,4 @@
     		</icon>
     	</display>
     </archetypePolicy>
-    <assignment>
-    	<assignmentRelation>
-    		<holderType>UserType</holderType>
-    	</assignmentRelation>
-    </assignment>
 </archetype>
diff --git a/...server/container_files/mp-home/post-initial-objects/objectTemplates/100-template-user.xml b/...server/container_files/mp-home/post-initial-objects/objectTemplates/100-template-user.xml
@@ -82,7 +82,7 @@
                 <condition>
                     <script>
                         <code>
-                            assignment?.subtype.contains('grouper-group')
+                            assignment?.subtype?.contains('grouper-group')
                         </code>
                     </script>
                 </condition>

diff --git a/...int_server/container_files/mp-home/post-initial-objects/orgs/400-org-grouper-sysadmin.xml b/...int_server/container_files/mp-home/post-initial-objects/orgs/400-org-grouper-sysadmin.xml
@@ -8,9 +8,11 @@
 <org xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
       oid="d48ec05b-fffd-4262-acd3-d9ff63365b62">
     <name>org-grouper-sysadmin</name>
-    <displayName>Grouper Administrators</displayName>
+
     <assignment id="1">
         <targetRef oid="2be36917-71ad-4c3e-8789-89cadea2d5d6" type="ArchetypeType"/>         <!--  archetype midpoint-group -->
     </assignment>
+
+    <displayName>Grouper Administrators</displayName>
     <identifier>sysadmingroup</identifier>
 </org>
diff --git a/.../midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml b/.../midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
@@ -168,7 +168,7 @@
                 <outbound>
                     <strength>strong</strength>
                     <source>
-                        <path>employeeNumber</path>
+                        <path>personalNumber</path>
                     </source>
                 </outbound>
 			</attribute>

diff --git a/...erver/container_files/mp-home/post-initial-objects/securityPolicy/000-security-policy.xml b/...erver/container_files/mp-home/post-initial-objects/securityPolicy/000-security-policy.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-	xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-	xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
-	<securityPolicy xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="00000000-0000-0000-0000-000000000120" version="2">
+<securityPolicy xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="00000000-0000-0000-0000-000000000120" version="2">
     <name>Default Security Policy</name>
     <authentication>
         <modules>
@@ -69,7 +66,7 @@
             <requireAssignmentTarget oid="00000000-0000-0000-0000-000000000004" relation="org:default" type="c:RoleType">
             </requireAssignmentTarget>
             <module>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <order>30</order>
                 <necessity>sufficient</necessity>
             </module>
@@ -111,6 +108,4 @@
             <valuePolicyRef oid="00000000-0000-0000-0000-000000000003"/>
         </password>
     </credentials>
-</securityPolicy>
-
-</objects>
+</securityPolicy>
diff --git a/...iner_files/mp-home/post-initial-objects/systemConfigurations/010-system-configuration.xml b/...iner_files/mp-home/post-initial-objects/systemConfigurations/010-system-configuration.xml
diff --git a/demo/shibboleth/docker-compose-tests.yml b/demo/shibboleth/docker-compose-tests.yml
@@ -5,7 +5,7 @@ version: "3.3"
 
 services:
   data_init:
-    image: i2incommon/midpoint:${tag:-4.7.2}
+    image: i2incommon/midpoint:${tag:-4.8}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -61,7 +61,7 @@ services:
     build:
       context: ./midpoint_server/
       args:
-        tag: ${tag:-4.7.2}
+        tag: ${tag:-4.8}
     command: /usr/local/bin/startup.sh
     depends_on:
      - data_init

diff --git a/demo/shibboleth/docker-compose.yml b/demo/shibboleth/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.3"
 
 services:
   data_init:
-    image: i2incommon/midpoint:${tag:-4.7.2}
+    image: i2incommon/midpoint:${tag:-4.8}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -58,7 +58,7 @@ services:
     build:
       context: ./midpoint_server/
       args:
-        tag: ${tag:-4.7.2}
+        tag: ${tag:-4.8}
     command: /usr/local/bin/startup.sh
     depends_on:
      - data_init

diff --git a/demo/shibboleth/midpoint_server/Dockerfile b/demo/shibboleth/midpoint_server/Dockerfile
@@ -1,4 +1,4 @@
-ARG tag=4.7.2
+ARG tag=4.8
 
 FROM i2incommon/midpoint:${tag}
 

diff --git a/...int_server/container_files/mp-home/post-initial-objects/securityPolicy/SecurityPolicy.xml b/...int_server/container_files/mp-home/post-initial-objects/securityPolicy/SecurityPolicy.xml
@@ -1,7 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-  xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-  xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
   <securityPolicy xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="00000000-0000-0000-0000-000000000120" version="2">
     <name>Default Security Policy</name>
     <authentication>
@@ -12,6 +8,11 @@
             <httpBasic>
                 <identifier>httpBasic</identifier>
             </httpBasic>
+            <httpHeader>
+                <identifier>httpHeader</identifier>
+                <usernameHeader>REMOTE_USER</usernameHeader>
+                <logoutUrl>https://localhost:8443/Shibboleth.sso/Logout</logoutUrl>
+            </httpHeader>
             <saml2>
                 <identifier>mySamlSso</identifier>
                 <description>My internal enterprise SAML-based SSO system.</description>
@@ -41,11 +42,6 @@
                     </identityProvider>
                 </serviceProvider>
             </saml2>
-            <httpHeader>
-              <name>httpHeader</name>
-              <logoutUrl>https://localhost:8443/Shibboleth.sso/Logout</logoutUrl>
-              <usernameHeader>REMOTE_USER</usernameHeader>
-            </httpHeader>
         </modules>
         <sequence>
             <identifier>admin-gui-saml-internal</identifier>
@@ -64,7 +60,7 @@
             </module>
         </sequence>
         <sequence>
-            <name>admin-gui-emergency</name>
+            <identifier>admin-gui-emergency</identifier>
             <description>
                 Special GUI authentication sequence that is using just the internal user password.
             </description>
@@ -76,20 +72,20 @@
             <requireAssignmentTarget oid="00000000-0000-0000-0000-000000000004" relation="org:default" type="c:RoleType">
             </requireAssignmentTarget>
             <module>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <order>30</order>
                 <necessity>sufficient</necessity>
             </module>
         </sequence>
         <sequence>
-            <name>admin-gui-default</name>
+            <identifier>admin-gui-default</identifier>
             <displayName>Default gui sequence</displayName>
             <description>
                 Special GUI authentication sequence that is using Shibboleth SP
             </description>
             <channel>
-                <default>true</default>
                 <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
+                <default>true</default>
                 <urlSuffix>shib</urlSuffix>
             </channel>
             <module>
@@ -101,8 +97,8 @@
         <sequence>
             <identifier>rest-default</identifier>
             <channel>
-                <default>true</default>
                 <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
+                <default>true</default>
                 <urlSuffix>rest-default</urlSuffix>
             </channel>
             <module>
@@ -114,8 +110,8 @@
         <sequence>
             <identifier>actuator-default</identifier>
             <channel>
-                <default>true</default>
                 <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
+                <default>true</default>
                 <urlSuffix>actuator-default</urlSuffix>
             </channel>
             <module>
@@ -136,4 +132,3 @@
         </password>
     </credentials>
 </securityPolicy>
-</objects>
diff --git a/demo/simple/docker-compose.yml b/demo/simple/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.3"
 
 services:
   data_init:
-    image: i2incommon/midpoint:${tag:-4.7.2}
+    image: i2incommon/midpoint:${tag:-4.8}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -57,7 +57,7 @@ services:
      - mp_pw:/opt/mp-pw
 
   midpoint_server:
-    image: i2incommon/midpoint:${tag:-4.7.2}
+    image: i2incommon/midpoint:${tag:-4.8}
     depends_on:
      - data_init
      - midpoint_data

diff --git a/download-midpoint.sh b/download-midpoint.sh
@@ -10,7 +10,7 @@ else
     # But if we need to incorporate interim changes to I2 distribution during
     # midPoint development cycle, we can specify concrete file from "midpoint-tier"
     # download directory by using its name (like "latest-stable").
-    MP_VERSION="4.7.2"
+    MP_VERSION="4.8"
   else
     MP_VERSION=$tag
   fi