Added http_proxy support to downloader.ini file.

Author: theypsilon

README.md

@@ -73,6 +73,10 @@ downloader_retries = 3
 ; verbose: when true, will make Downloader output to display additional debug information
 ;   This is also necessary to be active to display benchmark information.
 verbose = false
+
+; http_proxy: Routes all downloads through a proxy server (advanced, rarely needed)
+;   Format: 'http://proxy-server:port'
+http_proxy = ''
 ```
 
 ### Feature Roadmap

src/downloader/config.py

@@ -86,9 +86,10 @@ class ConfigMisterSection(TypedDict):
     minimum_system_free_space_mb: int
     minimum_external_free_space_mb: int
     user_defined_options: List[str]
+    http_proxy: Optional[str]
 
 
-class ConfigRequired(ConfigMisterSection, HttpConfig):
+class ConfigRequired(ConfigMisterSection):
     zip_file_count_threshold: int
     zip_accumulated_mb_threshold: int
     debug: bool
@@ -102,6 +103,7 @@ class ConfigRequired(ConfigMisterSection, HttpConfig):
     fail_on_file_error: bool
     curl_ssl: str
     http_logging: bool
+    http_config: HttpConfig
 
 class Config(ConfigRequired, total=False):
     environment: Environment  # This should never be used. It's there just to be debug-logged.
@@ -142,8 +144,8 @@ def default_config() -> Config:
         'fail_on_file_error': False,
         'minimum_system_free_space_mb': DEFAULT_MINIMUM_SYSTEM_FREE_SPACE_MB,
         'minimum_external_free_space_mb': DEFAULT_MINIMUM_EXTERNAL_FREE_SPACE_MB,
-        'http_proxy': None,
-        'https_proxy': None
+        'http_proxy': '',
+        'http_config': None
     }
 
 

src/downloader/config_reader.py

@@ -30,7 +30,7 @@
     K_DB_URL, K_DOWNLOADER_THREADS_LIMIT, K_DOWNLOADER_TIMEOUT, K_DOWNLOADER_RETRIES, K_FILTER, K_BASE_SYSTEM_PATH, \
     K_STORAGE_PRIORITY, K_ALLOW_DELETE, K_ALLOW_REBOOT, K_VERBOSE, K_UPDATE_LINUX, K_MINIMUM_SYSTEM_FREE_SPACE_MB, \
     K_MINIMUM_EXTERNAL_FREE_SPACE_MB, STORAGE_PRIORITY_OFF, STORAGE_PRIORITY_PREFER_SD, \
-    STORAGE_PRIORITY_PREFER_EXTERNAL, EXIT_ERROR_WRONG_SETUP
+    STORAGE_PRIORITY_PREFER_EXTERNAL, EXIT_ERROR_WRONG_SETUP, K_HTTP_PROXY
 from downloader.db_options import DbOptions, DbOptionsProps, DbOptionsValidationException
 from downloader.http_gateway import http_config
 from downloader.logger import Logger, time_str
@@ -160,7 +160,9 @@ def read_config(self, config_path: str) -> Config:
             result['curl_ssl'] = ''
 
         if self._env['HTTP_PROXY'] or self._env['HTTPS_PROXY']:
-            result.update(http_config(http_proxy=self._env['HTTP_PROXY'], https_proxy=self._env['HTTPS_PROXY']))
+            result['http_config'] = http_config(http_proxy=self._env['HTTP_PROXY'], https_proxy=self._env['HTTPS_PROXY'])
+        elif result['http_proxy'] != '':
+            result['http_config'] = http_config(http_proxy=result['http_proxy'], https_proxy=None)
 
         result['environment'] = self._env
 
@@ -242,7 +244,8 @@ def _parse_mister_section(self, result: Config, parser: 'IniParser') -> ConfigMi
             'filter': parser.get_string(K_FILTER, result['filter']).strip().lower(),
             'minimum_system_free_space_mb': parser.get_int(K_MINIMUM_SYSTEM_FREE_SPACE_MB, result['minimum_system_free_space_mb']),
             'minimum_external_free_space_mb': parser.get_int(K_MINIMUM_EXTERNAL_FREE_SPACE_MB, result['minimum_external_free_space_mb']),
-            'user_defined_options': []
+            'user_defined_options': [],
+            'http_proxy': parser.get_string(K_HTTP_PROXY, '').strip().lower()
         }
 
         for key in mister:

src/downloader/constants.py

@@ -156,6 +156,7 @@ def FILE_7z_util_uninstalled_description() -> SafeFetchInfo: return {
 K_IS_PC_LAUNCHER: Final[str] = 'is_pc_launcher'
 K_MINIMUM_SYSTEM_FREE_SPACE_MB: Final[str] = 'minimum_system_free_space_mb'
 K_MINIMUM_EXTERNAL_FREE_SPACE_MB: Final[str] = 'minimum_external_free_space_mb'
+K_HTTP_PROXY: Final[str] = 'http_proxy'
 
 # Default Config option
 DEFAULT_CACERT_FILE: Final[str] = '/etc/ssl/certs/cacert.pem'

src/downloader/full_run_service_factory.py

@@ -78,7 +78,7 @@ def create(self, config: Config):
             ssl_ctx=ssl_ctx,
             timeout=http_connection_timeout,
             logger=DebugOnlyLoggerDecorator(self._logger) if config['http_logging'] else None,
-            config=config
+            config=config['http_config']
         )
         atexit.register(http_gateway.cleanup)
         safe_file_fetcher = SafeFileFetcher(config, system_file_system, self._logger, http_gateway, waiter)