fix AddSlashHandler for hub_prefix without trailing /

This commit is contained in:
Kenan Erdogan
2018-06-15 13:36:05 +02:00
parent bedac5f148
commit 315087d67c
3 changed files with 2 additions and 3 deletions

View File

@@ -976,8 +976,6 @@ class JupyterHub(Application):
self.handlers = self.add_url_prefix(self.hub_prefix, h) self.handlers = self.add_url_prefix(self.hub_prefix, h)
# some extra handlers, outside hub_prefix # some extra handlers, outside hub_prefix
self.handlers.extend([ self.handlers.extend([
# add trailing / to `/hub`
(self.hub_prefix.rstrip('/'), handlers.AddSlashHandler),
# add trailing / to ``/user|services/:name` # add trailing / to ``/user|services/:name`
(r"%s(user|services)/([^/]+)" % self.base_url, handlers.AddSlashHandler), (r"%s(user|services)/([^/]+)" % self.base_url, handlers.AddSlashHandler),
(r"(?!%s).*" % self.hub_prefix, handlers.PrefixRedirectHandler), (r"(?!%s).*" % self.hub_prefix, handlers.PrefixRedirectHandler),

View File

@@ -1119,6 +1119,7 @@ class AddSlashHandler(BaseHandler):
self.redirect(urlunparse(dest)) self.redirect(urlunparse(dest))
default_handlers = [ default_handlers = [
(r'', AddSlashHandler), # add trailing / to `/hub`
(r'/user/([^/]+)(/.*)?', UserSpawnHandler), (r'/user/([^/]+)(/.*)?', UserSpawnHandler),
(r'/user-redirect/(.*)?', UserRedirectHandler), (r'/user-redirect/(.*)?', UserRedirectHandler),
(r'/security/csp-report', CSPReportHandler), (r'/security/csp-report', CSPReportHandler),

View File

@@ -336,7 +336,7 @@ class ProxyErrorHandler(BaseHandler):
default_handlers = [ default_handlers = [
(r'/?', RootHandler), (r'/', RootHandler),
(r'/home', HomeHandler), (r'/home', HomeHandler),
(r'/admin', AdminHandler), (r'/admin', AdminHandler),
(r'/spawn', SpawnHandler), (r'/spawn', SpawnHandler),