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 2022/08/23 21:36:25 UTC
[isis] branch master updated (95a7be35ac -> 54e565639b)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from 95a7be35ac ISIS-3162: minor: LayoutServiceDefault: wrap the entire call with a try
add 1a74dbc1dd ISIS-3169: keycloak and secman improvements.
add ff2ed380e2 ISIS-3169: fixes modules ref to renamed modules
add fd4d3266df ISIS-3169: fixes artifactId for delegated module
add 8499178412 ISIS-3169: also adds auto-created users to a set of initial roles.
add bc7bc7346f ISIS-3169: registers ApplicationUserAutoCreationService, doh!
new 54e565639b Merge pull request #1063 from apache/ISIS-3169
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/isis/core/config/IsisConfiguration.java | 76 +++++++++++++++-
examples/demo/domain/pom.xml | 2 +-
examples/demo/domain/src/main/resources/shiro.ini | 4 +-
extensions/pom.xml | 7 +-
.../secman/pages/setting-up-with-keycloak.adoc | 5 +-
.../secman/pages/setting-up-with-shiro.adoc | 8 +-
.../pages/setting-up-with-spring-oauth2.adoc | 39 +++++++-
.../{shiro-realm => delegated-shiro}/pom.xml | 6 +-
.../shiro/IsisModuleExtSecmanDelegatedShiro.java} | 5 +-
.../shiro/realm}/AuthInfoForApplicationUser.java | 5 +-
.../realm/AuthenticationStrategyForSecMan.java} | 6 +-
.../realm}/IsisModuleExtSecmanShiroRealm.java | 5 +-
.../shiro/realm}/PermissionForMember.java | 5 +-
.../PermissionResolverForIsisShiroAuthorizor.java | 3 +-
...lCollectionForApplicationUserOnSingleRealm.java | 3 +-
...inglePrincipalForApplicationUserInAnyRealm.java | 3 +-
.../shiro/realm}/PrincipalForApplicationUser.java | 3 +-
.../secman/delegated}/shiro/util/ShiroUtils.java | 5 +-
.../{applib => delegated-springoauth2}/pom.xml | 38 +++-----
.../IsisModuleExtSecmanDelegatedSpringOauth2.java | 15 +--
.../dom/ApplicationUserAutoCreationService.java | 101 +++++++++++++++++++++
extensions/security/secman/pom.xml | 10 +-
regressiontests/incubating/pom.xml | 22 ++---
.../test/resources/shiro-secman-ldap-cached.ini | 10 +-
.../src/test/resources/shiro-secman-ldap.ini | 10 +-
.../incubating/src/test/resources/shiro-secman.ini | 4 +-
regressiontests/pom.xml | 2 +-
.../keycloak/IsisModuleSecurityKeycloak.java | 19 +---
.../services/KeycloakOauth2UserService.java | 93 +++++++++++++++----
29 files changed, 389 insertions(+), 125 deletions(-)
rename extensions/security/secman/{shiro-realm => delegated-shiro}/pom.xml (86%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanRealmShiro.java => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/IsisModuleExtSecmanDelegatedShiro.java} (90%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm}/AuthInfoForApplicationUser.java (95%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/AuthenticationStrategyForIsisModuleSecurityRealm.java => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm/AuthenticationStrategyForSecMan.java} (94%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm}/IsisModuleExtSecmanShiroRealm.java (98%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm}/PermissionForMember.java (93%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm}/PermissionResolverForIsisShiroAuthorizor.java (94%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm}/PrincipalCollectionForApplicationUserOnSingleRealm.java (97%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm}/PrincipalCollectionWithSinglePrincipalForApplicationUserInAnyRealm.java (96%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated/shiro/realm}/PrincipalForApplicationUser.java (98%)
rename extensions/security/secman/{shiro-realm/src/main/java/org/apache/isis/extensions/secman => delegated-shiro/src/main/java/org/apache/isis/extensions/secman/delegated}/shiro/util/ShiroUtils.java (93%)
copy extensions/security/secman/{applib => delegated-springoauth2}/pom.xml (62%)
copy testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java => extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/isis/extensions/secman/delegated/springoauth2/IsisModuleExtSecmanDelegatedSpringOauth2.java (71%)
create mode 100644 extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/isis/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
[isis] 01/01: Merge pull request #1063 from apache/ISIS-3169
Posted by da...@apache.org.
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 54e565639bfaed38284df86b883b041ef9af10c1
Merge: 95a7be35ac bc7bc7346f
Author: Dan Haywood <da...@apache.org>
AuthorDate: Tue Aug 23 22:36:19 2022 +0100
Merge pull request #1063 from apache/ISIS-3169
Isis 3169
.../apache/isis/core/config/IsisConfiguration.java | 76 +++++++++++++++-
examples/demo/domain/pom.xml | 2 +-
examples/demo/domain/src/main/resources/shiro.ini | 4 +-
extensions/pom.xml | 7 +-
.../secman/pages/setting-up-with-keycloak.adoc | 5 +-
.../secman/pages/setting-up-with-shiro.adoc | 8 +-
.../pages/setting-up-with-spring-oauth2.adoc | 39 +++++++-
.../{shiro-realm => delegated-shiro}/pom.xml | 6 +-
.../shiro/IsisModuleExtSecmanDelegatedShiro.java} | 5 +-
.../shiro/realm}/AuthInfoForApplicationUser.java | 5 +-
.../realm/AuthenticationStrategyForSecMan.java} | 6 +-
.../realm}/IsisModuleExtSecmanShiroRealm.java | 5 +-
.../shiro/realm}/PermissionForMember.java | 5 +-
.../PermissionResolverForIsisShiroAuthorizor.java | 3 +-
...lCollectionForApplicationUserOnSingleRealm.java | 3 +-
...inglePrincipalForApplicationUserInAnyRealm.java | 3 +-
.../shiro/realm}/PrincipalForApplicationUser.java | 3 +-
.../secman/delegated}/shiro/util/ShiroUtils.java | 5 +-
.../pom.xml | 40 ++++----
.../IsisModuleExtSecmanDelegatedSpringOauth2.java} | 12 ++-
.../dom/ApplicationUserAutoCreationService.java | 101 +++++++++++++++++++++
extensions/security/secman/pom.xml | 10 +-
regressiontests/incubating/pom.xml | 22 ++---
.../test/resources/shiro-secman-ldap-cached.ini | 10 +-
.../src/test/resources/shiro-secman-ldap.ini | 10 +-
.../incubating/src/test/resources/shiro-secman.ini | 4 +-
regressiontests/pom.xml | 2 +-
.../keycloak/IsisModuleSecurityKeycloak.java | 19 +---
.../services/KeycloakOauth2UserService.java | 93 +++++++++++++++----
29 files changed, 391 insertions(+), 122 deletions(-)