From 4f2ed3cf1ef19f46c18065dd2ee533e79545d142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Tue, 11 Aug 2015 13:16:02 +0200
Subject: [PATCH] fixes for workspace auth

---
 ipynbsrv/core/auth/checks.py                    |  2 +-
 ipynbsrv/web/settings.py                        | 16 ++++++++--------
 ipynbsrv/web/templates/web/snippets/navbar.html |  4 ++--
 lib/confs/nginx/ipynbsrv.conf                   |  8 +++++++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ipynbsrv/core/auth/checks.py b/ipynbsrv/core/auth/checks.py
index 8da43d9..255e5c0 100644
--- a/ipynbsrv/core/auth/checks.py
+++ b/ipynbsrv/core/auth/checks.py
@@ -1,7 +1,7 @@
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from django.http.response import HttpResponse
-from ipynbsrv.wui.models import PortMapping
+from ipynbsrv.core.models import PortMapping
 
 
 COOKIE_NAME = 'username'
diff --git a/ipynbsrv/web/settings.py b/ipynbsrv/web/settings.py
index ef89ab5..158d7ca 100644
--- a/ipynbsrv/web/settings.py
+++ b/ipynbsrv/web/settings.py
@@ -1,22 +1,22 @@
-'''
+"""
 Setting storing the name of the cookie that is used to check access via the reverse proxy to containers.
-'''
+"""
 AUTH_COOKIE_NAME = 'username'
 
 
-'''
+"""
 Setting storing the name of the header that is indicating the requested URI, the reverse proxy is adding to sub-requests.
-'''
+"""
 PROXY_URI_HEADER = 'HTTP_X_ORIGINAL_URI'
 
 
-'''
+"""
 Setting storing the URL under which the application\'s documentation can be found.
-'''
+"""
 URL_DOCS = '/docs/'
 
 
-'''
+"""
 Setting storing the URL under which the user publications can be found.
-'''
+"""
 URL_PUBLIC = '/public/'
diff --git a/ipynbsrv/web/templates/web/snippets/navbar.html b/ipynbsrv/web/templates/web/snippets/navbar.html
index ba77957..f0de9c8 100644
--- a/ipynbsrv/web/templates/web/snippets/navbar.html
+++ b/ipynbsrv/web/templates/web/snippets/navbar.html
@@ -25,7 +25,7 @@
                 <li class="hidden-xs"><a href="" data-tooltip data-placement="bottom" title="User Guide" target="_blank">
                     <i class="glyphicon glyphicon-question-sign" aria-hidden="true"></i>
                 </a></li>
-                <li class="hidden-xs"><a href="{% settings 'PUBLIC_URL' %}{% request.user.get_username %}" data-tooltip data-placement="bottom" title="My publications" target="_blank">
+                <li class="hidden-xs"><a href="{% settings 'PUBLIC_URL' %}{{ request.user.get_username }}" data-tooltip data-placement="bottom" title="My publications" target="_blank">
                     <i class="glyphicon glyphicon-globe" aria-hidden="true"></i>
                 </a></li>
                 <li class="hidden-xs"><a href="/accounts/unflag" data-tooltip data-placement="bottom" title="Logout">
@@ -35,7 +35,7 @@
                     <a href="" title="User Guide" target="_blank">Use Guide</a>
                 </li>
                 <li class="hidden-sm hidden-md hidden-lg">
-                    <a href="{% settings 'PUBLIC_URL' %}{% request.user.get_username %}" title="My publications" target="_blank">My publications</a>
+                    <a href="{% settings 'PUBLIC_URL' %}{{ request.user.get_username }}" title="My publications" target="_blank">My publications</a>
                 </li>
                 <li class="hidden-sm hidden-md hidden-lg">
                     <a href="/accounts/unflag" title="Logout">Logout</a>
diff --git a/lib/confs/nginx/ipynbsrv.conf b/lib/confs/nginx/ipynbsrv.conf
index 9ac31e3..45e1616 100644
--- a/lib/confs/nginx/ipynbsrv.conf
+++ b/lib/confs/nginx/ipynbsrv.conf
@@ -32,7 +32,7 @@ server {
         proxy_set_header  X-Original-URI  $request_uri;
 
         proxy_pass_request_body  off;
-        proxy_pass  http://$host/_workspace_auth_check;
+        proxy_pass  http://127.0.0.1/_workspace_auth_check;
     }
 
     # location for documentation
@@ -66,6 +66,12 @@ server {
         set  $decoded_backend  '';
         set_decode_hex  $decoded_backend  $1;
 
+        # use the Django error pages
+        # forbidden = 404 so the user doesn't know there is a container
+        # 50x grouped to 500
+        error_page 403 404  /error/404;
+        error_page 500 502 503 504  /error/500;
+
         # needed for websockets connections
         proxy_http_version  1.1;
         proxy_set_header    Upgrade     $http_upgrade;