Fixes: the CERNBox web UI now almost works, not yet the invitations

cs3org · Dec 15, 2023 · 6f180ad · 6f180ad
1 parent 3579747
commit 6f180ad
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/examples/cernbox/cernbox.toml b/examples/cernbox/cernbox.toml
@@ -91,6 +91,7 @@ driver = "static"
 
 [grpc.services.authregistry.drivers.static.rules]
 basic = "{{ grpc.services.authprovider[0].address }}"
+bearer = "{{ grpc.services.authprovider[0].address }}"
 machine = "{{ grpc.services.authprovider[1].address }}"
 ocmshares = "{{ grpc.services.authprovider[2].address }}"
 
@@ -123,10 +124,10 @@ auth_manager = "ocmshares"
 driver = "static"
 
 [grpc.services.storageregistry.drivers.static]
-home_provider = "/home"
+home_provider = "/"
 
 [grpc.services.storageregistry.drivers.static.rules]
-"/home" = {"address" = "{{ grpc.services.storageprovider[0].address }}"}
+"/" = {"address" = "{{ grpc.services.storageprovider[0].address }}"}
 "localhome" = {"address" = "{{ grpc.services.storageprovider[0].address }}"}
 "/ocm" = {"address" = "{{ grpc.services.storageprovider[1].address }}"}
 "ocm" = {"address" = "{{ grpc.services.storageprovider[1].address }}"}
@@ -135,11 +136,11 @@ home_provider = "/home"
 
 [[grpc.services.storageprovider]]
 driver = "localhome"
-mount_path = "/home"
+mount_path = "/"
 mount_id = "localhome"
 expose_data_server = true
 data_server_url = "https://localhost:{{ http.services.dataprovider[0].address.port }}/data"
-enable_home_creation = false
+enable_home_creation = true
 
 [grpc.services.storageprovider.drivers.localhome]
 user_layout = "{{.Username}}"
@@ -233,6 +234,13 @@ file = ""
 
 ### HTTP ENDPOINTS ###
 
+[http.middlewares.auth]
+credential_chain = ["publicshares", "basic", "bearer"]
+token_strategy_chain = ["bearer", "header"]
+
+[http.middlewares.auth.credentials_by_user_agent]
+"mirall" = "basic"
+
 [http.services.appprovider]
 address = ":443"
 insecure = true

diff --git a/examples/cernbox/keycloak/cernbox.json b/examples/cernbox/keycloak/cernbox.json
@@ -636,7 +636,9 @@
       "redirectUris": [
         "/realms/cernbox/account/*"
       ],
-      "webOrigins": [],
+      "webOrigins": [
+        "*"
+      ],
       "notBefore": 0,
       "bearerOnly": false,
       "consentRequired": false,
@@ -680,7 +682,9 @@
       "redirectUris": [
         "/realms/cernbox/account/*"
       ],
-      "webOrigins": [],
+      "webOrigins": [
+        "*"
+      ],
       "notBefore": 0,
       "bearerOnly": false,
       "consentRequired": false,
@@ -815,8 +819,7 @@
         "https://cernbox2.docker/*"
       ],
       "webOrigins": [
-        "https://cernbox1.docker/*",
-        "https://cernbox2.docker/*"
+        "*"
       ],
       "notBefore": 0,
       "bearerOnly": false,
@@ -903,7 +906,7 @@
         "/admin/cernbox/console/*"
       ],
       "webOrigins": [
-        "+"
+        "*"
       ],
       "notBefore": 0,
       "bearerOnly": false,

diff --git a/examples/cernbox/nginx/nginx.conf b/examples/cernbox/nginx/nginx.conf
@@ -139,7 +139,9 @@ http {
     }
 
     location ^~ /cernbox {
-      root /var/www/cernbox;
+      root /var/www;
+      add_header Cache-Control "no-cache";
+      add_header Access-Control-Allow-Origin "https://idp.docker:8443" always;
       etag off;
       gzip_static on;
     }
@@ -148,7 +150,7 @@ http {
       root /var/www/web;
       add_header Cache-Control "no-cache";
       add_header Access-Control-Allow-Origin "https://idp.docker:8443" always;
-      etag on;
+      etag off;
       gzip_static on;
       try_files $uri /index.html;
     }

diff --git a/tests/sciencemesh/scripts/stub.js b/tests/sciencemesh/scripts/stub.js
@@ -278,10 +278,10 @@ const server = https.createServer(HTTPS_OPTIONS, async (req, res) => {
         const config = {
           nextcloud1: "https://nextcloud1.docker/index.php/apps/sciencemesh/accept",
           owncloud1: "https://owncloud1.docker/index.php/apps/sciencemesh/accept",
-          cernbox1: "https://revacernbox1.docker/sciencemesh-app/invitations",
+          cernbox1: "https://cernbox1.docker/sciencemesh-app/invitations",
           nextcloud2: "https://nextcloud2.docker/index.php/apps/sciencemesh/accept",
           owncloud2: "https://owncloud2.docker/index.php/apps/sciencemesh/accept",
-          cernbox2: "https://revacernbox2.docker/sciencemesh-app/invitations",
+          cernbox2: "https://cernbox2.docker/sciencemesh-app/invitations",
           stub2: "https://stub.docker/ocm/invites/forward",
         };
         const items = [];