[midPoint-git] [Evolveum/midpoint] ed2f7f: Protector and ProtectedString support for hasing (...
Radovan Semancik
radovan.semancik at evolveum.com
Mon Mar 13 10:39:10 CET 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: ed2f7f04e94f2d9a5892c853df584a81e4cde090
https://github.com/Evolveum/midpoint/commit/ed2f7f04e94f2d9a5892c853df584a81e4cde090
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
R infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/BaseProtector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/ProtectedData.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/Protector.java
A infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/ProtectorImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/XNodeProcessorUtil.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/DigestMethodType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/HashedDataType.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectFactory.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedByteArrayType.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedDataType.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedStringType.java
M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestProtectedString.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestExpressionFunctions.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java
M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java
Log Message:
-----------
Protector and ProtectedString support for hasing (PBKDF)
Commit: 64d75e7fb208fad214e4b176b587493f8389f7cd
https://github.com/Evolveum/midpoint/commit/64d75e7fb208fad214e4b176b587493f8389f7cd
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
M infra/schema/src/main/resources/localization/schema_pl.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSerialization.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
M infra/schema/src/test/resources/common/json/ns/user-jack.json
M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
M model/certification-impl/src/test/resources/sod/a-test-2a.xml
M model/certification-impl/src/test/resources/sod/a-test-2b.xml
A model/certification-impl/src/test/resources/sod/a-test-2c.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensOwnerResolver.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/LinkAction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/ModelTUtil.java
M model/model-impl/src/test/resources/common/resource-dummy.xml
M model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
M model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
M model/model-impl/testng-unit.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
M model/model-intest/src/test/resources/common/password-policy-global.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemAllocationChangeOperationInfo.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationInfo.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationSourceInfo.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
M model/workflow-impl/src/test/resources/logback-test.xml
A model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
M model/workflow-impl/src/test/resources/policy/system-configuration.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
M repo/repo-test-util/pom.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
M samples/certification/sod/a-test-2a.xml
M samples/certification/sod/a-test-2b.xml
A samples/certification/sod/a-test-2c.xml
M samples/certification/sod/sod-certification.xml
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Merge branch 'master' into feature/password-hash
Commit: 89b5fbfb1a30fc4d754f88f40d416218aaeacc04
https://github.com/Evolveum/midpoint/commit/89b5fbfb1a30fc4d754f88f40d416218aaeacc04
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ReferenceDelta.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ObjectDeltaWaves.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
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/TestAudit.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefault.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/password/security-policy-default-storage-hashing.xml
A model/model-intest/src/test/resources/password/security-policy-password-storage-none.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/UserProfileService.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
Log Message:
-----------
Password hashing: refactoring password policy processor, switch everything to security policy. Preparing the tests.
Commit: dac2f88d676e3fa5f020cd5e482a33e1ba6a3776
https://github.com/Evolveum/midpoint/commit/dac2f88d676e3fa5f020cd5e482a33e1ba6a3776
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/OriginType.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/common/system-configuration.xml
M model/model-impl/src/test/resources/lens/role-judge.xml
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
A model/workflow-impl/src/test/resources/policy/system-configuration-global.xml
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryContext.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryException.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryCriteriaImpl.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/DefaultMatcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/Matcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/PolyStringMatcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/StringMatcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AndRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/CollectionRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/InOidRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestrictionOperation.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/LogicalRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NaryLogicalRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NotRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/Restriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/TypeRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/UnaryLogicalRestriction.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryDefinitionRegistry2.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyContainerDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaDataNodeDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityPointerDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaPropertyDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaReferenceDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolutionState.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
Log Message:
-----------
Merge branch 'master' into feature/password-hash
Commit: 3181b6a1a346949eaaa4ef0503be8d8e8c117793
https://github.com/Evolveum/midpoint/commit/3181b6a1a346949eaaa4ef0503be8d8e8c117793
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/BaseProtector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/Protector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/ProtectorImpl.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
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/password/AbstractPasswordTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordNone.java
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Password hashing fixes. More tests. Work in progress.
Commit: e21fb205e7574cbf3b10410d7e359fdd485a84f9
https://github.com/Evolveum/midpoint/commit/e21fb205e7574cbf3b10410d7e359fdd485a84f9
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
Log Message:
-----------
Two provisioning fixed (GuardedString handling). Password test update.
Commit: f07569fc39abf5cb55427beda2f39efa0dc66fca
https://github.com/Evolveum/midpoint/commit/f07569fc39abf5cb55427beda2f39efa0dc66fca
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordNone.java
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
Log Message:
-----------
Password history hashing. Fixes.
Commit: 73526afc961182becc9d0f14c63298d6ec4b5c8d
https://github.com/Evolveum/midpoint/commit/73526afc961182becc9d0f14c63298d6ec4b5c8d
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
Changed paths:
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/AbstractInitializedModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTolerantAttributes.java
A model/model-intest/src/test/resources/preview/resource-dummy-lemon.xml
R model/model-intest/src/test/resources/preview/resource-dummy-yellow.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
Log Message:
-----------
Test cleanup (possible fix for test deadlock)
Commit: f8f9e3a6909fe1975dd19664efeb02bf6aafd9f3
https://github.com/Evolveum/midpoint/commit/f8f9e3a6909fe1975dd19664efeb02bf6aafd9f3
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
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/web/application/DescriptorLoader.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/Url.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointPageParametersEncoder.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MountedMapperWithoutPageComponentInfo.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PlusMinusZero.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugDumpable.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionEnvironment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/EnableDisableExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/PurgeSchemaExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ResolveExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/TestResourceExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ValidateExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
M model/model-impl/src/test/resources/lens/role-corp-engineer.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/SimpleObjectRef.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/SimpleObjectRefImpl.java
M repo/repo-api/pom.xml
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
M repo/repo-cache/pom.xml
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
A samples/tasks/bulk-actions/continue-on-any-error.xml
M samples/tasks/bulk-actions/send-notifications-about-all-users.xml
Log Message:
-----------
Merge branch 'master' into feature/password-hash
Commit: 8f545b4387dcf6e95acc38146b1d20fba83e7cd8
https://github.com/Evolveum/midpoint/commit/8f545b4387dcf6e95acc38146b1d20fba83e7cd8
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
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/column/ObjectNameColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/DefaultPageParametersEncoder.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Merge branch 'master' into feature/password-hash
Commit: 88df3880575518665573fa785d696719df7deeb9
https://github.com/Evolveum/midpoint/commit/88df3880575518665573fa785d696719df7deeb9
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Fixing intests
Compare: https://github.com/Evolveum/midpoint/compare/a8837dc5de74...88df38805755
More information about the midPoint-svn
mailing list