nakidai
/
whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mishandling of empty config environment variables 

The recent change to cast bool config vars as ints to handle a '0' or
'1' value was shortsighted, since it doesn't allow for instances where
the variable is set to an empty value (or '' or any invalid/non-int
value).

This introduces a read_config_bool method for reading values that should
be a '0' or '1', but will default to False if not a digit (otherwise the
value will be cast as bool(int(value)) if "value" is a digit str).

Fixes #288
main
Ben Busby 2021-04-14 10:42:41 -04:00
parent e40a071b6b
commit d2fac809ca
No known key found for this signature in database
GPG Key ID: 3B08611DF6E62ED2
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/config.py
View File

@ -4,6 +4,12 @@ import os
class Config: class Config:
def __init__(self, **kwargs): def __init__(self, **kwargs):
def read_config_bool(var: str) -> bool:
val = os.getenv(var, '0')
if val.isdigit():
return bool(int(val))
return False
app_config = current_app.config app_config = current_app.config
self.url = os.getenv('WHOOGLE_CONFIG_URL', '') self.url = os.getenv('WHOOGLE_CONFIG_URL', '')
self.lang_search = os.getenv('WHOOGLE_CONFIG_LANGUAGE', '') self.lang_search = os.getenv('WHOOGLE_CONFIG_LANGUAGE', '')
@ -13,14 +19,14 @@ class Config:
open(os.path.join(app_config['STATIC_FOLDER'], open(os.path.join(app_config['STATIC_FOLDER'],
'css/variables.css')).read()) 'css/variables.css')).read())
self.ctry = os.getenv('WHOOGLE_CONFIG_COUNTRY', '') self.ctry = os.getenv('WHOOGLE_CONFIG_COUNTRY', '')
self.safe = int(os.getenv('WHOOGLE_CONFIG_SAFE', '0')) self.safe = read_config_bool('WHOOGLE_CONFIG_SAFE')
self.dark = int(os.getenv('WHOOGLE_CONFIG_DARK', '0')) self.dark = read_config_bool('WHOOGLE_CONFIG_DARK')
self.alts = int(os.getenv('WHOOGLE_CONFIG_ALTS', '0')) self.alts = read_config_bool('WHOOGLE_CONFIG_ALTS')
self.nojs = int(os.getenv('WHOOGLE_CONFIG_NOJS', '0')) self.nojs = read_config_bool('WHOOGLE_CONFIG_NOJS')
self.tor = int(os.getenv('WHOOGLE_CONFIG_TOR', '0')) self.tor = read_config_bool('WHOOGLE_CONFIG_TOR')
self.near = os.getenv('WHOOGLE_CONFIG_NEAR', '') self.near = os.getenv('WHOOGLE_CONFIG_NEAR', '')
self.new_tab = int(os.getenv('WHOOGLE_CONFIG_NEW_TAB', '0')) self.new_tab = read_config_bool('WHOOGLE_CONFIG_NEW_TAB')
self.get_only = int(os.getenv('WHOOGLE_CONFIG_GET_ONLY', '0')) self.get_only = read_config_bool('WHOOGLE_CONFIG_GET_ONLY')
self.safe_keys = [ self.safe_keys = [
'lang_search', 'lang_search',
'lang_interface', 'lang_interface',
@ -51,7 +57,7 @@ class Config:
def get_mutable_attrs(self): def get_mutable_attrs(self):
return {name: attr for name, attr in self.__dict__.items() return {name: attr for name, attr in self.__dict__.items()
if not name.startswith("__") if not name.startswith("__")
and (type(attr) is int or type(attr) is str)} and (type(attr) is bool or type(attr) is str)}
def is_safe_key(self, key) -> bool: def is_safe_key(self, key) -> bool:
"""Establishes a group of config options that are safe to set """Establishes a group of config options that are safe to set