[midPoint-git] midPoint branch master updated. v2.3devel-1255-gd3bbfa9
Radovan Semancik
git at evolveum.com
Mon Mar 17 20:39:57 CET 2014
Project "midPoint" branch master has been updated
via d3bbfa9eab950595e2516ccbb6a51807e63232b0 (commit) v2.3devel-1255-gd3bbfa9
via fbd3f5f07c19f7ded915606ec04b68cea1107077 (commit) v2.3devel-1253-gfbd3f5f
from f59636e2c2cd97016f87cf785b1a41bee7c5e143 (commit) v2.3devel-1253-gf59636e
- Log -----------------------------------------------------------------
commit d3bbfa9eab950595e2516ccbb6a51807e63232b0
Merge: fbd3f5f f59636e
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Mon Mar 17 20:33:24 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit fbd3f5f07c19f7ded915606ec04b68cea1107077
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Mon Mar 17 20:33:02 2014 +0100
Refactoring security components
-----------------------------------------------------------------------
(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)
Summary of changes:
gui/admin-gui/pom.xml | 11 ++
.../evolveum/midpoint/init/InitialDataImport.java | 6 +-
.../web/component/menu/top/UserMenuPanel.java | 3 +-
.../com/evolveum/midpoint/web/page/PageBase.java | 4 +-
.../com/evolveum/midpoint/web/page/PageTest.java | 3 +-
.../com/evolveum/midpoint/web/page/PageTest2.java | 3 +-
.../midpoint/web/page/admin/PageAdmin.java | 3 +-
.../web/page/admin/configuration/PageAbout.java | 3 +-
.../web/page/admin/configuration/PageAccounts.java | 4 +-
.../configuration/PageAdminConfiguration.java | 2 +-
.../page/admin/configuration/PageDebugList.java | 3 +-
.../page/admin/configuration/PageDebugView.java | 4 +-
.../page/admin/configuration/PageImportObject.java | 3 +-
.../configuration/PageSystemConfiguration.java | 4 +-
.../web/page/admin/home/PageAdminHome.java | 2 +-
.../web/page/admin/home/PageDashboard.java | 5 +-
.../web/page/admin/home/PageMyPasswords.java | 3 +-
.../web/page/admin/reports/PageAdminReports.java | 3 +-
.../web/page/admin/reports/PageCreatedReports.java | 4 +-
.../web/page/admin/reports/PageReport.java | 3 +-
.../web/page/admin/reports/PageReports.java | 3 +-
.../page/admin/resources/PageAdminResources.java | 3 +-
.../web/page/admin/resources/PageResource.java | 4 +-
.../web/page/admin/resources/PageResourceEdit.java | 3 +-
.../page/admin/resources/PageResourceWizard.java | 3 +-
.../web/page/admin/resources/PageResources.java | 3 +-
.../page/admin/resources/content/PageAccount.java | 3 +-
.../resources/content/PageContentAccounts.java | 4 +-
.../resources/content/PageContentEntitlements.java | 3 +-
.../web/page/admin/roles/PageAdminRoles.java | 2 +-
.../midpoint/web/page/admin/roles/PageRole.java | 4 +-
.../midpoint/web/page/admin/roles/PageRoleOld.java | 2 +-
.../midpoint/web/page/admin/roles/PageRoles.java | 3 +-
.../web/page/admin/server/PageAdminTasks.java | 2 +-
.../web/page/admin/server/PageTaskAdd.java | 5 +-
.../web/page/admin/server/PageTaskEdit.java | 3 +-
.../midpoint/web/page/admin/server/PageTasks.java | 3 +-
.../web/page/admin/users/PageAdminUsers.java | 2 +-
.../web/page/admin/users/PageBulkUsers.java | 3 +-
.../web/page/admin/users/PageFindUsers.java | 2 +-
.../midpoint/web/page/admin/users/PageOrgTree.java | 3 +-
.../midpoint/web/page/admin/users/PageOrgUnit.java | 3 +-
.../midpoint/web/page/admin/users/PageUser.java | 4 +-
.../midpoint/web/page/admin/users/PageUsers.java | 3 +-
.../page/admin/workflow/PageAdminWorkItems.java | 2 +-
.../page/admin/workflow/PageProcessInstance.java | 3 +-
.../page/admin/workflow/PageProcessInstances.java | 3 +-
.../admin/workflow/PageProcessInstancesAll.java | 3 +-
.../workflow/PageProcessInstancesRequestedBy.java | 3 +-
.../workflow/PageProcessInstancesRequestedFor.java | 3 +-
.../web/page/admin/workflow/PageWorkItem.java | 3 +-
.../web/page/admin/workflow/PageWorkItems.java | 2 +-
.../workflow/dto/ProcessInstanceDtoProvider.java | 3 +-
.../admin/workflow/dto/WorkItemDtoProvider.java | 3 +-
.../web/security/AuditedLogoutHandler.java | 4 +-
.../web/security/MidPointAuthWebSession.java | 5 +-
.../security/MidPointAuthenticationProvider.java | 6 +-
.../MidPointGuiAuthorizationEvaluator.java | 62 +++++-
.../midpoint/web/security/PageUrlMapping.java | 2 +-
.../midpoint/web/security/SecurityUtils.java | 3 +-
.../evolveum/midpoint/web/util/WebMiscUtil.java | 8 +-
gui/admin-gui/src/main/webapp/WEB-INF/web.xml | 1 +
.../com/evolveum/midpoint/web/PageUserTest.java | 1 +
.../midpoint/web/SpringApplicationContextTest.java | 1 +
.../evolveum/midpoint/web/TestCleanStartup.java | 1 +
gui/admin-gui/src/test/resources/ctx-test.xml | 1 +
.../common/security/AuthorizationEvaluator.java | 205 --------------------
model/model-api/pom.xml | 5 +
.../evolveum/midpoint/model/api/ModelService.java | 2 +-
model/model-impl/pom.xml | 11 ++
.../evolveum/midpoint/model/ModelWebService.java | 4 +-
.../midpoint/model/controller/ModelController.java | 6 +-
.../evolveum/midpoint/model/lens/Assignment.java | 2 +-
.../midpoint/model/lens/AssignmentEvaluator.java | 2 +-
.../midpoint/model/lens/ChangeExecutor.java | 2 +-
.../MidpointRestAuthenticationHandler.java | 8 +-
.../midpoint/model/security/PasswordCallback.java | 4 +-
.../SpringAuthenticationInjectorInterceptor.java | 24 ++-
.../SpringAuthenticationJanitorInterceptor.java | 2 +-
.../model/security/UserProfileServiceImpl.java | 8 +-
model/model-impl/src/main/resources/ctx-model.xml | 5 +-
.../midpoint/model/ModelWebServiceTest.java | 2 +-
.../src/test/resources/ctx-model-test-main.xml | 1 +
.../src/test/resources/ctx-model-test-no-repo.xml | 1 +
model/model-intest/pom.xml | 6 +
.../midpoint/model/intest/TestSecurity.java | 23 +--
.../test/resources/ctx-model-intest-test-main.xml | 2 +
.../model/test/AbstractModelIntegrationTest.java | 8 +-
model/notifications-impl/pom.xml | 6 +
.../midpoint/notifications/TestTextFormatter.java | 1 +
model/report-impl/pom.xml | 6 +
.../src/test/resources/ctx-report-test-main.xml | 1 +
model/workflow-impl/pom.xml | 6 +
.../midpoint/wf/activiti/dao/WorkItemManager.java | 19 +-
.../itemApproval/RecordIndividualDecision.java | 18 +-
.../midpoint/wf/processors/BaseAuditHelper.java | 20 +-
.../wf/processors/primary/PcpRepoAccessHelper.java | 7 +-
.../evolveum/midpoint/wf/util/MiscDataUtil.java | 52 +++--
.../src/test/resources/ctx-workflow-test-main.xml | 1 +
provisioning/provisioning-impl/pom.xml | 6 +
.../test/resources/ctx-provisioning-test-main.xml | 1 +
.../resources/ctx-provisioning-test-no-repo.xml | 1 +
repo/pom.xml | 2 +
repo/{task-api => security-api}/pom.xml | 6 +-
.../midpoint/security/api}/Authorization.java | 2 +-
.../security/api}/AuthorizationConstants.java | 2 +-
.../midpoint/security/api}/MidPointPrincipal.java | 2 +-
.../midpoint/security/api/SecurityEnforcer.java | 62 ++++++
.../midpoint/security/api/SecurityUtil.java | 49 +++++
.../midpoint/security/api}/UserProfileService.java | 2 +-
repo/{task-api => security-api}/testng.xml | 2 +-
repo/{audit-impl => security-impl}/pom.xml | 26 +--
.../security/impl/SecurityEnforcerImpl.java | 138 ++++++++++++-
.../src/main/resources/ctx-security.xml | 17 +-
repo/{audit-impl => security-impl}/testng.xml | 4 +-
repo/task-quartz-impl/pom.xml | 11 ++
.../task/quartzimpl/TaskManagerQuartzImpl.java | 2 +-
.../midpoint/task/quartzimpl/CleanupTest.java | 1 +
.../quartzimpl/TestQuartzTaskManagerContract.java | 1 +
.../src/test/resources/ctx-samples-test-main.xml | 1 +
testing/consistency-mechanism/pom.xml | 5 +
.../test/resources/ctx-consistency-test-main.xml | 1 +
testing/longtest/pom.xml | 5 +
.../src/test/resources/ctx-longtest-test-main.xml | 1 +
.../rest/src/test/resources/ctx-rest-test-main.xml | 1 +
testing/sanity/pom.xml | 5 +
.../src/test/resources/ctx-sanity-test-main.xml | 1 +
testing/story/pom.xml | 5 +
.../src/test/resources/ctx-story-test-main.xml | 1 +
.../midpoint/tools/ninja/BaseNinjaAction.java | 2 +-
130 files changed, 677 insertions(+), 430 deletions(-)
delete mode 100644 infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationEvaluator.java
copy repo/{task-api => security-api}/pom.xml (92%)
rename {infra/common/src/main/java/com/evolveum/midpoint/common/security => repo/security-api/src/main/java/com/evolveum/midpoint/security/api}/Authorization.java (98%)
rename {infra/common/src/main/java/com/evolveum/midpoint/common/security => repo/security-api/src/main/java/com/evolveum/midpoint/security/api}/AuthorizationConstants.java (99%)
rename {infra/common/src/main/java/com/evolveum/midpoint/common/security => repo/security-api/src/main/java/com/evolveum/midpoint/security/api}/MidPointPrincipal.java (99%)
create mode 100644 repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
create mode 100644 repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
rename {infra/common/src/main/java/com/evolveum/midpoint/common/security => repo/security-api/src/main/java/com/evolveum/midpoint/security/api}/UserProfileService.java (96%)
copy repo/{task-api => security-api}/testng.xml (90%)
copy repo/{audit-impl => security-impl}/pom.xml (85%)
rename infra/common/src/main/java/com/evolveum/midpoint/common/security/SecurityEnforcer.java => repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java (65%)
copy infra/common/src/main/resources/ctx-common.xml => repo/security-impl/src/main/resources/ctx-security.xml (72%)
copy repo/{audit-impl => security-impl}/testng.xml (88%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list