From 30d24658434b7bc27f61ea0d97afe7fda81b4bc9 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Tue, 1 Aug 2023 18:11:43 -0400
Subject: [PATCH 1/8] No longer parsing SRV records

---
 Dockerfile                         |  1 +
 sideboard-development.ini.template |  1 +
 uber-wrapper.sh                    | 12 ------------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index abb938f1c..f9303b608 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,7 @@ ENV DEFAULT_URL=/uber
 ENV DEBUG=false
 ENV SESSION_HOST=redis
 ENV SESSION_PORT=6379
+ENV SESSION_PREFIX=uber
 ENV BROKER_HOST=rabbitmq
 ENV BROKER_PORT=5672
 ENV BROKER_USER=celery
diff --git a/sideboard-development.ini.template b/sideboard-development.ini.template
index 2ef3d9be8..ee68a25d4 100644
--- a/sideboard-development.ini.template
+++ b/sideboard-development.ini.template
@@ -11,6 +11,7 @@ server.socket_timeout = 1
 server.thread_pool = 100
 tools.sessions.host = "${SESSION_HOST}"
 tools.sessions.port = ${SESSION_PORT}
+tools.sessions.prefix = "${SESSION_PREFIX}"
 tools.sessions.storage_type = "redis"
 tools.sessions.timeout = 60
 
diff --git a/uber-wrapper.sh b/uber-wrapper.sh
index 85ceb86ad..00d353692 100644
--- a/uber-wrapper.sh
+++ b/uber-wrapper.sh
@@ -1,18 +1,6 @@
 #!/bin/bash
 set -e
 
-# SESSION_HOST and BROKER_HOST may point to SRV records that need to get resolved to a host/port
-SESSION_REC=$(dig srv +noall +answer +short "$SESSION_HOST" | cut -d ' ' -f 3,4 | head -1)
-BROKER_REC=$(dig srv +noall +answer +short "$BROKER_HOST" | cut -d ' ' -f 3,4 | head -1)
-if [[ ! -z "$SESSION_REC" ]]; then
-    SESSION_HOST=$(echo $SESSION_REC | cut -d ' ' -f 2)
-    SESSION_PORT=$(echo $SESSION_REC | cut -d ' ' -f 1)
-fi
-if [[ ! -z "$BROKER_REC" ]]; then
-    BROKER_HOST=$(echo $BROKER_REC | cut -d ' ' -f 2)
-    BROKER_PORT=$(echo $BROKER_REC | cut -d ' ' -f 1)
-fi
-
 # This will replace any variable references in these files
 # If you want to add any additional settings here just add
 # the variables to the environment when running this.

From 37db3bac9add7851156f367dcf9524cfbc148325 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Tue, 1 Aug 2023 21:50:05 -0400
Subject: [PATCH 2/8] Allowing more broker config

---
 Dockerfile                    | 1 +
 uber-development.ini.template | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f9303b608..6dc448b66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,6 +32,7 @@ ENV DEBUG=false
 ENV SESSION_HOST=redis
 ENV SESSION_PORT=6379
 ENV SESSION_PREFIX=uber
+ENV BROKER_PROTOCOL=amqp
 ENV BROKER_HOST=rabbitmq
 ENV BROKER_PORT=5672
 ENV BROKER_USER=celery
diff --git a/uber-development.ini.template b/uber-development.ini.template
index 7f7ef9a4c..56006897b 100644
--- a/uber-development.ini.template
+++ b/uber-development.ini.template
@@ -3,4 +3,4 @@ hostname = "${HOSTNAME}"
 url_root = "http://${HOSTNAME}:${PORT}"
 
 [secret]
-broker_url = "amqp://${BROKER_USER}:${BROKER_PASS}@${BROKER_HOST}:${BROKER_PORT}/${BROKER_VHOST}"
+broker_url = "${BROKER_PROTOCOL}://${BROKER_USER}:${BROKER_PASS}@${BROKER_HOST}:${BROKER_PORT}/${BROKER_VHOST}"

From f4ae062af016e9518106d3c342a4074837718479 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Tue, 1 Aug 2023 22:40:02 -0400
Subject: [PATCH 3/8] Installing librabbitmq

---
 requirements.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5d7287de9..f77c909ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,4 +26,8 @@ Jinja2==2.11.3
 requests==2.27.1
 signnow_python_sdk==2.0.1
 Authlib==1.0.1
