feat(proxy): allow text/plain PAC file

qgis-deployment · Oct 2, 2024 · daba8b6 · daba8b6
1 parent 508ab54
commit daba8b6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/qgis_deployment_toolbelt/utils/proxies.py b/qgis_deployment_toolbelt/utils/proxies.py
@@ -82,20 +82,31 @@ def get_proxy_settings(url: str | None = None) -> dict:
             )
     elif qdt_pac_file := environ.get("QDT_PAC_FILE"):
         if qdt_pac_file.startswith(("http",)):
-            pac = get_pac(qdt_pac_file)
+            pac = get_pac(
+                qdt_pac_file,
+                allowed_content_types=[
+                    "text/plain",
+                    "application/x-ns-proxy-autoconfig",
+                    "application/x-javascript-config",
+                ],
+            )
         else:
-            with open(qdt_pac_file) as f:
+            with open(qdt_pac_file, encoding="UTF-8") as f:
                 pac = PACFile(f.read)
-
-        with pac_context_for_url(url=url, pac=pac):
-            if environ.get("HTTP_PROXY"):
-                proxy_settings["http"] = environ.get("HTTP_PROXY")
-            if environ.get("HTTPS_PROXY"):
-                proxy_settings["https"] = environ.get("HTTPS_PROXY")
-        logger.info(
-            f"Proxies settings from environment vars PAC file: {environ.get('QDT_PAC_FILE')}"
-            f"{proxy_settings}"
-        )
+        if pac:
+            with pac_context_for_url(url=url, pac=pac):
+                if environ.get("HTTP_PROXY"):
+                    proxy_settings["http"] = environ.get("HTTP_PROXY")
+                if environ.get("HTTPS_PROXY"):
+                    proxy_settings["https"] = environ.get("HTTPS_PROXY")
+            logger.info(
+                f"Proxies settings from environment vars PAC file: {environ.get('QDT_PAC_FILE')}"
+                f"{proxy_settings}"
+            )
+        else:
+            logger.warning(
+                f"Invalid PAC file from environment vars PAC file : {environ.get('QDT_PAC_FILE')}. No proxy use."
+            )
     elif getproxies():
         proxy_settings = getproxies()
         logger.debug(f"Proxies settings found in the OS: {proxy_settings}")

diff --git a/tests/test_utils_proxies.py b/tests/test_utils_proxies.py
@@ -95,7 +95,7 @@ def test_pac_file(self):
 
         ## url
         environ["QDT_PAC_FILE"] = (
-            "http://ieadmin.grandlyon.fr/administration/config/proxy.pac"
+            "https://raw.githubusercontent.com/Guts/qgis-deployment-cli/refs/heads/feat/pypac_auto_proxy/tests/fixtures/pac/proxy.pac"
         )
 
         ### QGIS plugin : use proxy