From f21d9e621093f4ff909e4124f05064e188f01ec8 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Tue, 28 Feb 2023 16:24:30 +0300
Subject: [PATCH 1/2] Compact OpenIG docker images

---
 openig-docker/Dockerfile        | 17 ++++++++---------
 openig-docker/Dockerfile-alpine | 11 ++++-------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/openig-docker/Dockerfile b/openig-docker/Dockerfile
index cb8e9e0bf..d12eae04e 100644
--- a/openig-docker/Dockerfile
+++ b/openig-docker/Dockerfile
@@ -4,7 +4,6 @@ MAINTAINER Open Identity Platform Community <open-identity-platform-openig@googl
 
 ARG VERSION @project_version@
 
-
 ENV CATALINA_HOME=/usr/local/tomcat
 ENV OPENIG_USER="openig"
 ENV OPENIG_BASE=/var/openig
@@ -14,14 +13,14 @@ ENV CATALINA_OPTS="-server -XX:+UseG1GC -Xmx$MAX_MEMORY"
 
 WORKDIR $CATALINA_HOME
 
-RUN apt-get update && apt-get install -y wget unzip
-RUN wget --quiet https://github.com/OpenIdentityPlatform/OpenIG/releases/download/$VERSION/OpenIG-$VERSION.war
-RUN rm -fr $CATALINA_HOME/webapps/*
-RUN mv *.war $CATALINA_HOME/webapps/ROOT.war
-RUN useradd -m -r -u 1001 -g root $OPENIG_USER
-RUN install -d -o $OPENIG_USER $OPENIG_BASE
-RUN chown -R $OPENIG_USER:root $CATALINA_HOME
-RUN  apt-get remove -y --purge unzip && rm -rf /var/lib/apt/lists/* 
+RUN apt-get update && apt-get install -y wget unzip \
+    && wget --quiet https://github.com/OpenIdentityPlatform/OpenIG/releases/download/$VERSION/OpenIG-$VERSION.war \
+    && rm -fr $CATALINA_HOME/webapps/* \
+    && mv *.war $CATALINA_HOME/webapps/ROOT.war \
+    && useradd -m -r -u 1001 -g root $OPENIG_USER \
+    && install -d -o $OPENIG_USER $OPENIG_BASE \
+    && chown -R $OPENIG_USER:root $CATALINA_HOME \
+    &&  apt-get remove -y --purge unzip && rm -rf /var/lib/apt/lists/*
 
 USER $OPENIG_USER
 
diff --git a/openig-docker/Dockerfile-alpine b/openig-docker/Dockerfile-alpine
index f5b0188be..a01746dc2 100644
--- a/openig-docker/Dockerfile-alpine
+++ b/openig-docker/Dockerfile-alpine
@@ -4,7 +4,6 @@ MAINTAINER Open Identity Platform Community <open-identity-platform-openig@googl
 
 ARG VERSION @project_version@
 
-
 ENV CATALINA_HOME=/usr/local/tomcat
 ENV OPENIG_USER="openig"
 ENV OPENIG_BASE=/var/openig
@@ -13,15 +12,13 @@ ENV CATALINA_OPTS="-XX:+UseG1GC -Xmx2048m -server"
 
 WORKDIR $CATALINA_HOME
 
-RUN apk add --update --no-cache --virtual curl builddeps unzip bash && apk upgrade --update --no-cache 
-
-RUN rm -rf  $CATALINA_HOME/webapps/* \
+RUN apk add --update --no-cache --virtual curl builddeps unzip bash && apk upgrade --update --no-cache \
+ && rm -rf  $CATALINA_HOME/webapps/* \
  && curl -L https://github.com/OpenIdentityPlatform/OpenIG/releases/download/$VERSION/OpenIG-$VERSION.war --output $CATALINA_HOME/webapps/ROOT.war  \
  && adduser -S -u 1001 -G root $OPENIG_USER \
  && install -d -o $OPENIG_USER $OPENIG_BASE \
- && chown -R $OPENIG_USER $CATALINA_HOME/webapps
-
-RUN  apk del unzip && rm -rf /var/cache/apk/* 
+ && chown -R $OPENIG_USER $CATALINA_HOME/webapps \
+ && apk del unzip && rm -rf /var/cache/apk/*
 
 USER $OPENIG_USER
 

From 8dc64ef16affa65e3a1c1a02021e347d45a8d13b Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Thu, 9 Mar 2023 12:31:43 +0300
Subject: [PATCH 2/2] Fix websocket exception: java.lang.ClassCastException:
 class org.forgerock.http.header.CookieHeader cannot be cast to class
 org.forgerock.http.header.GenericHeader

---
 .../openig/websocket/ServerEndPoint.java      | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/openig-core/src/main/java/org/openidentityplatform/openig/websocket/ServerEndPoint.java b/openig-core/src/main/java/org/openidentityplatform/openig/websocket/ServerEndPoint.java
index e0b3d10b3..16c824c0e 100644
--- a/openig-core/src/main/java/org/openidentityplatform/openig/websocket/ServerEndPoint.java
+++ b/openig-core/src/main/java/org/openidentityplatform/openig/websocket/ServerEndPoint.java
@@ -1,29 +1,18 @@
 package org.openidentityplatform.openig.websocket;
 
+import org.forgerock.http.protocol.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.websocket.*;
+import javax.websocket.ClientEndpointConfig.Builder;
+import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.ClientEndpointConfig.Builder;
-import javax.websocket.server.ServerEndpoint;
-
-import org.forgerock.http.header.GenericHeader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 @ServerEndpoint(value = "/{level1}",configurator = Configurator.class)
 public class ServerEndPoint {
@@ -58,8 +47,12 @@ public void start(Session session_client, EndpointConfig config) {
 				@Override
         	    public void beforeRequest(Map<String, List<String>> headers) {
 					for (Entry<String,Object> entry : principal.request.getHeaders().entrySet()) {
-						if (entry.getKey().toLowerCase().startsWith("cookie")||entry.getKey().toLowerCase().startsWith("x-")||entry.getKey().equalsIgnoreCase("origin")||entry.getKey().equalsIgnoreCase("Authorization")||entry.getKey().toLowerCase().startsWith("sec-websocket-")) {
-							headers.put(entry.getKey(), ((GenericHeader)entry.getValue()).getValues());
+						if (entry.getKey().toLowerCase().startsWith("cookie")
+								||entry.getKey().toLowerCase().startsWith("x-")
+								||entry.getKey().equalsIgnoreCase("origin")
+								||entry.getKey().equalsIgnoreCase("Authorization")
+								||entry.getKey().toLowerCase().startsWith("sec-websocket-")) {
+							headers.put(entry.getKey(), ((Header)entry.getValue()).getValues());
 						}
 					}
         	    }