From d09e1ff7c7619934f91768e750e33d79f39030ef Mon Sep 17 00:00:00 2001
From: peppelinux <demarcog83@gmail.com>
Date: Thu, 20 Jul 2023 00:30:06 +0200
Subject: [PATCH] feat:! UNKNOWN_ERROR_REDIRECT_URL -> ERROR_URL in proxy.conf,
 requirements updated

---
 README.idpy.forks.mngmnt.md | 42 ++++++++++++++++++++-----------------
 example/proxy_conf.yaml     |  4 ++--
 requirements.txt            |  7 +++----
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/README.idpy.forks.mngmnt.md b/README.idpy.forks.mngmnt.md
index 0a28aabf..1ccbbfe8 100644
--- a/README.idpy.forks.mngmnt.md
+++ b/README.idpy.forks.mngmnt.md
@@ -5,31 +5,37 @@ git clone https://github.com/identitypython/pysaml2
 cd pysaml2/
 
 # create current pplnx branch
-git checkout --orphan pplnx-v7.2.1
-git remote add pplnx https://github.com/peppelinux/pysaml2.git
-git reset --hard
-git pull origin master
+git remote add ppl nx https://github.com/peppelinux/pysaml2.git
+# git checkout --orphan pplnx-v7.4.2
+# git reset --hard
+# git pull origin master
+
+git checkout -b pplnx-v7.4.2
 
 # pplnx's patches
 
 # https://github.com/IdentityPython/pysaml2/pull/628
 # SPID required
-git pull pplnx disabled_weak_algs
+git pull pplnx disabled_weak_algs --ff
 
 # https://github.com/IdentityPython/pysaml2/pull/625
 # this must be merged at the end, otherwise break the unit tests
-git pull pplnx ns_prefixes
+git pull pplnx ns_prefixes --ff
+
+# check that tests are ok
+python3 -m pytest tests/ -x
 ````
 
 # SATOSA
 
 ````
-git clone https://github.com/identitypython/satosa
-cd SATOSA
+git clone https://github.com/identitypython/satosa -o satosa
+cd satosa
 git remote add pplnx https://github.com/peppelinux/SATOSA.git
-git checkout --orphan pplnx-v8.2.0
-git reset --hard
-git pull origin master
+# git checkout --orphan pplnx-v8.4.0
+# git reset --hard
+# git pull origin master
+git checkout -b pplnx-v8.4.0
 
 pip install -r tests/test_requirements.txt
 pip install pymongo
@@ -47,15 +53,13 @@ sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
 sudo apt install -y mongodb-org
 sudo systemctl start mongod
 
-# check that tests are ok
-python3 -m pytest tests/ -x
-
-# https://github.com/IdentityPython/SATOSA/pull/363
-git pull pplnx cookie_conf_2
-
 # https://github.com/IdentityPython/SATOSA/pull/324
-git pull pplnx context_state_error_msg
+git pull pplnx context_state_error_msg -ff
 
+# staging ... need more checks if the latests satosa releases can live without it
 # https://github.com/IdentityPython/SATOSA/pull/325
-git pull pplnx error_redirect_page
+# git pull pplnx error_redirect_page --ff
+
+# check that tests are ok
+python3 -m pytest tests/ -x
 ````
diff --git a/example/proxy_conf.yaml b/example/proxy_conf.yaml
index 38166b30..3ffe8518 100644
--- a/example/proxy_conf.yaml
+++ b/example/proxy_conf.yaml
@@ -7,7 +7,7 @@ CONTEXT_STATE_DELETE: yes
 COOKIE_MAX_AGE: 600 # 10 minutes
 #COOKIE_SECURE: no
 #COOKIE_HTTPONLY: no
-
+#COOKIE_SAMESITE: "None"
 STATE_ENCRYPTION_KEY: "CHANGE_ME!"
 
 cookies_samesite_compat:
@@ -17,7 +17,7 @@ cookies_samesite_compat:
 # DEPRECATED, use hasher microservice instead
 USER_ID_HASH_SALT: "CHANGE_ME!"
 
-UNKNOW_ERROR_REDIRECT_PAGE: "https://localhost:9999/error_page.html"
+ERROR_URL: "https://localhost:9999/error_page.html"
 
 CUSTOM_PLUGIN_MODULE_PATHS:
   #- "plugins/ping"
diff --git a/requirements.txt b/requirements.txt
index 09934341..f049629c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
-#satosa >= 8.2.0
-
-git+https://github.com/peppelinux/pysaml2.git@pplnx-v7.2.1
-git+https://github.com/peppelinux/SATOSA.git@pplnx-v8.2.0
+# this project still needs pplnx's forks
+git+https://github.com/peppelinux/pysaml2.git@pplnx-v7.4.2
+git+https://github.com/peppelinux/SATOSA.git@pplnx-v8.4.0
 
 pymongo
 satosa_oidcop >= 2.0.0