From 363d09140bbd8ca785f1f36ee96e1e791fe401eb Mon Sep 17 00:00:00 2001 From: AFaust Date: Thu, 15 Apr 2021 10:48:38 +0200 Subject: [PATCH] Update Keycloak; two Share AMPs for compat with <7.0 + >=7.0 --- LICENSE | 2 +- pom.xml | 6 +-- repository/pom.xml | 4 +- repository/src/main/config/module-context.xml | 2 +- .../keycloak-authentication-context.xml | 2 +- .../keycloak-authentication.properties | 2 + .../authentication/AuthorityExtractor.java | 2 +- .../DefaultAuthorityExtractor.java | 2 +- .../DefaultPersonProcessor.java | 2 +- .../KeycloakAuthenticationComponent.java | 2 +- .../KeycloakAuthenticationFilter.java | 2 +- .../KeycloakAuthenticationListener.java | 2 +- .../KeycloakAuthenticationServiceImpl.java | 2 +- .../authentication/KeycloakCredentials.java | 2 +- .../KeycloakRemoteUserMapper.java | 2 +- ...akWebScriptCookieAuthenticationFilter.java | 2 +- ...cloakWebScriptSSOAuthenticationFilter.java | 2 +- ...eHeaderCookieCaptureServletHttpFacade.java | 2 +- .../SimpleCacheBackedSessionIdMapper.java | 2 +- .../repo/authentication/UserProcessor.java | 2 +- ...tedAuthorityAwareAuthorityServiceImpl.java | 2 +- .../keycloak/repo/client/IDMClient.java | 2 +- .../keycloak/repo/client/IDMClientImpl.java | 2 +- .../repo/roles/AggregateRoleNameFilter.java | 2 +- .../repo/roles/AggregateRoleNameMapper.java | 2 +- .../repo/roles/NoOpRoleServiceImpl.java | 2 +- .../repo/roles/PatternRoleNameFilter.java | 2 +- .../repo/roles/PatternRoleNameMapper.java | 2 +- .../roles/PrefixAttachingRoleNameMapper.java | 2 +- .../alfresco/keycloak/repo/roles/Role.java | 2 +- .../keycloak/repo/roles/RoleNameFilter.java | 2 +- .../keycloak/repo/roles/RoleNameMapper.java | 2 +- .../keycloak/repo/roles/RoleService.java | 2 +- .../keycloak/repo/roles/RoleServiceImpl.java | 2 +- .../repo/roles/ScriptRoleService.java | 2 +- .../repo/roles/StaticRoleNameFilter.java | 2 +- .../repo/roles/StaticRoleNameMapper.java | 2 +- .../KeycloakAdapterConfigBeanFactory.java | 2 +- .../spring/KeycloakDeploymentBeanFactory.java | 2 +- .../repo/sync/BaseAttributeProcessor.java | 2 +- .../repo/sync/BaseGroupContainmentFilter.java | 2 +- .../repo/sync/DefaultGroupProcessor.java | 2 +- .../repo/sync/DefaultPersonProcessor.java | 2 +- .../sync/GroupContainmentGroupFilter.java | 2 +- .../repo/sync/GroupContainmentUserFilter.java | 2 +- .../keycloak/repo/sync/GroupFilter.java | 2 +- .../keycloak/repo/sync/GroupProcessor.java | 2 +- .../repo/sync/KeycloakUserRegistry.java | 2 +- .../sync/SimpleGroupAttributeProcessor.java | 2 +- .../sync/SimpleUserAttributeProcessor.java | 2 +- .../keycloak/repo/sync/UserFilter.java | 2 +- .../keycloak/repo/sync/UserProcessor.java | 2 +- .../repo/token/AccessTokenException.java | 2 +- .../repo/token/AccessTokenHolder.java | 2 +- .../repo/token/AccessTokenHolderImpl.java | 2 +- .../token/AccessTokenRefreshException.java | 2 +- .../repo/token/AccessTokenService.java | 2 +- .../repo/token/AccessTokenServiceImpl.java | 2 +- .../AccessTokenUnsupportedException.java | 2 +- .../AccessTokenVerificationException.java | 2 +- .../keycloak/repo/token/ErrorResponse.java | 2 +- .../token/NoOpAccessTokenServiceImpl.java | 2 +- .../repo/util/AlfrescoCompatibilityUtil.java | 2 +- .../util/RefreshableAccessTokenHolder.java | 2 +- .../keycloak/repo/web/scripts/RolesGet.java | 2 +- .../alfresco-global.addition.properties | 2 +- .../alfresco/extension/dev-log4j.properties | 2 +- repository/src/test/docker/repository-it.xml | 2 +- share/pom.xml | 28 ++++++++-- share/src/main/assembly/amp-withBouncy.xml | 53 +++++++++++++++++++ share/src/main/assembly/amp.xml | 11 +--- share/src/main/config/default-config.xml | 2 +- share/src/main/config/module-config.xml | 2 +- share/src/main/config/module-context.xml | 2 +- .../extensions/acosix-keycloak-extension.xml | 2 +- .../config/KeycloakAdapterConfigElement.java | 2 +- .../KeycloakAdapterConfigElementReader.java | 2 +- .../KeycloakAuthenticationConfigElement.java | 2 +- ...loakAuthenticationConfigElementReader.java | 2 +- .../share/config/KeycloakConfigConstants.java | 2 +- ...AccessTokenAwareAlfrescoAuthenticator.java | 2 +- ...sTokenAwareSlingshotAlfrescoConnector.java | 2 +- ...eycloakAuthenticationFilterActivation.java | 2 +- .../util/RefreshableAccessTokenHolder.java | 2 +- .../share/web/DefaultSessionIdMapper.java | 2 +- .../web/KeycloakAuthenticationFilter.java | 2 +- .../PopulatingRequestContextInterceptor.java | 2 +- ...eHeaderCookieCaptureServletHttpFacade.java | 2 +- .../share/web/UserGroupsLoadFilter.java | 2 +- ...ameCorrectingSlingshotLoginController.java | 2 +- .../main/resources/META-INF/web-fragment.xml | 2 +- .../components/guest/login.get.html.ftl | 2 +- .../components/guest/login.get.js | 2 +- .../alfresco-global.addition.properties | 4 +- .../alfresco/extension/dev-log4j.properties | 2 +- .../web-extension/dev-log4j.properties | 2 +- .../web-extension/share-config-custom.xml | 2 +- share/src/test/docker/repository-it.xml | 2 +- share/src/test/docker/share-it.xml | 2 +- .../config/KeycloakAdapterConfigTest.java | 2 +- share/src/test/resources/addendum-config.xml | 2 +- share/src/test/resources/default-config.xml | 2 +- 102 files changed, 183 insertions(+), 115 deletions(-) create mode 100644 share/src/main/assembly/amp-withBouncy.xml diff --git a/LICENSE b/LICENSE index e7233b7..93229e3 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 - 2020 Acosix GmbH + Copyright 2019 - 2021 Acosix GmbH Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pom.xml b/pom.xml index 8f52934..a5a0921 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.5.1 diff --git a/repository/pom.xml b/repository/pom.xml index d3c971a..8838850 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -1,6 +1,6 @@ + + withBouncy + + amp + + false + + assemblies/amp-lib-component.xml + assemblies/amp-config-component.xml + assemblies/amp-messages-component.xml + assemblies/amp-repo-webscript-component.xml + assemblies/amp-surf-webscript-component.xml + assemblies/amp-templates-component.xml + assemblies/amp-webapp-component.xml + + + + ${project.basedir} + + + *.properties + + true + crlf + + + + + lib + + org.bouncycastle:* + + compile + + + diff --git a/share/src/main/assembly/amp.xml b/share/src/main/assembly/amp.xml index 311db00..90ba425 100644 --- a/share/src/main/assembly/amp.xml +++ b/share/src/main/assembly/amp.xml @@ -1,6 +1,6 @@