velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

embed.sanitizer: check for MEDIA_PROXY being None

This commit is contained in:
Luna 2019-09-13 18:52:20 -03:00
parent 3973ca863c
commit 9346c5c52c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litecord/embed/sanitizer.py
View File

@ -89,9 +89,12 @@ def _mk_cfg_sess(config, session) -> tuple:
return config, session return config, session
def _md_base(config) -> tuple: def _md_base(config) -> Optional[tuple]:
"""Return the protocol and base url for the mediaproxy.""" """Return the protocol and base url for the mediaproxy."""
md_base_url = config['MEDIA_PROXY'] md_base_url = config['MEDIA_PROXY']
if md_base_url is None:
return None
proto = 'https' if config['IS_SSL'] else 'http' proto = 'https' if config['IS_SSL'] else 'http'
return proto, md_base_url return proto, md_base_url
@ -99,8 +102,15 @@ def _md_base(config) -> tuple:
def make_md_req_url(config, scope: str, url): def make_md_req_url(config, scope: str, url):
"""Make a mediaproxy request URL given the config, scope, and the url """Make a mediaproxy request URL given the config, scope, and the url
to be proxied.""" to be proxied.
proto, base_url = _md_base(config)
When MEDIA_PROXY is None, however, returns the original URL.
"""
base = _md_base(config)
if base is None:
return url.url if isinstance(url, EmbedURL) else url
proto, base_url = base
return f'{proto}://{base_url}/{scope}/{url.to_md_path}' return f'{proto}://{base_url}/{scope}/{url.to_md_path}'