Merge pull request #202 from hubmapconsortium/development

Transition to Nginx

Author: jpuerto-psc

docker/user_workspaces_server/nginx/conf.d/passthrough.conf

@@ -2,8 +2,8 @@ server {
     listen 5050;
     client_max_body_size 100M;
 
-    location / {
-#     This would be where we do the proxying through to the appropriate machines.
+    # Proxy admin route back to web
+    location /admin {
         proxy_pass http://web:5050;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
@@ -13,4 +13,25 @@ server {
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header   X-Forwarded-Host $server_name;
     }
+
+    # Passthrough route should just route traffic to the appropriate place.
+    location ~ ^/passthrough/([^/]+)/(\d+)/(.*)$ {\
+        # Extract hostname, port, and path using capture groups
+        set $target_host $1;
+        set $target_port $2;
+        set $target_path /$3;
+
+        proxy_pass http://$target_host:$target_port/passthrough/$target_host/$target_port$target_path$is_args$args;
+
+        # Forward headers to support WebSockets
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        # Preserve original headers
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
 }

src/user_workspaces_server/templates/script_templates/jupyter_lab_template.sh

@@ -132,15 +132,15 @@ if ${VERSION:0:1} < 3:
   c.NotebookApp.allow_origin = '*'
   c.NotebookApp.notebook_dir = "{{ workspace_full_path }}"
   c.NotebookApp.disable_check_xsrf = True
-  c.NotebookApp.base_url = "/passthrough/$(hostname)/{{ job_id }}"
+  c.NotebookApp.base_url = "/passthrough/$(hostname)/${PORT}"
   c.NotebookApp.port = ${PORT}
 else:
   c.ServerApp.ip = '*'
   c.ServerApp.open_browser = False
   c.ServerApp.allow_origin = '*'
   c.ServerApp.root_dir = "{{ workspace_full_path }}"
   c.ServerApp.disable_check_xsrf = True
-  c.ServerApp.base_url = "/passthrough/$(hostname)/{{ job_id }}"
+  c.ServerApp.base_url = "/passthrough/$(hostname)/${PORT}"
   c.ServerApp.port = ${PORT}
 EOL
 )

src/user_workspaces_server/urls.py

@@ -17,11 +17,10 @@
 from django.urls import include, path
 
 from . import ws_consumers
-from .views import (
+from .views import (  # passthrough_view,
     job_type_view,
     job_view,
     parameter_view,
-    passthrough_view,
     shared_workspace_view,
     status_view,
     user_view,
@@ -65,18 +64,18 @@
     path("", parameter_view.ParameterView.as_view(), name="parameters"),
 ]
 
-passthrough_view_patterns = [
-    path(
-        "<str:hostname>/<int:job_id>/",
-        passthrough_view.PassthroughView.as_view(),
-        name="passthrough",
-    ),
-    path(
-        "<str:hostname>/<int:job_id>/<path:remainder>",
-        passthrough_view.PassthroughView.as_view(),
-        name="passthrough_remainder",
-    ),
-]
+# passthrough_view_patterns = [
+#     path(
+#         "<str:hostname>/<int:job_id>/",
+#         passthrough_view.PassthroughView.as_view(),
+#         name="passthrough",
+#     ),
+#     path(
+#         "<str:hostname>/<int:job_id>/<path:remainder>",
+#         passthrough_view.PassthroughView.as_view(),
+#         name="passthrough_remainder",
+#     ),
+# ]
 
 user_view_patterns = [
     path(
@@ -109,7 +108,7 @@
     path("workspaces/", include(workspace_view_patterns)),
     path("jobs/", include(job_view_patterns)),
     path("job_types/", include(job_type_view_patterns)),
-    path("passthrough/", include(passthrough_view_patterns)),
+    # path("passthrough/", include(passthrough_view_patterns)),
     path("parameters/", include(parameter_view_patterns)),
     path("users/", include(user_view_patterns)),
     path("shared_workspaces/", include(shared_workspace_view_patterns)),