ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/config: use safer YAML loader

Browse source 
Fixes #254
This commit is contained in:
Shyam Sunder 2019-04-27 17:50:49 -04:00
parent 4117f63375
commit 26127eaaf5
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
server/szurubooru/config.py
View file

@ -4,11 +4,11 @@ import yaml
from szurubooru import errors from szurubooru import errors
def merge(left: Dict, right: Dict) -> Dict: def _merge(left: Dict, right: Dict) -> Dict:
for key in right: for key in right:
if key in left: if key in left:
if isinstance(left[key], dict) and isinstance(right[key], dict): if isinstance(left[key], dict) and isinstance(right[key], dict):
merge(left[key], right[key]) _merge(left[key], right[key])
elif left[key] != right[key]: elif left[key] != right[key]:
left[key] = right[key] left[key] = right[key]
else: else:
@ -16,7 +16,7 @@ def merge(left: Dict, right: Dict) -> Dict:
return left return left
def docker_config() -> Dict: def _docker_config() -> Dict:
for key in [ for key in [
'POSTGRES_USER', 'POSTGRES_USER',
'POSTGRES_PASSWORD', 'POSTGRES_PASSWORD',
@ -45,15 +45,18 @@ def docker_config() -> Dict:
} }
def read_config() -> Dict: def _file_config(filename: str) -> Dict:
with open('config.yaml.dist') as handle: with open(filename) as handle:
ret = yaml.load(handle.read()) return yaml.load(handle.read(), Loader=yaml.SafeLoader)
if os.path.exists('config.yaml'):
with open('config.yaml') as handle:
ret = merge(ret, yaml.load(handle.read()))
if os.path.exists('/.dockerenv'):
ret = merge(ret, docker_config())
return ret
config = read_config() # pylint: disable=invalid-name def _read_config() -> Dict:
ret = _file_config('config.yaml.dist')
if os.path.exists('config.yaml'):
ret = _merge(ret, _file_config('config.yaml'))
if os.path.exists('/.dockerenv'):
ret = _merge(ret, _docker_config())
return ret
config = _read_config() # pylint: disable=invalid-name