hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-16 06:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

move redirect loop fallback to /user/name handler

Browse Source 
- add user_redirect_limit to settings, default 5 (that's still a whole minute before failing)
- limit sleep to ten seconds
This commit is contained in:
Min RK
2017-07-24 15:15:37 +02:00
committed by yuvipanda
parent 9d837b2e4b
commit 0d941e9c96
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
jupyterhub/handlers/base.py
View File

@@ -20,7 +20,7 @@ from .. import __version__
from .. import orm
from ..objects import Server
from ..spawner import LocalProcessSpawner
from ..utils import url_path_join
from ..utils import url_path_join, DT_SCALE
# pattern for the authentication token header
auth_header_pat = re.compile(r'^(?:token|bearer)\s+([^\s]+)$', flags=re.IGNORECASE)
@@ -503,32 +503,15 @@ class PrefixRedirectHandler(BaseHandler):
Redirects /foo to /prefix/foo, etc.
"""
@gen.coroutine
def get(self):
# We do exponential backoff here - since otherwise we can get stuck in a redirect loop!
# This is important in many distributed proxy implementations - those are often eventually
# consistent and can take upto a couple of seconds to actually apply throughout the cluster.
times = int(self.get_argument('times', 0))
# FIXME: should this be customizable? At times=7, it'll wait for about 12s the last time.
if times > 7:
# We stop if we've been redirected 12 times.
raise web.HTTPError(500)
# We want this to be 0 the first time, and then increase after that. This formula seems to work,
# but we might wanna make it customizable?
yield gen.sleep(( (2 ** times) - 1)/10)
uri = self.request.uri
if uri.startswith(self.base_url):
path = self.request.uri[len(self.base_url):]
else:
path = self.request.path
url_parts = urlparse(url_path_join(self.hub.base_url, path))
query_parts = parse_qs(url_parts.query)
query_parts['times'] = times + 1
url_parts = url_parts._replace(query=urlencode(query_parts))
new_url = urlunparse(url_parts)
self.redirect(new_url, permanent=False)
self.redirect(url_path_join(
self.hub.base_url, path,
), permanent=False)
class UserSpawnHandler(BaseHandler):
@@ -544,6 +527,7 @@ class UserSpawnHandler(BaseHandler):
@gen.coroutine
def get(self, name, user_path):
current_user = self.get_current_user()
if current_user and current_user.name == name:
# If people visit /user/:name directly on the Hub,
# the redirects will just loop, because the proxy is bypassed.
@@ -578,12 +562,40 @@ class UserSpawnHandler(BaseHandler):
return
else:
yield self.spawn_single_user(current_user)
# We do exponential backoff here - since otherwise we can get stuck in a redirect loop!
# This is important in many distributed proxy implementations - those are often eventually
# consistent and can take upto a couple of seconds to actually apply throughout the cluster.
try:
redirects = int(self.get_argument('redirects', 0))
except ValueError:
self.log.warning("Invalid redirects argument %r", self.get_argument('redirects'))
redirects = 0
if redirects >= self.settings.get('user_redirect_limit', 5):
# We stop if we've been redirected too many times.
raise web.HTTPError(500, "Redirect loop detected.")
# set login cookie anew
self.set_login_cookie(current_user)
without_prefix = self.request.uri[len(self.hub.base_url):]
target = url_path_join(self.base_url, without_prefix)
if self.subdomain_host:
target = current_user.host + target
# record redirect count in query parameter
if redirects:
self.log.warning("Redirect loop detected on %s", self.request.uri)
yield gen.sleep(min(1 * (DT_SCALE ** redirects), 10))
# rewrite target url with new `redirects` query value
url_parts = urlparse(target)
query_parts = parse_qs(url_parts.query)
query_parts['redirects'] = redirects + 1
url_parts = url_parts._replace(query=urlencode(query_parts))
target = urlunparse(url_parts)
else:
target = url_concat(target, {'redirects': 1})
self.redirect(target)
self.statsd.incr('redirects.user_after_login')
elif current_user: