From d6f93c080d229a20fc617b686d43f2e9f6569777 Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Mon, 19 Dec 2022 19:06:35 +0100
Subject: [PATCH] fixes

---
 changedetectionio/forms.py                    |  2 +-
 changedetectionio/run_proxy_tests.sh          | 20 ++++++++++
 changedetectionio/store.py                    |  7 ++--
 .../proxy_list/test_select_custom_proxy.py    | 38 +++++++++++++++++++
 4 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 changedetectionio/tests/proxy_list/test_select_custom_proxy.py

diff --git a/changedetectionio/forms.py b/changedetectionio/forms.py
index 5b7fc1983..48e9478b1 100644
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@@ -430,7 +430,7 @@ class SingleExtraProxy(Form):
 
     # maybe better to set some <script>var..
     proxy_name = StringField('Name', [validators.Optional()], render_kw={"placeholder": "Name"})
-    proxy_url = StringField('URL', [validators.Optional(), validators.url()], render_kw={"placeholder": "http://user:pass@...:3128"})
+    proxy_url = StringField('URL', [validators.Optional()], render_kw={"placeholder": "http://user:pass@...:3128"})
 
 
 # datastore.data['settings']['requests']..
diff --git a/changedetectionio/run_proxy_tests.sh b/changedetectionio/run_proxy_tests.sh
index 506d00682..c49a21771 100755
--- a/changedetectionio/run_proxy_tests.sh
+++ b/changedetectionio/run_proxy_tests.sh
@@ -8,6 +8,10 @@ set -e
 docker run --network changedet-network -d --name squid-one --hostname squid-one --rm -v `pwd`/tests/proxy_list/squid.conf:/etc/squid/conf.d/debian.conf ubuntu/squid:4.13-21.10_edge
 docker run --network changedet-network -d --name squid-two --hostname squid-two --rm -v `pwd`/tests/proxy_list/squid.conf:/etc/squid/conf.d/debian.conf ubuntu/squid:4.13-21.10_edge
 
+# Used for configuring a custom proxy URL via the UI
+# @todo maybe test with auth config too?
+docker run --network changedet-network -d --name squid-custom --hostname squid-squid-custom --rm -v `pwd`/tests/proxy_list/squid.conf:/etc/squid/conf.d/debian.conf ubuntu/squid:4.13-21.10_edge
+
 
 ## 2nd test actually choose the preferred proxy from proxies.json
 
@@ -32,3 +36,19 @@ then
   echo "Did not see a request to chosen.changedetection.io in the squid logs (while checking preferred proxy - squid two)"
   exit 1
 fi
+
+
+# Test the UI configurable proxies
+
+docker run --network changedet-network \
+  test-changedetectionio \
+  bash -c 'cd changedetectionio && pytest tests/proxy_list/test_select_custom_proxy.py'
+
+
+# Should see a request for one.changedetection.io in there
+docker logs squid-custom 2>/dev/null|grep one.changedetection.io
+if [ $? -ne 0 ]
+then
+  echo "Did not see a request to chosen.changedetection.io in the squid logs (while checking preferred proxy - squid two)"
+  exit 1
+fi
diff --git a/changedetectionio/store.py b/changedetectionio/store.py
index 6b2b01d18..edf9e2a8b 100644
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -475,7 +475,7 @@ class ChangeDetectionStore:
                 i += 0
                 if proxy.get('proxy_name') and proxy.get('proxy_url'):
                     k = "ui-" + str(i) + proxy.get('proxy_name')
-                    proxy_list[k] = {'label': proxy.get('proxy_name'), 'url': proxy.get('url')}
+                    proxy_list[k] = {'label': proxy.get('proxy_name'), 'url': proxy.get('proxy_url')}
 
 
         return proxy_list if len(proxy_list) else None
@@ -506,8 +506,9 @@ class ChangeDetectionStore:
             if self.proxy_list.get(system_proxy_id):
                 return system_proxy_id
 
-        # Fallback - Did not resolve anything, use the first available
-        if system_proxy_id is None:
+
+        # Fallback - Did not resolve anything, or doesnt exist, use the first available
+        if system_proxy_id is None or not self.proxy_list.get(system_proxy_id):
             first_default = list(self.proxy_list)[0]
             return first_default
 
diff --git a/changedetectionio/tests/proxy_list/test_select_custom_proxy.py b/changedetectionio/tests/proxy_list/test_select_custom_proxy.py
new file mode 100644
index 000000000..8657f4210
--- /dev/null
+++ b/changedetectionio/tests/proxy_list/test_select_custom_proxy.py
@@ -0,0 +1,38 @@
+#!/usr/bin/python3
+
+import time
+from flask import url_for
+from ..util import live_server_setup, wait_for_all_checks
+
+# just make a request, we will grep in the docker logs to see it actually got called
+def test_select_custom(client, live_server):
+    live_server_setup(live_server)
+
+    # Goto settings, add our custom one
+    res = client.post(
+        url_for("settings_page"),
+        data={
+            "requests-time_between_check-minutes": 180,
+            "application-ignore_whitespace": "y",
+            "application-fetch_backend": "html_requests",
+            "requests-extra_proxies-0-proxy_name": "custom-test-proxy",
+            "requests-extra_proxies-0-proxy_url": "http://squid-custom:3128",
+        },
+        follow_redirects=True
+    )
+
+    assert b"Settings updated." in res.data
+
+    res = client.post(
+        url_for("import_page"),
+        # Because a URL wont show in squid/proxy logs due it being SSLed
+        # Use plain HTTP or a specific domain-name here
+        data={"urls": "http://one.changedetection.io"},
+        follow_redirects=True
+    )
+
+    assert b"1 Imported" in res.data
+    wait_for_all_checks(client)
+
+    # Now we should see the request in the container logs for "squid-squid-custom" because it will be the only default
+