moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-16 22:35:03 -05:00
Code Issues Releases Wiki Activity

Fixed redirect issues which should now resolve reverse proxy web_root issues as well.

Browse Source
This commit is contained in:
echel0n 2014-07-11 12:33:49 -07:00
parent 6a3c6a5be4
commit 9e365310b6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sickbeard/webserve.py
View File

@ -132,8 +132,7 @@ class HTTPRedirect(Exception):
"""Exception raised when the request should be redirected.""" """Exception raised when the request should be redirected."""
def __init__(self, url, permanent=False, status=None): def __init__(self, url, permanent=False, status=None):
self.web_root = ('/' + sickbeard.WEB_ROOT.lstrip('/')) if sickbeard.WEB_ROOT else '' self.url = url
self.url = urlparse.urljoin(self.web_root, url)
self.permanent = permanent self.permanent = permanent
self.status = status self.status = status
Exception.__init__(self, self.url, self.permanent, self.status) Exception.__init__(self, self.url, self.permanent, self.status)
@ -144,8 +143,8 @@ class HTTPRedirect(Exception):
def redirect(url, permanent=False, status=None): def redirect(url, permanent=False, status=None):
raise HTTPRedirect(url, permanent, status) assert url[0] == '/'
raise HTTPRedirect(sickbeard.WEB_ROOT + url, permanent, status)
@authenticated @authenticated
class MainHandler(RequestHandler): class MainHandler(RequestHandler):
@ -167,7 +166,7 @@ class MainHandler(RequestHandler):
if status_code == 401: if status_code == 401:
self.finish(self.http_error_401_handler()) self.finish(self.http_error_401_handler())
elif status_code == 404: elif status_code == 404:
self.redirect(urlparse.urljoin(sickbeard.WEB_ROOT, '/home/')) self.redirect(sickbeard.WEB_ROOT + '/home/')
elif self.settings.get("debug") and "exc_info" in kwargs: elif self.settings.get("debug") and "exc_info" in kwargs:
exc_info = kwargs["exc_info"] exc_info = kwargs["exc_info"]
trace_info = ''.join(["%s<br/>" % line for line in traceback.format_exception(*exc_info)]) trace_info = ''.join(["%s<br/>" % line for line in traceback.format_exception(*exc_info)])