-pyyaml==6.0
\ No newline at end of file
+WTForms==3.0.0
+pyyaml==6.0
+pycountry==22.3.5
+python3-saml==1.15.0
+librabbitmq==2.0.0

From 8cddb5935788827c84b1ee248ee7b0ab038a9fd5 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Tue, 1 Aug 2023 23:04:51 -0400
Subject: [PATCH 4/8] Attempting to upgrade celery

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f77c909ba..38f556851 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cherrypy==17.3.0
-celery==5.1.2
+celery
 python-dateutil==2.6.0
 psycopg2
 py3k-bcrypt==0.3
@@ -30,4 +30,4 @@ WTForms==3.0.0
 pyyaml==6.0
 pycountry==22.3.5
 python3-saml==1.15.0
-librabbitmq==2.0.0
+librabbitmq

From 482368a23934f40a2270da504b5cd024717d8e19 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Tue, 1 Aug 2023 23:11:57 -0400
Subject: [PATCH 5/8] Munging amqp ssl support

---
 uber/tasks/__init__.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/uber/tasks/__init__.py b/uber/tasks/__init__.py
index 6a4065bef..880754e8c 100644
--- a/uber/tasks/__init__.py
+++ b/uber/tasks/__init__.py
@@ -12,8 +12,14 @@
 celery.conf.beat_schedule = {}
 celery.conf.beat_startup_tasks = []
 celery.conf.update(config_dict['celery'])
-celery.conf.update(broker_url=config_dict['secret']['broker_url'])
-celery.conf.update(result_backend=config_dict['secret']['broker_url'].replace("amqp://", "rpc://"))
+
+broker_url = config_dict['secret']['broker_url']
+if broker_url.startswith("amqps://"):
+    celery.conf.update(broker_use_ssl=True)
+    broker_url = broker_url.replace("amqps://", "amqp://")
+    
+celery.conf.update(broker_url=broker_url)
+celery.conf.update(result_backend=broker_url.replace("amqp://", "rpc://"))
 celery.conf.update(task_ignore_result=True)
 
 def celery_on_startup(fn, *args, **kwargs):

From b70cf6d7f741c374492daba07e6c3851fb3702c0 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Tue, 1 Aug 2023 23:30:11 -0400
Subject: [PATCH 6/8] Removing broker_url hack

---
 uber/tasks/__init__.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/uber/tasks/__init__.py b/uber/tasks/__init__.py
index 880754e8c..6be64db68 100644
--- a/uber/tasks/__init__.py
+++ b/uber/tasks/__init__.py
@@ -14,12 +14,9 @@
 celery.conf.update(config_dict['celery'])
 
 broker_url = config_dict['secret']['broker_url']
-if broker_url.startswith("amqps://"):
-    celery.conf.update(broker_use_ssl=True)
-    broker_url = broker_url.replace("amqps://", "amqp://")
     
 celery.conf.update(broker_url=broker_url)
-celery.conf.update(result_backend=broker_url.replace("amqp://", "rpc://"))
+celery.conf.update(result_backend=broker_url.replace("amqps://", "rpc://"))
 celery.conf.update(task_ignore_result=True)
 
 def celery_on_startup(fn, *args, **kwargs):

From f9ccd77c2c3eddbeca2cc591b345cf87b3d709c8 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Wed, 2 Aug 2023 00:05:47 -0400
Subject: [PATCH 7/8] Reverting unrelated changes

---
 requirements.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 38f556851..3af4d8ad8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,8 +26,5 @@ Jinja2==2.11.3
 requests==2.27.1
 signnow_python_sdk==2.0.1
 Authlib==1.0.1
-WTForms==3.0.0
 pyyaml==6.0
-pycountry==22.3.5
-python3-saml==1.15.0
 librabbitmq

From 099ce19767423e96820f167a4c0927ed33bf5db5 Mon Sep 17 00:00:00 2001
From: Mark Murnane <mark@hackafe.net>
Date: Wed, 2 Aug 2023 21:22:05 -0400
Subject: [PATCH 8/8] Update requirements.txt

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 3af4d8ad8..b63fda662 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cherrypy==17.3.0
-celery
+celery==5.1.2
 python-dateutil==2.6.0
 psycopg2
 py3k-bcrypt==0.3
@@ -27,4 +27,4 @@ requests==2.27.1
 signnow_python_sdk==2.0.1
 Authlib==1.0.1
 pyyaml==6.0
-librabbitmq
+librabbitmq==2.0.0