Merge pull request #650 from recreators01/https_proxy

feat: add support for https_proxy environment variable (#415)

Author: imLinguin

umu/umu_run.py

@@ -23,7 +23,7 @@
 from types import FrameType
 from typing import Any
 
-from urllib3 import PoolManager, Retry
+from urllib3 import PoolManager, Retry, ProxyManager
 from urllib3.exceptions import HTTPError
 from urllib3.util import Timeout
 from Xlib import X, Xatom, display
@@ -935,11 +935,19 @@ def _check_offline_runtime(_rt: UmuRuntime) -> bool:
     else:
         timeouts = NET_TIMEOUT
 
+    http_pool: PoolManager
+    if "https_proxy" in os.environ:
+        http_pool = ProxyManager(
+            proxy_url=os.environ["https_proxy"],
+            timeout=Timeout(connect=timeouts, read=timeouts),
+            retries=Retry(total=retries, redirect=True),
+        )
+    else:
+        http_pool = PoolManager(
+            timeout=Timeout(connect=timeouts, read=timeouts),
+            retries=Retry(total=retries, redirect=True),
+        )
     thread_pool = ThreadPoolExecutor()
-    http_pool = PoolManager(
-        timeout=Timeout(connect=timeouts, read=timeouts),
-        retries=Retry(total=retries, redirect=True),
-    )
     with thread_pool, http_pool:
         session_pools: tuple[ThreadPoolExecutor, PoolManager] = (thread_pool, http_pool)
 

umu/umu_runtime.py

@@ -118,7 +118,7 @@ def _install_umu(
         # Get the digest for the runtime archive
         resp = http_pool.request(
             HTTPMethod.GET.value,
-            f"{host}{endpoint}/SHA256SUMS",
+            f"https://{host}{endpoint}/SHA256SUMS",
             preload_content=False,
         )
         if resp.status != HTTPStatus.OK:
@@ -137,7 +137,7 @@ def _install_umu(
         # Get BUILD_ID.txt. We'll use the value to identify the file when cached.
         # This will guarantee we'll be picking up the correct file when resuming
         resp = http_pool.request(
-            HTTPMethod.GET.value, f"{host}{endpoint}/BUILD_ID.txt"
+            HTTPMethod.GET.value, f"https://{host}{endpoint}/BUILD_ID.txt"
         )
         if resp.status != HTTPStatus.OK:
             err: str = f"{host} returned the status: {resp.status}"
@@ -164,7 +164,7 @@ def _install_umu(
 
         resp = http_pool.request(
             HTTPMethod.GET.value,
-            f"{host}{endpoint}/{archive}",
+            f"https://{host}{endpoint}/{archive}",
             preload_content=False,
             headers=headers,
         )
@@ -200,7 +200,7 @@ def _install_umu(
                         }
                         resp = http_pool.request(
                             HTTPMethod.GET.value,
-                            f"{host}{endpoint}/{archive}",
+                            f"https://{host}{endpoint}/{archive}",
                             preload_content=False,
                             headers=headers,
                         )
@@ -275,7 +275,7 @@ def setup_umu(
     codename, variant, _ = runtime_ver
     host: str = "repo.steampowered.com"
     endpoint: str = f"/{variant.removesuffix('-arm64')}/images/latest-public-beta"
-    url: str = f"{host}{endpoint}/VERSION.txt"
+    url: str = f"https://{host}{endpoint}/VERSION.txt"
     log.debug("Sending request to '%s' for 'VERSION.txt'...", url)
     resp = http_pool.request(HTTPMethod.GET.value, url)
     if resp.status != HTTPStatus.OK: