extern/apprise
1
0
Fork 0
mirror of https://github.com/caronc/apprise.git synced 2024-11-25 17:44:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated handling of parse_url secure flag check

Browse Source
This commit is contained in:
Chris Caron 2023-10-08 16:44:46 -04:00
parent 480d0e0bbc
commit 8e54bba4a7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apprise/URLBase.py
View File

@ -204,7 +204,14 @@ class URLBase:
self.verify_certificate = parse_bool(kwargs.get('verify', True)) self.verify_certificate = parse_bool(kwargs.get('verify', True))
# Secure Mode # Secure Mode
self.secure = kwargs.get('secure', False) self.secure = kwargs.get('secure', None)
try:
if not isinstance(self.secure, bool):
# Attempt to detect
self.secure = kwargs.get('schema', '')[-1].lower() == 's'
except (TypeError, IndexError):
self.secure = False
self.host = URLBase.unquote(kwargs.get('host')) self.host = URLBase.unquote(kwargs.get('host'))
self.port = kwargs.get('port') self.port = kwargs.get('port')
@ -664,7 +671,8 @@ class URLBase:
} }
@staticmethod @staticmethod
def parse_url(url, verify_host=True, plus_to_space=False): def parse_url(url, verify_host=True, plus_to_space=False,
strict_port=False):
"""Parses the URL and returns it broken apart into a dictionary. """Parses the URL and returns it broken apart into a dictionary.
This is very specific and customized for Apprise. This is very specific and customized for Apprise.
@ -685,13 +693,13 @@ class URLBase:
results = parse_url( results = parse_url(
url, default_schema='unknown', verify_host=verify_host, url, default_schema='unknown', verify_host=verify_host,
plus_to_space=plus_to_space) plus_to_space=plus_to_space, strict_port=strict_port)
if not results: if not results:
# We're done; we failed to parse our url # We're done; we failed to parse our url
return results return results
# if our URL ends with an 's', then assueme our secure flag is set. # if our URL ends with an 's', then assume our secure flag is set.
results['secure'] = (results['schema'][-1] == 's') results['secure'] = (results['schema'][-1] == 's')
# Support SSL Certificate 'verify' keyword. Default to being enabled # Support SSL Certificate 'verify' keyword. Default to being enabled