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

Fixed basic auth issues.

Browse Source
This commit is contained in:
echel0n 2014-06-14 21:38:13 -07:00
parent d73cc1cbbd
commit 04681b3297
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sickbeard/webserve.py
View File

@ -97,14 +97,20 @@ def require_basic_auth(handler_class):
handler.finish() handler.finish()
return False return False
if not sickbeard.WEB_USERNAME and not sickbeard.WEB_PASSWORD:
if not handler.get_secure_cookie("user"):
handler.set_secure_cookie("user", str(time.time()))
return True
auth_header = handler.request.headers.get('Authorization') auth_header = handler.request.headers.get('Authorization')
if auth_header is None or not auth_header.startswith('Basic '): if auth_header is None or not auth_header.startswith('Basic '):
get_auth() get_auth()
auth_decoded = base64.decodestring(auth_header[6:]) auth_decoded = base64.decodestring(auth_header[6:])
kwargs['basicauth_user'], kwargs['basicauth_pass'] = auth_decoded.split(':', 2) basicauth_user, basicauth_pass = auth_decoded.split(':', 2)
if kwargs['basicauth_user'] == sickbeard.WEB_USERNAME and kwargs['basicauth_pass'] == sickbeard.WEB_PASSWORD: if basicauth_user == sickbeard.WEB_USERNAME and basicauth_pass == sickbeard.WEB_PASSWORD:
handler.set_secure_cookie("user", kwargs['basicauth_user']) if not handler.get_secure_cookie("user"):
handler.set_secure_cookie("user", str(time.time()))
return True return True
handler.clear_cookie("user") handler.clear_cookie("user")
@ -132,10 +138,7 @@ class RedirectHandler(RequestHandler):
@require_basic_auth @require_basic_auth
class LoginHandler(RedirectHandler): class LoginHandler(RedirectHandler):
def get(self, basicauth_user, basicauth_pass): def get(self, path):
if not self.get_secure_cookie("user") and basicauth_user and basicauth_pass:
self.set_secure_cookie("user", basicauth_user)
self.redirect(self.get_argument("next", u"/")) self.redirect(self.get_argument("next", u"/"))
@require_basic_auth @require_basic_auth