yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1998 from jberry-suse/obs_operator-handle-multilevel-domains

Browse Source 
obs_operator: handle multi-level origin domains.
This commit is contained in:
Jimmy Berry 2019-05-10 12:12:02 -05:00 committed by GitHub
commit fbd1bbd4e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
obs_operator.py
View File

@ -135,7 +135,7 @@ class RequestHandler(BaseHTTPRequestHandler):
return None return None
# Remove first subdomain and replace with api subdomain. # Remove first subdomain and replace with api subdomain.
domain_parent = '.'.join(domain.split('.')[1:]) domain_parent = '.'.join(domain.split('.')[-2:])
return 'https://api.{}'.format(domain_parent) return 'https://api.{}'.format(domain_parent)
def origin_domain_get(self): def origin_domain_get(self):
@ -144,7 +144,7 @@ class RequestHandler(BaseHTTPRequestHandler):
# Strip port if present. # Strip port if present.
domain = urlparse(origin).netloc.split(':', 2)[0] domain = urlparse(origin).netloc.split(':', 2)[0]
if '.' in domain: if '.' in domain:
return '.'.join(domain.split('.')[1:]) return '.'.join(domain.split('.')[-2:])
return None return None