Upgrade to 4.6

docker · Nov 29, 2022 · bbff202 · bbff202
1 parent 6030970
commit bbff202
Showing 12 changed files with 723 additions and 89 deletions.
diff --git a/common.bash b/common.bash
@@ -1,3 +1,3 @@
 maintainer="i2incommon"
 imagename="midpoint"
-tag="4.5"
+tag="4.6"
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.5}
+    image: i2incommon/midpoint:${tag:-4.6}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -229,7 +229,7 @@ services:
     build:
       context: ./midpoint_server/
       args:
-        tag: ${tag:-4.5}
+        tag: ${tag:-4.6}
     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.5
+ARG tag=4.6
 
 FROM i2incommon/midpoint:${tag}
 

diff --git a/...ontainer_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml b/...ontainer_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml
@@ -162,12 +162,13 @@
                             import com.evolveum.midpoint.schema.*
                             import com.evolveum.midpoint.xml.ns._public.common.common_3.*
                             import com.evolveum.midpoint.model.common.expression.ModelExpressionThreadLocalHolder
+                            import com.evolveum.midpoint.model.api.context.ProjectionContextKey
 
                             GROUPER_RESOURCE_OID = '1eff65de-5bb6-483d-9edf-8cc2c2ee0233'
 
                             modelContext = ModelExpressionThreadLocalHolder.lensContext
-                            rsd = new ResourceShadowDiscriminator(GROUPER_RESOURCE_OID, ShadowKindType.ENTITLEMENT, 'group', null, false)
-                            if (modelContext.findProjectionContext(rsd) != null) {
+
+                            if (modelContext.findProjectionContextByKeyExact(ProjectionContextKey.classified(GROUPER_RESOURCE_OID, ShadowKindType.ENTITLEMENT, 'group', null)) != null) {
                                 log.info('Projection context for Grouper group found, marking as "active"')
                                 'active'
                             } else {

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
@@ -7,11 +7,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <name>loginForm</name>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <name>httpBasic</name>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
             <saml2>
@@ -46,17 +46,18 @@
         </modules>
         <sequence>
             <name>admin-gui-default</name>
+            <displayName>Default gui sequence</displayName>
             <description>
                 Default GUI authentication sequence.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
                 <default>true</default>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
                 <urlSuffix>gui-default</urlSuffix>
             </channel>
             <module>
-                <name>internalLoginForm</name>
-                <order>30</order>
+                <name>loginForm</name>
+                <order>1</order>
                 <necessity>sufficient</necessity>
             </module>
         </sequence>
@@ -79,48 +80,46 @@
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <name>rest-default</name>
             <description>
                 Authentication sequence for REST service.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
                 <default>true</default>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
                 <urlSuffix>rest-default</urlSuffix>
             </channel>
             <module>
-                <name>internalBasic</name>
-                <order>10</order>
+                <name>httpBasic</name>
+                <order>1</order>
                 <necessity>sufficient</necessity>
             </module>
         </sequence>
         <sequence>
-            <name>actuator</name>
+            <name>actuator-default</name>
             <description>
                 Authentication sequence for actuator.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
                 <default>true</default>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
                 <urlSuffix>actuator-default</urlSuffix>
             </channel>
             <module>
-                <name>internalBasic</name>
-                <order>10</order>
+                <name>httpBasic</name>
+                <order>1</order>
                 <necessity>sufficient</necessity>
             </module>
         </sequence>
-	<ignoredLocalPath>/actuator</ignoredLocalPath>
-    	<ignoredLocalPath>/actuator/health</ignoredLocalPath>
+        <ignoredLocalPath>/actuator/health</ignoredLocalPath>
     </authentication>
     <credentials>
         <password>
             <minOccurs>0</minOccurs>
             <lockoutMaxFailedAttempts>3</lockoutMaxFailedAttempts>
             <lockoutFailedAttemptsDuration>PT3M</lockoutFailedAttemptsDuration>
             <lockoutDuration>PT15M</lockoutDuration>
-            <valuePolicyRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="00000000-0000-0000-0000-000000000003" relation="org:default" type="tns:ValuePolicyType">
-            </valuePolicyRef>
+            <valuePolicyRef oid="00000000-0000-0000-0000-000000000003"/>
         </password>
     </credentials>
 </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.5}
+    image: i2incommon/midpoint:${tag:-4.6}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -61,7 +61,7 @@ services:
     build:
       context: ./midpoint_server/
       args:
-        tag: ${tag:-4.5}
+        tag: ${tag:-4.6}
     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.5}
+    image: i2incommon/midpoint:${tag:-4.6}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -58,7 +58,7 @@ services:
     build:
       context: ./midpoint_server/
       args:
-        tag: ${tag:-4.5}
+        tag: ${tag:-4.6}
     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.5
+ARG tag=4.6
 
 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
@@ -7,11 +7,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <name>loginForm</name>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <name>httpBasic</name>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
             <saml2>
@@ -85,53 +85,53 @@
         </sequence>
         <sequence>
             <name>admin-gui-default</name>
+            <displayName>Default gui sequence</displayName>
             <description>
                 Special GUI authentication sequence that is using Shibboleth SP
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
                 <default>true</default>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
                 <urlSuffix>shib</urlSuffix>
             </channel>
             <module>
                 <name>httpHeader</name>
-                <order>30</order>
+                <order>1</order>
                 <necessity>sufficient</necessity>
             </module>
         </sequence>
         <sequence>
-            <name>rest</name>
+            <name>rest-default</name>
             <description>
                 Authentication sequence for REST service.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
                 <default>true</default>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
                 <urlSuffix>rest-default</urlSuffix>
             </channel>
             <module>
-                <name>internalBasic</name>
-                <order>10</order>
+                <name>httpBasic</name>
+                <order>1</order>
                 <necessity>sufficient</necessity>
             </module>
         </sequence>
         <sequence>
-            <name>actuator</name>
+            <name>actuator-default</name>
             <description>
                 Authentication sequence for actuator.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
                 <default>true</default>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
                 <urlSuffix>actuator-default</urlSuffix>
             </channel>
             <module>
-                <name>internalBasic</name>
-                <order>10</order>
+                <name>httpBasic</name>
+                <order>1</order>
                 <necessity>sufficient</necessity>
             </module>
         </sequence>
-        <ignoredLocalPath>/actuator</ignoredLocalPath>
         <ignoredLocalPath>/actuator/health</ignoredLocalPath>
     </authentication>
     <credentials>
@@ -140,10 +140,8 @@
             <lockoutMaxFailedAttempts>3</lockoutMaxFailedAttempts>
             <lockoutFailedAttemptsDuration>PT3M</lockoutFailedAttemptsDuration>
             <lockoutDuration>PT15M</lockoutDuration>
-            <valuePolicyRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="00000000-0000-0000-0000-000000000003" relation="org:default" type="tns:ValuePolicyType">
-            </valuePolicyRef>
+            <valuePolicyRef oid="00000000-0000-0000-0000-000000000003"/>
         </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.5}
+    image: i2incommon/midpoint:${tag:-4.6}
     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.5}
+    image: i2incommon/midpoint:${tag:-4.6}
     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.5"
+    MP_VERSION="4.6"
   else
     MP_VERSION=$tag
   fi