From 3cd3bcc89babc6f550a481b459a16d4666a7e911 Mon Sep 17 00:00:00 2001
From: GeekCorner <45696571+GeekCornerGH@users.noreply.github.com>
Date: Sun, 28 Aug 2022 12:01:44 +0200
Subject: [PATCH] fix: Permit admin page on subpaths

---
 src/static/templates/admin/base.hbs          | 22 ++++++++++----------
 src/static/templates/admin/diagnostics.hbs   |  2 +-
 src/static/templates/admin/organizations.hbs |  8 +++----
 src/static/templates/admin/settings.hbs      |  8 +++----
 src/static/templates/admin/users.hbs         | 22 ++++++++++----------
 5 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/static/templates/admin/base.hbs b/src/static/templates/admin/base.hbs
index d385cdcd..3900b805 100644
--- a/src/static/templates/admin/base.hbs
+++ b/src/static/templates/admin/base.hbs
@@ -4,9 +4,9 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <meta name="robots" content="noindex,nofollow" />
-    <link rel="icon" type="image/png" href="{{urlpath}}/vw_static/vaultwarden-icon.png">
+    <link rel="icon" type="image/png" href="../vw_static/vaultwarden-icon.png">
     <title>Vaultwarden Admin Panel</title>
-    <link rel="stylesheet" href="{{urlpath}}/vw_static/bootstrap.css" />
+    <link rel="stylesheet" href="../vw_static/bootstrap.css" />
     <style>
         body {
             padding-top: 75px;
@@ -21,7 +21,7 @@
             margin: -5px 0 0 0;
         }
     </style>
-    <script src="{{urlpath}}/vw_static/identicon.js"></script>
+    <script src="/vw_static/identicon.js"></script>
     <script>
         'use strict';
 
@@ -85,7 +85,7 @@
 <body class="bg-light">
     <nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4 shadow fixed-top">
         <div class="container-xl">
-            <a class="navbar-brand" href="{{urlpath}}/admin"><img class="vaultwarden-icon" src="{{urlpath}}/vw_static/vaultwarden-icon.png" alt="V">aultwarden Admin</a>
+            <a class="navbar-brand" href="../admin"><img class="vaultwarden-icon" src="../vw_static/vaultwarden-icon.png" alt="V">aultwarden Admin</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
                     aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
