aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2024-06-30 21:35:16 -0400
committerB. Stack <bgstack15@gmail.com>2024-06-30 21:35:16 -0400
commit2541b3f3fac5a9a2b58c01a1586ddcb0c24b09f4 (patch)
treeed50feb13656a29aba7066d3faf33821fc003f98
parentupdate patch for radicale 3.2.2 (diff)
downloadbuild-radicale-el7-master.tar.gz
build-radicale-el7-master.tar.bz2
build-radicale-el7-master.zip
add radicale-app-init patchHEADmaster
-rw-r--r--radicale-app-init.patch18
-rw-r--r--radicale-proxy-ldap-auth-fn.js.patch2
2 files changed, 19 insertions, 1 deletions
diff --git a/radicale-app-init.patch b/radicale-app-init.patch
new file mode 100644
index 0000000..8a5bb77
--- /dev/null
+++ b/radicale-app-init.patch
@@ -0,0 +1,18 @@
+Date: 2024-06-30
+Version: radicale3-3.22.1-1.el8.noarch
+Message: Remove domain name from user, which ties in with the fn.js patch
+diff -aur /usr/lib/python3.9/site-packages/radicale/app/__init__.py /usr/lib/python3.9/site-packages/radicale/app/__init__.py.stackrpms
+--- /usr/lib/python3.9/site-packages/radicale/app/__init__.py 2024-06-18 13:01:16.000000000 -0400
++++ /usr/lib/python3.9/site-packages/radicale/app/__init__.py 2024-06-30 21:05:46.028480560 -0400
+@@ -250,6 +250,11 @@
+ authorization.encode("ascii"))).split(":", 1)
+
+ user = self._auth.login(login, password) or "" if login else ""
++ # stackrpms,5 2024-06-30-1 21:05
++ try:
++ user = user.split("@")[0]
++ except:
++ pass
+ if user and login == user:
+ logger.info("Successful login: %r", user)
+ elif user:
diff --git a/radicale-proxy-ldap-auth-fn.js.patch b/radicale-proxy-ldap-auth-fn.js.patch
index 0af2d89..4df8d79 100644
--- a/radicale-proxy-ldap-auth-fn.js.patch
+++ b/radicale-proxy-ldap-auth-fn.js.patch
@@ -1,4 +1,4 @@
-Last-modified: 2024-06-30-1 16:59
+Last-Modified: 2024-06-30-1 16:59
Version: 3.2.2-1.el8.noarch
Message: Update my customization to radicale to depend on my HTTP_X_REMOTE_USER header by removing the authentication in the calls here.
--- /usr/lib/python3.9/site-packages/radicale/web/internal_data/fn.js.orig 2024-06-18 13:01:16.000000000 -0400
bgstack15