You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/05/26 06:43:13 UTC
[isis] 01/01: Merge pull request #560 from apache/ISIS-2698
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f7287608a9d5a7be429fb39dadc6f9b13411c677
Merge: 6ce03f0 12adb47
Author: Dan Haywood <da...@apache.org>
AuthorDate: Wed May 26 07:42:58 2021 +0100
Merge pull request #560 from apache/ISIS-2698
Isis 2698
.../index/secman/api/user/dom/ApplicationUser.adoc | 4 +-
.../manager/AuthorizationManager.java | 1 +
examples/demo/domain/pom.xml | 2 +-
.../main/java/demoapp/dom/DemoModuleCommon.java | 6 +-
.../ApplicationTenancyEvaluatorForDemo.java | 4 +-
examples/demo/pom.xml | 6 +-
.../java/demoapp/web/DemoAppManifestCommon.java | 4 +-
extensions/pom.xml | 2 +-
.../secman/api/IsisModuleExtSecmanApi.java | 179 --------------------
.../encryption/PasswordEncryptionServiceNone.java | 42 -----
extensions/security/secman/{api => applib}/pom.xml | 4 +-
.../secman/applib/IsisModuleExtSecmanApplib.java | 180 +++++++++++++++++++++
.../secman/applib}/SecmanConfiguration.java | 4 +-
.../feature/api/ApplicationFeatureChoices.java | 10 +-
.../ApplicationFeatureViewModel_permissions.java | 6 +-
.../app/ApplicationOrphanedPermissionManager.java | 12 +-
...OrphanedPermissionManager_relocateSelected.java | 12 +-
.../permission/dom/ApplicationPermission.java | 14 +-
.../dom/ApplicationPermission.layout.fallback.xml | 0
.../permission/dom/ApplicationPermissionMode.java | 2 +-
.../dom/ApplicationPermissionRepository.java | 6 +-
.../ApplicationPermissionRepositoryAbstract.java | 20 +--
.../permission/dom/ApplicationPermissionRule.java | 2 +-
.../permission/dom/ApplicationPermissionValue.java | 2 +-
.../dom/ApplicationPermissionValueSet.java | 12 +-
.../dom/mixins/ApplicationPermission_allow.java | 12 +-
.../dom/mixins/ApplicationPermission_changing.java | 12 +-
.../dom/mixins/ApplicationPermission_delete.java | 12 +-
.../dom/mixins/ApplicationPermission_feature.java | 8 +-
.../mixins/ApplicationPermission_updateRole.java | 14 +-
.../dom/mixins/ApplicationPermission_veto.java | 12 +-
.../dom/mixins/ApplicationPermission_viewing.java | 12 +-
.../permission/menu/ApplicationPermissionMenu.java | 18 +--
.../spi/PermissionsEvaluationService.java | 14 +-
.../spi/PermissionsEvaluationServiceAbstract.java | 8 +-
...PermissionsEvaluationServiceAllowBeatsVeto.java | 10 +-
...PermissionsEvaluationServiceVetoBeatsAllow.java | 12 +-
.../secman/applib}/role/dom/ApplicationRole.java | 20 +--
.../role/dom/ApplicationRole.layout.fallback.xml | 0
.../role/dom/ApplicationRoleRepository.java | 4 +-
.../dom/ApplicationRoleRepositoryAbstract.java | 10 +-
.../dom/mixins/ApplicationRole_addPermission.java | 20 +--
.../role/dom/mixins/ApplicationRole_addUser.java | 16 +-
.../role/dom/mixins/ApplicationRole_delete.java | 12 +-
.../mixins/ApplicationRole_removePermissions.java | 16 +-
.../dom/mixins/ApplicationRole_removeUsers.java | 16 +-
.../mixins/ApplicationRole_updateDescription.java | 10 +-
.../dom/mixins/ApplicationRole_updateName.java | 10 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 10 +-
.../applib}/role/menu/ApplicationRoleMenu.java | 16 +-
.../seed}/IsisAppFeatureRoleAndPermissions.java | 11 +-
.../seed}/IsisConfigurationRoleAndPermissions.java | 9 +-
.../seed}/IsisExtH2ConsoleRoleAndPermissions.java | 8 +-
.../IsisExtSecmanAdminRoleAndPermissions.java | 11 +-
...IsisExtSecmanRegularUserRoleAndPermissions.java | 23 ++-
...sPersistenceJdoMetaModelRoleAndPermissions.java | 8 +-
.../IsisSudoImpersonateRoleAndPermissions.java | 8 +-
...werRestfulObjectsSwaggerRoleAndPermissions.java | 9 +-
.../applib}/seed/SeedSecurityModuleService.java | 4 +-
.../scripts/SeedUsersAndRolesFixtureScript.java | 24 +--
.../applib}/tenancy/dom/ApplicationTenancy.java | 14 +-
.../dom/ApplicationTenancy.layout.fallback.xml | 0
.../tenancy/dom/ApplicationTenancyRepository.java | 4 +-
.../dom/ApplicationTenancyRepositoryAbstract.java | 6 +-
.../secman/applib}/tenancy/dom/HasAtPath.java | 4 +-
.../dom/mixins/ApplicationTenancy_addChild.java | 12 +-
.../dom/mixins/ApplicationTenancy_addUser.java | 16 +-
.../dom/mixins/ApplicationTenancy_delete.java | 16 +-
.../dom/mixins/ApplicationTenancy_removeChild.java | 12 +-
.../dom/mixins/ApplicationTenancy_removeUser.java | 16 +-
.../dom/mixins/ApplicationTenancy_updateName.java | 10 +-
.../dom/mixins/ApplicationTenancy_users.java | 10 +-
.../fixtures/AbstractTenancyFixtureScript.java | 6 +-
.../tenancy/menu/ApplicationTenancyMenu.java | 16 +-
.../secman/applib/tenancy/seed}/GlobalTenancy.java | 4 +-
.../tenancy/spi/ApplicationTenancyEvaluator.java | 4 +-
.../secman/applib}/user/ApplicationUser.java | 0
.../applib}/user/app/ApplicationUserManager.java | 6 +-
.../app/ApplicationUserManager.layout.fallback.xml | 0
.../mixins/ApplicationUserManager_allUsers.java | 8 +-
.../ApplicationUserManager_newDelegateUser.java | 22 +--
.../ApplicationUserManager_newLocalUser.java | 24 +--
...pplicationUserManager_newLocalUserAbstract.java | 2 +-
.../user/contributions/HasUsername_open.java | 10 +-
.../secman/applib}/user/dom/AccountType.java | 2 +-
.../secman/applib}/user/dom/ApplicationUser.java | 34 ++--
.../user/dom/ApplicationUser.layout.fallback.xml | 0
.../user/dom/ApplicationUserRepository.java | 6 +-
.../dom/ApplicationUserRepositoryAbstract.java | 18 +--
.../applib}/user/dom/ApplicationUserStatus.java | 2 +-
.../user/dom/mixins/ApplicationUser_addRole.java | 14 +-
.../user/dom/mixins/ApplicationUser_delete.java | 12 +-
.../user/dom/mixins/ApplicationUser_duplicate.java | 18 +--
.../user/dom/mixins/ApplicationUser_lock.java | 16 +-
.../dom/mixins/ApplicationUser_removeRoles.java | 16 +-
.../dom/mixins/ApplicationUser_resetPassword.java | 12 +-
.../user/dom/mixins/ApplicationUser_unlock.java | 12 +-
.../mixins/ApplicationUser_updateAccountType.java | 14 +-
.../dom/mixins/ApplicationUser_updateAtPath.java | 10 +-
.../mixins/ApplicationUser_updateEmailAddress.java | 10 +-
.../mixins/ApplicationUser_updateFaxNumber.java | 10 +-
.../dom/mixins/ApplicationUser_updateName.java | 10 +-
.../dom/mixins/ApplicationUser_updatePassword.java | 14 +-
.../mixins/ApplicationUser_updatePhoneNumber.java | 10 +-
.../dom/mixins/ApplicationUser_updateUsername.java | 10 +-
.../perms/ApplicationUser_filterPermissions.java | 10 +-
.../mixins/perms/ApplicationUser_permissions.java | 8 +-
.../dom/mixins/perms/UserPermissionViewModel.java | 24 +--
.../UserPermissionViewModel.layout.fallback.xml | 0
.../applib}/user/events/UserCreatedEvent.java | 6 +-
.../AbstractUserAndRolesFixtureScript.java | 12 +-
.../applib}/user/menu/ApplicationUserMenu.java | 15 +-
.../secman/applib}/user/menu/MeService.java | 16 +-
.../applib/user/seed}/IsisExtSecmanAdminUser.java | 9 +-
.../user/spi}/PasswordEncryptionService.java | 2 +-
.../secman/applib}/util/RegexReplacer.java | 2 +-
.../security/secman/encryption-jbcrypt/pom.xml | 10 +-
.../PasswordEncryptionServiceUsingJBcrypt.java | 2 +-
.../security/secman/{model => integration}/pom.xml | 10 +-
.../IsisModuleExtSecmanIntegration.java} | 22 +--
.../integration}/authorizor/AuthorizorSecman.java | 8 +-
.../facets/TenantedAuthorizationFacet.java | 2 +-
.../facets/TenantedAuthorizationFacetDefault.java | 8 +-
.../facets/TenantedAuthorizationPostProcessor.java | 6 +-
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 12 +-
.../TableColumnVisibilityServiceForSecman.java | 6 +-
.../userreg/UserRegistrationServiceForSecman.java | 10 +-
.../main/resources/images/ApplicationFeature.png | Bin
.../ApplicationOrphanedPermissionManager.png | Bin
.../main/resources/images/ApplicationPassword.png | Bin
.../resources/images/ApplicationPermission.png | Bin
.../src/main/resources/images/ApplicationRole.png | Bin
.../main/resources/images/ApplicationTenancy.png | Bin
.../resources/images/ApplicationUser-locked.png | Bin
.../resources/images/ApplicationUser-unlocked.png | Bin
.../resources/images/ApplicationUserManager.png | Bin
.../src/main/resources/images/UserPermission.png | Bin
.../src/main/resources/images/zip/key_security.zip | Bin
.../src/main/resources/images/zip/outline_star.zip | Bin
.../main/resources/images/zip/question_shield.zip | Bin
.../main/resources/images/zip/theatre_masks.zip | Bin
.../src/main/resources/images/zip/user.zip | Bin
.../resources/images/zip/worldwide_location.zip | Bin
extensions/security/secman/persistence-jdo/pom.xml | 4 +-
.../jdo/IsisModuleExtSecmanPersistenceJdo.java | 4 +-
.../jdo/permission/dom/ApplicationPermission.java | 18 +--
.../dom/ApplicationPermissionRepository.java | 2 +-
.../secman/jdo/role/dom/ApplicationRole.java | 8 +-
.../jdo/role/dom/ApplicationRoleRepository.java | 2 +-
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 18 +--
.../tenancy/dom/ApplicationTenancyRepository.java | 2 +-
.../secman/jdo/user/dom/ApplicationUser.java | 29 ++--
.../jdo/user/dom/ApplicationUserRepository.java | 2 +-
.../extensions/secman/jdo/util/RegexReplacer.java | 2 +-
extensions/security/secman/persistence-jpa/pom.xml | 4 +-
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 4 +-
.../jpa/permission/dom/ApplicationPermission.java | 18 +--
.../dom/ApplicationPermissionRepository.java | 10 +-
.../secman/jpa/role/dom/ApplicationRole.java | 8 +-
.../jpa/role/dom/ApplicationRoleRepository.java | 2 +-
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 19 ++-
.../tenancy/dom/ApplicationTenancyRepository.java | 2 +-
.../secman/jpa/user/dom/ApplicationUser.java | 37 ++---
.../jpa/user/dom/ApplicationUserRepository.java | 2 +-
.../extensions/secman/jpa/util/RegexReplacer.java | 2 +-
extensions/security/secman/pom.xml | 12 +-
extensions/security/secman/shiro-realm/pom.xml | 8 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 8 +-
.../secman/shiro/PermissionForMember.java | 2 +-
.../secman/shiro/PrincipalForApplicationUser.java | 10 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 4 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 4 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 16 +-
regressiontests/pom.xml | 2 +-
.../conf/Configuration_usingJdoAndShiro.java | 6 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 10 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 10 +-
177 files changed, 922 insertions(+), 996 deletions(-)