@@ -94,25 +94,25 @@
                 <ul class="navbar-nav me-auto">
                 {{#if logged_in}}
                     <li class="nav-item">
-                        <a class="nav-link" href="{{urlpath}}/admin">Settings</a>
+                        <a class="nav-link" href="../admin">Settings</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="{{urlpath}}/admin/users/overview">Users</a>
+                        <a class="nav-link" href="../admin/users/overview">Users</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="{{urlpath}}/admin/organizations/overview">Organizations</a>
+                        <a class="nav-link" href="../admin/organizations/overview">Organizations</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="{{urlpath}}/admin/diagnostics">Diagnostics</a>
+                        <a class="nav-link" href="../admin/diagnostics">Diagnostics</a>
                     </li>
                 {{/if}}
                     <li class="nav-item">
-                        <a class="nav-link" href="{{urlpath}}/" target="_blank" rel="noreferrer">Vault</a>
+                        <a class="nav-link" href="../" target="_blank" rel="noreferrer">Vault</a>
                     </li>
                 </ul>
 
                 {{#if logged_in}}
-                    <a class="btn btn-sm btn-secondary" href="{{urlpath}}/admin/logout">Log Out</a>
+                    <a class="btn btn-sm btn-secondary" href="../admin/logout">Log Out</a>
                 {{/if}}
             </div>
         </div>
@@ -135,6 +135,6 @@
             }
         })();
     </script>
-    <script src="{{urlpath}}/vw_static/bootstrap-native.js"></script>
+    <script src="../vw_static/bootstrap-native.js"></script>
 </body>
 </html>
diff --git a/src/static/templates/admin/diagnostics.hbs b/src/static/templates/admin/diagnostics.hbs
index 6fd08f4a..0acd7b8e 100644
--- a/src/static/templates/admin/diagnostics.hbs
+++ b/src/static/templates/admin/diagnostics.hbs
@@ -352,7 +352,7 @@
         supportString += "* Reverse proxy and version: \n";
         supportString += "* Other relevant information: \n";
 
-        let jsonResponse = await fetch('{{urlpath}}/admin/diagnostics/config');
+        let jsonResponse = await fetch('../admin/diagnostics/config');
         const configJson = await jsonResponse.json();
         supportString += "\n### Config (Generated via diagnostics page)\n<details><summary>Show Running Config</summary>\n"
         supportString += "\n**Environment settings which are overridden:** {{page_data.overrides}}\n"
diff --git a/src/static/templates/admin/organizations.hbs b/src/static/templates/admin/organizations.hbs
index ac3c0f30..24245624 100644
--- a/src/static/templates/admin/organizations.hbs
+++ b/src/static/templates/admin/organizations.hbs
@@ -48,9 +48,9 @@
     </div>
 </main>
 
-<link rel="stylesheet" href="{{urlpath}}/vw_static/datatables.css" />
-<script src="{{urlpath}}/vw_static/jquery-3.6.0.slim.js"></script>
-<script src="{{urlpath}}/vw_static/datatables.js"></script>
+<link rel="stylesheet" href="../vw_static/datatables.css" />
+<script src="../vw_static/jquery-3.6.0.slim.js"></script>
+<script src="../vw_static/datatables.js"></script>
 <script>
     'use strict';
 
@@ -61,7 +61,7 @@
             var input_org_uuid = prompt("To delete the organization '" + name + " (" + billing_email +")', please type the organization uuid below.")
             if (input_org_uuid != null) {
                 if (input_org_uuid == id) {
-                    _post("{{urlpath}}/admin/organizations/" + id + "/delete",
+                    _post("../admin/organizations/" + id + "/delete",
                         "Organization deleted correctly",
                         "Error deleting organization");
                 } else {
diff --git a/src/static/templates/admin/settings.hbs b/src/static/templates/admin/settings.hbs
index 454891ce..126eacca 100644
--- a/src/static/templates/admin/settings.hbs
+++ b/src/static/templates/admin/settings.hbs
@@ -160,7 +160,7 @@
         }
 
         const data = JSON.stringify({ "email": test_email.value });
-        _post("{{urlpath}}/admin/test/smtp/",
+        _post("..
             "SMTP Test email sent correctly",
             "Error sending SMTP test email", data, false);
         return false;
@@ -183,7 +183,7 @@
     }
     function saveConfig() {
         const data = JSON.stringify(getFormData());
-        _post("{{urlpath}}/admin/config/", "Config saved correctly",
+        _post("..nfig/", "Config saved correctly",
             "Error saving config", data);
         return false;
     }
@@ -191,7 +191,7 @@
         var input = prompt("This will remove all user configurations, and restore the defaults and the " +
             "values set by the environment. This operation could be dangerous. Type 'DELETE' to proceed:");
         if (input === "DELETE") {
-            _post("{{urlpath}}/admin/config/delete",
+            _post("../admin/config/delete",
                 "Config deleted correctly",
                 "Error deleting config");
         } else {
@@ -201,7 +201,7 @@
         return false;
     }
     function backupDatabase() {
-        _post("{{urlpath}}/admin/config/backup_db",
+        _post("../admin/config/backup_db",
             "Backup created successfully",
             "Error creating backup", null, false);
         return false;
diff --git a/src/static/templates/admin/users.hbs b/src/static/templates/admin/users.hbs
index deb7f7c0..5695af66 100644
--- a/src/static/templates/admin/users.hbs
+++ b/src/static/templates/admin/users.hbs
@@ -135,9 +135,9 @@
     </div>
 </main>
 
-<link rel="stylesheet" href="{{urlpath}}/vw_static/datatables.css" />
-<script src="{{urlpath}}/vw_static/jquery-3.6.0.slim.js"></script>
-<script src="{{urlpath}}/vw_static/datatables.js"></script>
+<link rel="stylesheet" href="..les.css" />
+<script src="..3.6.0.slim.js"></script>
+<script src="../vw_static/datatables.js"></script>
 <script>
     'use strict';
 
@@ -145,7 +145,7 @@
         var input_mail = prompt("To delete user '" + mail + "', please type the email below")
         if (input_mail != null) {
             if (input_mail == mail) {
-                _post("{{urlpath}}/admin/users/" + id + "/delete",
+                _post("../admin/users/" + id + "/delete",
                     "User deleted correctly",
                     "Error deleting user");
             } else {
@@ -155,13 +155,13 @@
         return false;
     }
     function remove2fa(id) {
-        _post("{{urlpath}}/admin/users/" + id + "/remove-2fa",
+        _post("..ers/" + id + "/remove-2fa",
             "2FA removed correctly",
             "Error removing 2FA");
         return false;
     }
     function deauthUser(id) {
-        _post("{{urlpath}}/admin/users/" + id + "/deauth",
+        _post("..ers/" + id + "/deauth",
             "Sessions deauthorized correctly",
             "Error deauthorizing sessions");
         return false;
@@ -169,7 +169,7 @@
     function disableUser(id, mail) {
         var confirmed = confirm("Are you sure you want to disable user '" + mail + "'? This will also deauthorize their sessions.")
         if (confirmed) {
-            _post("{{urlpath}}/admin/users/" + id + "/disable",
+            _post("../admin/users/" + id + "/disable",
                 "User disabled successfully",
                 "Error disabling user");
         }
@@ -178,14 +178,14 @@
     function enableUser(id, mail) {
         var confirmed = confirm("Are you sure you want to enable user '" + mail + "'?")
         if (confirmed) {
-            _post("{{urlpath}}/admin/users/" + id + "/enable",
+            _post("..ers/" + id + "/enable",
                 "User enabled successfully",
                 "Error enabling user");
         }
         return false;
     }
     function updateRevisions() {
-        _post("{{urlpath}}/admin/users/update_revision",
+        _post("../admin/users/update_revision",
             "Success, clients will sync next time they connect",
             "Error forcing clients to sync");
         return false;
@@ -194,7 +194,7 @@
         const inv = document.getElementById("email-invite");
         const data = JSON.stringify({ "email": inv.value });
         inv.value = "";
-        _post("{{urlpath}}/admin/invite/", "User invited correctly",
+        _post("../admin/invite/", "User invited correctly",
             "Error inviting user", data);
         return false;
     }
@@ -285,7 +285,7 @@
         let orgForm = document.getElementById("userOrgTypeForm");
         const data = JSON.stringify(Object.fromEntries(new FormData(orgForm).entries()));
 
-        _post("{{urlpath}}/admin/users/org_type",
+        _post("../admin/users/org_type",
             "Updated organization type of the user successfully",
             "Error updating organization type of the user", data);
         return false;
