From 253b6ba6d9724b9848d75cc6d45956b2f82f49c7 Mon Sep 17 00:00:00 2001
From: tawoe <weserwueter@posteo.de>
Date: Fri, 5 Jan 2024 16:05:22 +0100
Subject: [PATCH 1/6] unsecure cookies

---
 obp-api/src/main/resources/web.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/obp-api/src/main/resources/web.xml b/obp-api/src/main/resources/web.xml
index 5cc8b066d4..a61cf0902d 100644
--- a/obp-api/src/main/resources/web.xml
+++ b/obp-api/src/main/resources/web.xml
@@ -19,12 +19,7 @@
     </filter-mapping>
 
     <!--set  the status of HttpOnly and Secure cookie flags-->
-    <session-config>
-        <cookie-config>
-            <secure>true</secure>
-            <http-only>true</http-only>
-        </cookie-config>
-    </session-config>
+
 
 
     <!-- H2 web console 

From a14e78b5542e6cc20f79eafb15d931df5f861e33 Mon Sep 17 00:00:00 2001
From: tawoe <weserwueter@posteo.de>
Date: Fri, 5 Jan 2024 16:18:17 +0100
Subject: [PATCH 2/6] Revert "unsecure cookies"

This reverts commit 253b6ba6d9724b9848d75cc6d45956b2f82f49c7.
---
 obp-api/src/main/resources/web.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/obp-api/src/main/resources/web.xml b/obp-api/src/main/resources/web.xml
index a61cf0902d..5cc8b066d4 100644
--- a/obp-api/src/main/resources/web.xml
+++ b/obp-api/src/main/resources/web.xml
@@ -19,7 +19,12 @@
     </filter-mapping>
 
     <!--set  the status of HttpOnly and Secure cookie flags-->
-
+    <session-config>
+        <cookie-config>
+            <secure>true</secure>
+            <http-only>true</http-only>
+        </cookie-config>
+    </session-config>
 
 
     <!-- H2 web console 

From cb721bfaf54e71be9ff052f0015f01e4fa6f571a Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Mon, 8 Jan 2024 14:56:25 +0100
Subject: [PATCH 3/6] Delete obp-api/src/main/webapp/WEB-INF/web.xml

---
 obp-api/src/main/webapp/WEB-INF/web.xml | 49 -------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 obp-api/src/main/webapp/WEB-INF/web.xml

