From 315087d67c66cbccc5bdfe033a238d76d8a89a72 Mon Sep 17 00:00:00 2001 From: Kenan Erdogan Date: Fri, 15 Jun 2018 13:36:05 +0200 Subject: [PATCH] fix AddSlashHandler for hub_prefix without trailing / --- jupyterhub/app.py | 2 -- jupyterhub/handlers/base.py | 1 + jupyterhub/handlers/pages.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jupyterhub/app.py b/jupyterhub/app.py index ce0dd564..d3550e9b 100644 --- a/jupyterhub/app.py +++ b/jupyterhub/app.py @@ -976,8 +976,6 @@ class JupyterHub(Application): self.handlers = self.add_url_prefix(self.hub_prefix, h) # some extra handlers, outside hub_prefix self.handlers.extend([ - # add trailing / to `/hub` - (self.hub_prefix.rstrip('/'), handlers.AddSlashHandler), # add trailing / to ``/user|services/:name` (r"%s(user|services)/([^/]+)" % self.base_url, handlers.AddSlashHandler), (r"(?!%s).*" % self.hub_prefix, handlers.PrefixRedirectHandler), diff --git a/jupyterhub/handlers/base.py b/jupyterhub/handlers/base.py index 5e94c2d9..aaedd22c 100644 --- a/jupyterhub/handlers/base.py +++ b/jupyterhub/handlers/base.py @@ -1119,6 +1119,7 @@ class AddSlashHandler(BaseHandler): self.redirect(urlunparse(dest)) default_handlers = [ + (r'', AddSlashHandler), # add trailing / to `/hub` (r'/user/([^/]+)(/.*)?', UserSpawnHandler), (r'/user-redirect/(.*)?', UserRedirectHandler), (r'/security/csp-report', CSPReportHandler), diff --git a/jupyterhub/handlers/pages.py b/jupyterhub/handlers/pages.py index 467967f4..bcd2aae6 100644 --- a/jupyterhub/handlers/pages.py +++ b/jupyterhub/handlers/pages.py @@ -336,7 +336,7 @@ class ProxyErrorHandler(BaseHandler): default_handlers = [ - (r'/?', RootHandler), + (r'/', RootHandler), (r'/home', HomeHandler), (r'/admin', AdminHandler), (r'/spawn', SpawnHandler),