[midPoint-git] [Evolveum/midpoint] f465e9: Fix evaluation of modification policy constraints
mederly
noreply at github.com
Wed Sep 21 11:37:01 CEST 2022
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: f465e917e3d480ed972d03d93c0ae8bb09d16065
https://github.com/Evolveum/midpoint/commit/f465e917e3d480ed972d03d93c0ae8bb09d16065
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-09-21 (Wed, 21 Sep 2022)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentModificationConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ModificationConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ObjectModificationConstraintEvaluator.java
M model/model-impl/src/test/resources/lens/policy/role-ambiguous-reference.xml
M model/model-impl/src/test/resources/lens/policy/role-chained-references.xml
M model/model-impl/src/test/resources/lens/policy/role-cyclic-references.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
M model/model-intest/src/test/resources/common/system-configuration.xml
M model/model-intest/src/test/resources/rbac/role-immutable-assign.xml
M model/model-intest/src/test/resources/rbac/role-immutable-description-global.xml
M model/model-intest/src/test/resources/rbac/role-immutable-global.xml
A model/model-intest/src/test/resources/rbac/role-immutable-sea-global.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
A model/workflow-impl/src/test/resources/assignments-advanced/role-extension-property-mod-approval.xml
M model/workflow-impl/src/test/resources/schema/piracy.xsd
Log Message:
-----------
Fix evaluation of modification policy constraints
The "items" property of modification policy constraints was
evaluated by simply looking at the list of modifications that
are to be applied. However, this did not work correctly when
(e.g.) the whole container (containing the item in question)
was added - see e.g. MID-7945. Similar situation could be when
the container is deleted.
This is now fixed by changing the approach altogether. Instead of
looking at the deltas, we directly compare "old" and "new" object
or assignment values regarding the respective item(s).
This should fix MID-7945.
Commit: 4c8bf5d270ba8b66f7445d93f46fffff9fac9bd7
https://github.com/Evolveum/midpoint/commit/4c8bf5d270ba8b66f7445d93f46fffff9fac9bd7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-09-21 (Wed, 21 Sep 2022)
Changed paths:
M gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/AdminLTESkin.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/AbstractWizardBasicPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/AbstractWizardBasicPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/AbstractValueFormResourceWizardStepPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/ResourceWizardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/AbstractFormResourceWizardStepPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/AbstractFormResourceWizardStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/BasicResourceWizardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/ObjectClassWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/ResourceTemplateProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/SelectObjectClassesStepPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/basic/SelectObjectClassesStepPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingWizardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/objectType/synchronization/SynchronizationConfigWizardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/ComplexPropertyInputPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/MailServerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/SmsGatewayPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/SmsGatewayPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ResourceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ProvisioningInitialSetup.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PagingSizePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PagingSizePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemListWithDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
M gui/admin-gui/src/main/resources/ctx-init.xml
M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/MidScaleGuiTest.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestFilterSimplifier.java
M model/authentication-impl/src/test/java/com/evolveum/midpoint/authentication/TestIntegrationSecurity.java
M model/authentication-impl/src/test/java/com/evolveum/midpoint/authentication/evaluator/TestAbstractAuthenticationEvaluator.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractUninitializedCertificationTest.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractEmptyModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/transport/impl/SmsMessageTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/transport/impl/legacy/LegacySimpleSmsTransport.java
M model/report-impl/src/test/java/com/evolveum/midpoint/report/EmptyReportIntegrationTest.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
M repo/audit-log-impl/pom.xml
R repo/audit-log-impl/src/test/java/com/evolveum/midpoint/audit/impl/TestAuditServiceImpl.java
R repo/audit-log-impl/src/test/resources/ctx-audit-test.xml
R repo/audit-log-impl/src/test/resources/logback-test.xml
R repo/audit-log-impl/testng-integration.xml
R repo/audit-log-impl/testng-unit.xml
A repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/TestAuditServiceImpl.java
M repo/repo-common/testng-integration.xml
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleServiceBase.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/SqaleAuditService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/AbstractLongTest.java
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRunAs.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractAuthentication.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNormalizers.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/consistency/TestConsistencyMechanism.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/1e1666ae5cfa...4c8bf5d270ba
More information about the midPoint-svn
mailing list