Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

client: add simple wildcard matching mechanism for trusted domains (#306) to resolve #305

Browse Source
This commit is contained in:
prez 2020-05-02 17:36:34 +02:00 committed by GitHub
parent 3125032e82
commit 9d7996d7fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
syncplay/client.py
View File

@ -506,6 +506,12 @@ class SyncplayClient(object):
return False return False
def isURITrusted(self, URIToTest): def isURITrusted(self, URIToTest):
def sWildcardMatch(a, b):
splt = a.split('*')
if len(splt) == 1:
return b.startswith(a)
return b.startswith(splt[0]) and b.endswith(splt[-1])
URIToTest = URIToTest+"/" URIToTest = URIToTest+"/"
for trustedProtocol in constants.TRUSTABLE_WEB_PROTOCOLS: for trustedProtocol in constants.TRUSTABLE_WEB_PROTOCOLS:
if URIToTest.startswith(trustedProtocol): if URIToTest.startswith(trustedProtocol):
@ -513,7 +519,7 @@ class SyncplayClient(object):
if self._config['trustedDomains']: if self._config['trustedDomains']:
for trustedDomain in self._config['trustedDomains']: for trustedDomain in self._config['trustedDomains']:
trustableURI = ''.join([trustedProtocol, trustedDomain, "/"]) trustableURI = ''.join([trustedProtocol, trustedDomain, "/"])
if URIToTest.startswith(trustableURI): if sWildcardMatch(trustableURI, URIToTest):
return True return True
return False return False
else: else: