Update Keycloak; two Share AMPs for compat with <7.0 + >=7.0

2025-09-10 14:11:09 +00:00 · 2021-04-15 10:48:38 +02:00
parent abf49db783
commit 363d09140b
102 changed files with 183 additions and 115 deletions
--- a/share/pom.xml
+++ b/share/pom.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- 
- 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.
@@ -21,7 +21,7 @@
    <parent>
        <groupId>de.acosix.alfresco.keycloak</groupId>
        <artifactId>de.acosix.alfresco.keycloak.parent</artifactId>
-        <version>1.1.0-rc6</version>
+        <version>1.1.0-rc7-SNAPSHOT</version>
    </parent>

    <artifactId>de.acosix.alfresco.keycloak.share</artifactId>
@@ -45,7 +45,7 @@
            <dependency>
                <groupId>org.bouncycastle</groupId>
                <artifactId>bcpkix-jdk15on</artifactId>
-                <version>1.66</version>
+                <version>1.68</version>
            </dependency>

        </dependencies>
@@ -359,6 +359,28 @@
                    </configuration>
                </plugin>

+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>buildSpecificAMP-withBouncy</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/amp-withBouncy.xml</descriptor>
+                                </descriptors>
+                                <appendAssemblyId>true</appendAssemblyId>
+                                <escapeString>\</escapeString>
+                                <skipAssembly>false</skipAssembly>
+                                <attach>true</attach>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
            </plugins>
        </pluginManagement>

--- a/share/src/main/assembly/amp-withBouncy.xml
+++ b/share/src/main/assembly/amp-withBouncy.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- 
+ 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+    <id>withBouncy</id>
+    <formats>
+        <format>amp</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <componentDescriptors>
+        <componentDescriptor>assemblies/amp-lib-component.xml</componentDescriptor>
+        <componentDescriptor>assemblies/amp-config-component.xml</componentDescriptor>
+        <componentDescriptor>assemblies/amp-messages-component.xml</componentDescriptor>
+        <componentDescriptor>assemblies/amp-repo-webscript-component.xml</componentDescriptor>
+        <componentDescriptor>assemblies/amp-surf-webscript-component.xml</componentDescriptor>
+        <componentDescriptor>assemblies/amp-templates-component.xml</componentDescriptor>
+        <componentDescriptor>assemblies/amp-webapp-component.xml</componentDescriptor>
+    </componentDescriptors>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.properties</include>
+            </includes>
+            <filtered>true</filtered>
+            <lineEnding>crlf</lineEnding>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>org.bouncycastle:*</include>
+            </includes>
+            <scope>compile</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>
--- a/share/src/main/assembly/amp.xml
+++ b/share/src/main/assembly/amp.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- 
- 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.
@@ -41,13 +41,4 @@
            <lineEnding>crlf</lineEnding>
        </fileSet>
    </fileSets>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>org.bouncycastle:*</include>
-            </includes>
-            <scope>compile</scope>
-        </dependencySet>
-    </dependencySets>
 </assembly>
--- a/share/src/main/config/default-config.xml
+++ b/share/src/main/config/default-config.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!-- 
- 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.
--- a/share/src/main/config/module-config.xml
+++ b/share/src/main/config/module-config.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!-- 
- 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.
--- a/share/src/main/config/module-context.xml
+++ b/share/src/main/config/module-context.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- 
- 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.
--- a/share/src/main/globalConfig/site-data/extensions/acosix-keycloak-extension.xml
+++ b/share/src/main/globalConfig/site-data/extensions/acosix-keycloak-extension.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!-- 
- 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAdapterConfigElement.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAdapterConfigElement.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAdapterConfigElementReader.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAdapterConfigElementReader.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAuthenticationConfigElement.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAuthenticationConfigElement.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAuthenticationConfigElementReader.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakAuthenticationConfigElementReader.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakConfigConstants.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/config/KeycloakConfigConstants.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareAlfrescoAuthenticator.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareAlfrescoAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareSlingshotAlfrescoConnector.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareSlingshotAlfrescoConnector.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/spring/KeycloakAuthenticationFilterActivation.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/spring/KeycloakAuthenticationFilterActivation.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/util/RefreshableAccessTokenHolder.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/util/RefreshableAccessTokenHolder.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/DefaultSessionIdMapper.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/DefaultSessionIdMapper.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/KeycloakAuthenticationFilter.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/KeycloakAuthenticationFilter.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/PopulatingRequestContextInterceptor.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/PopulatingRequestContextInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/ResponseHeaderCookieCaptureServletHttpFacade.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/ResponseHeaderCookieCaptureServletHttpFacade.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserGroupsLoadFilter.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserGroupsLoadFilter.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserNameCorrectingSlingshotLoginController.java
+++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserNameCorrectingSlingshotLoginController.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/main/resources/META-INF/web-fragment.xml
+++ b/share/src/main/resources/META-INF/web-fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- 
- 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.
--- a/share/src/main/site-webscripts/de/acosix/keycloak/customisations/components/guest/login.get.html.ftl
+++ b/share/src/main/site-webscripts/de/acosix/keycloak/customisations/components/guest/login.get.html.ftl
@@ -1,5 +1,5 @@
 <#-- 
- 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.
--- a/share/src/main/site-webscripts/de/acosix/keycloak/customisations/components/guest/login.get.js
+++ b/share/src/main/site-webscripts/de/acosix/keycloak/customisations/components/guest/login.get.js
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/test/docker/alfresco/extension/alfresco-global.addition.properties
+++ b/share/src/test/docker/alfresco/extension/alfresco-global.addition.properties
@@ -1,5 +1,5 @@
 # 
-# 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.
@@ -25,7 +25,7 @@ keycloak.adapter.credentials.provider=secret
 keycloak.adapter.credentials.secret=6f70a28f-98cd-41ca-8f2f-368a8797d708

 # localhost in auth-server-url won't work for direct access in a Docker deployment
-keycloak.authentication.directAuthHost=http://keycloak:8080
+keycloak.adapter.directAuthHost=http://keycloak:8080

 keycloak.synchronization.userFilter.containedInGroup.property.groupPaths=/Test A
 keycloak.synchronization.groupFilter.containedInGroup.property.groupPaths=/Test A
--- a/share/src/test/docker/alfresco/extension/dev-log4j.properties
+++ b/share/src/test/docker/alfresco/extension/dev-log4j.properties
@@ -1,5 +1,5 @@
 # 
-# 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.
--- a/share/src/test/docker/alfresco/web-extension/dev-log4j.properties
+++ b/share/src/test/docker/alfresco/web-extension/dev-log4j.properties
@@ -1,5 +1,5 @@
 # 
-# 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.
--- a/share/src/test/docker/alfresco/web-extension/share-config-custom.xml
+++ b/share/src/test/docker/alfresco/web-extension/share-config-custom.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!-- 
- 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.
--- a/share/src/test/docker/repository-it.xml
+++ b/share/src/test/docker/repository-it.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- 
- 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.
--- a/share/src/test/docker/share-it.xml
+++ b/share/src/test/docker/share-it.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- 
- 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.
--- a/share/src/test/java/de/acosix/alfresco/keycloak/share/config/KeycloakAdapterConfigTest.java
+++ b/share/src/test/java/de/acosix/alfresco/keycloak/share/config/KeycloakAdapterConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * 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.
--- a/share/src/test/resources/addendum-config.xml
+++ b/share/src/test/resources/addendum-config.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!-- 
- 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.
--- a/share/src/test/resources/default-config.xml
+++ b/share/src/test/resources/default-config.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!-- 
- 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.