diff --git a/obp-api/src/main/webapp/WEB-INF/web.xml b/obp-api/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f421ec503a..0000000000
--- a/obp-api/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "web-app_2_3.dtd">
-
-<web-app>
-    <filter>
-        <filter-name>LiftFilter</filter-name>
-        <display-name>Lift Filter</display-name>
-        <description>The Filter that intercepts lift calls</description>
-        <filter-class>net.liftweb.http.LiftFilter</filter-class>
-    </filter>
-
-
-    <filter-mapping>
-        <filter-name>LiftFilter</filter-name>
-<!--TODO can prepare the white list later    -->
-<!--        We can specify folders or files that we want Liftweb to process.-->
-<!--        For example, we generally want Liftweb to process all HTML files because they are dynamic, and all the RESTful endpoints.-->
-<!--        On the other hand, we generally do not want Liftweb to process JS, JPG, and CSS files because they are static.-->
-<!--        Any processing we can offload from Liftweb is good for performance.-->
-<!--        Note: Jetty will serve the static files, so they will still appear in the Jetty logs.-->
-<!--        Ideally, NGINX is used to serve the static files, preventing them from cluttering the Jetty logs.-->
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!--set  the status of HttpOnly and Secure cookie flags-->
-    <!--<session-config>-->
-    <!--  <cookie-config>-->
-    <!--    <secure>true</secure>-->
-    <!--    <http-only>true</http-only>-->
-    <!--  </cookie-config>-->
-    <!--</session-config>-->
-
-
-    <!-- H2 web console 
-    <servlet>
-      <servlet-name>H2Console</servlet-name>
-      <servlet-class>org.h2.server.web.WebServlet</servlet-class>
-      <load-on-startup>0</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-      <servlet-name>H2Console</servlet-name>
-      <url-pattern>/console/*</url-pattern>
-    </servlet-mapping>
-    -->
-
-</web-app>

From 2482eb3d56b803efb6bcf0033b9c30bb7bbb8934 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@tesobe.com>
Date: Tue, 9 Jan 2024 22:05:26 +0100
Subject: [PATCH 4/6] add web.xml

---
 obp-api/src/main/webapp/WEB-INF/web.xml | 49 +++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 obp-api/src/main/webapp/WEB-INF/web.xml

diff --git a/obp-api/src/main/webapp/WEB-INF/web.xml b/obp-api/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..f421ec503a
--- /dev/null
+++ b/obp-api/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "web-app_2_3.dtd">
+
+<web-app>
+    <filter>
+        <filter-name>LiftFilter</filter-name>
+        <display-name>Lift Filter</display-name>
+        <description>The Filter that intercepts lift calls</description>
+        <filter-class>net.liftweb.http.LiftFilter</filter-class>
+    </filter>
+
+
+    <filter-mapping>
+        <filter-name>LiftFilter</filter-name>
+<!--TODO can prepare the white list later    -->
+<!--        We can specify folders or files that we want Liftweb to process.-->
+<!--        For example, we generally want Liftweb to process all HTML files because they are dynamic, and all the RESTful endpoints.-->
+<!--        On the other hand, we generally do not want Liftweb to process JS, JPG, and CSS files because they are static.-->
+<!--        Any processing we can offload from Liftweb is good for performance.-->
+<!--        Note: Jetty will serve the static files, so they will still appear in the Jetty logs.-->
+<!--        Ideally, NGINX is used to serve the static files, preventing them from cluttering the Jetty logs.-->
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!--set  the status of HttpOnly and Secure cookie flags-->
+    <!--<session-config>-->
+    <!--  <cookie-config>-->
+    <!--    <secure>true</secure>-->
+    <!--    <http-only>true</http-only>-->
+    <!--  </cookie-config>-->
+    <!--</session-config>-->
+
+
+    <!-- H2 web console 
+    <servlet>
+      <servlet-name>H2Console</servlet-name>
+      <servlet-class>org.h2.server.web.WebServlet</servlet-class>
+      <load-on-startup>0</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+      <servlet-name>H2Console</servlet-name>
+      <url-pattern>/console/*</url-pattern>
+    </servlet-mapping>
+    -->
+
+</web-app>

From 064155700123b4f6cead5c571816f0c546b00e56 Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Wed, 10 Jan 2024 10:36:16 +0100
Subject: [PATCH 5/6] Update build_package.yml

---
 .github/workflows/build_package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
index 9fac34f8ac..9855f0873e 100644
--- a/.github/workflows/build_package.yml
+++ b/.github/workflows/build_package.yml
@@ -72,7 +72,7 @@ jobs:
           echo ResetPasswordUrlEnabled=true >> obp-api/src/main/resources/props/test.default.props
 
           echo consents.allowed=true >> obp-api/src/main/resources/props/test.default.props
-          MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package -Pprod
+          MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package
       - name: Build the Docker image
         run: |
           echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io

From 42e5b3ed1190b2265ce62fe81ddc6fed97df278e Mon Sep 17 00:00:00 2001
From: tawoe <weserwueter@posteo.de>
Date: Fri, 2 Feb 2024 11:36:15 +0100
Subject: [PATCH 6/6] Bugfix container pipeline

---
 .github/workflows/build_package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
index 9855f0873e..9f616f75c6 100644
--- a/.github/workflows/build_package.yml
+++ b/.github/workflows/build_package.yml
@@ -76,8 +76,8 @@ jobs:
       - name: Build the Docker image
         run: |
           echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
-          docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop
-          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
+          docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA  --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}
+          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC  --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
           docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags
           echo docker done