From bb6a4e34d40c6fdc70b5d126fd1bbf8247390008 Mon Sep 17 00:00:00 2001
From: Alexander Kombeiz <alexkombie@gmail.com>
Date: Tue, 1 Oct 2024 15:15:56 +0200
Subject: [PATCH 1/2] removed content of broker-client-auth-keycloak and placed
 README inside package

---
 broker-client-auth-keycloak/README.md         |  4 ++
 broker-client-auth-keycloak/pom.xml           | 63 -------------------
 .../client2/auth/OpenIdAuthentication.java    | 43 -------------
 3 files changed, 4 insertions(+), 106 deletions(-)
 create mode 100644 broker-client-auth-keycloak/README.md
 delete mode 100644 broker-client-auth-keycloak/pom.xml
 delete mode 100644 broker-client-auth-keycloak/src/main/java/org/aktin/broker/client2/auth/OpenIdAuthentication.java

diff --git a/broker-client-auth-keycloak/README.md b/broker-client-auth-keycloak/README.md
new file mode 100644
index 00000000..2cee6ebe
--- /dev/null
+++ b/broker-client-auth-keycloak/README.md
@@ -0,0 +1,4 @@
+
+This package has been removed from the project, due to underutilized and security vulnerabilities.  It is no longer actively maintained or supported.
+
+The final commit containing this package can be accessed here: [460277d2f22c891405486bcb4a6ca57710eb0937](https://github.com/aktin/broker/tree/460277d2f22c891405486bcb4a6ca57710eb0937)
\ No newline at end of file
diff --git a/broker-client-auth-keycloak/pom.xml b/broker-client-auth-keycloak/pom.xml
deleted file mode 100644
index 624a90a1..00000000
--- a/broker-client-auth-keycloak/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<name>AKTIN : Broker : Client Authentication via Keycloak</name>
-
-	<artifactId>broker-client-auth-keycloak</artifactId>
-
-	<description>
-		Broker client authentication library
-		using keycloak for authentication.
-	</description>
-	
-	
-	<parent>
-		<groupId>org.aktin</groupId>
-		<artifactId>broker</artifactId>
-		<version>1.5.2-SNAPSHOT</version>
-	</parent>
-	
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-	</properties>
-
-  	<build>
-		<plugins>
-			<!-- copy dependencies to target/lib during build process -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeScope>provided</excludeScope>
-							<includeScope>runtime</includeScope>
-							<outputDirectory>${project.build.directory}/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<artifactId>lombok</artifactId>
-			<groupId>org.projectlombok</groupId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.aktin</groupId>
-			<artifactId>broker-client</artifactId>
-			<version>1.5.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.keycloak</groupId>
-			<artifactId>keycloak-authz-client</artifactId>
-			<version>25.0.6</version>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/broker-client-auth-keycloak/src/main/java/org/aktin/broker/client2/auth/OpenIdAuthentication.java b/broker-client-auth-keycloak/src/main/java/org/aktin/broker/client2/auth/OpenIdAuthentication.java
deleted file mode 100644
index ed178a60..00000000
--- a/broker-client-auth-keycloak/src/main/java/org/aktin/broker/client2/auth/OpenIdAuthentication.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.aktin.broker.client2.auth;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import org.keycloak.authorization.client.AuthzClient;
-import org.keycloak.representations.AccessTokenResponse;
-
-/**
- * OpenID authentication via Keycloak client.
- * Use e.g. by passing the file {@code keycloak.json} to 
- * constructor {@link #OpenIdAuthentication(String)} 
- *
- */
-public class OpenIdAuthentication extends HttpAuthorizationBearerAuth {
-	private AuthzClient client;
-	private AccessTokenResponse resp;
-	private long expirationTimestamp;
-
-	private void checkAndRefreshToken() {
-		long now = System.currentTimeMillis();
-		if( expirationTimestamp == 0 || expirationTimestamp < now ) {
-			// obtain new token
-			resp = client.obtainAccessToken();
-			// resp.expiresIn is seconds???
-			expirationTimestamp = now + 1000*resp.getExpiresIn();		
-		}
-	}
-	public OpenIdAuthentication(String keycloakJsonConfigPath) throws IOException {
-		try (InputStream in = Files.newInputStream(Paths.get(keycloakJsonConfigPath))) {
-			this.client = AuthzClient.create(in);
-			checkAndRefreshToken();
-		}
-	}
-
-	@Override
-	protected String getBearerToken() throws IOException {
-		checkAndRefreshToken();
-		return resp.getToken();
-	}
-
-}

From 5c2a6f13975b84ffb3f06b050c9a8e627bc92372 Mon Sep 17 00:00:00 2001
From: Alexander Kombeiz <alexkombie@gmail.com>
Date: Tue, 1 Oct 2024 15:16:23 +0200
Subject: [PATCH 2/2] removed broker-client-auth-keycloak module from parent
 pom

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0dc32905..43de3d65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,6 @@
 	<modules>
 		<module>broker-api</module>
 		<module>broker-client</module>
-		<module>broker-client-auth-keycloak</module>
 		<module>broker-server</module>
 		<module>broker-auth-local</module>
 		<module>broker-auth-openid</module>