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 <[email protected]> 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(-)
