Add backend support for alternate base dir (subdir/subpath) hosting #868

jjlin · 2020-02-19T05:37:43Z

To use this, include a path in the DOMAIN URL, e.g.:

DOMAIN=https://example.com/custom-path
DOMAIN=https://example.com/multiple/levels/are/ok

Resolves #241, #488, #528, #767, and maybe others when combined with
dani-garcia/bw_web_builds#11 (web vault support).

To use this, include a path in the `DOMAIN` URL, e.g.: * `DOMAIN=https://example.com/custom-path` * `DOMAIN=https://example.com/multiple/levels/are/ok`

jjlin · 2020-02-19T05:58:27Z

BTW, this is my first time writing any code in Rust, so feel free to let me know if I'm doing anything weird. I'll also comment on a few specific changes a bit later.

jjlin · 2020-02-19T07:25:42Z

src/static/templates/admin/base.hbs

@@ -6,10 +6,10 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>Bitwarden_rs Admin Panel</title>

-    <link rel="stylesheet" href="/bwrs_static/bootstrap.css" />


These paths all need to be relative to work with a different base dir.

I've changed it to instead use an absolute path with the domain_path variable to avoid the / at the end issue that you mention for the emails

jjlin · 2020-02-19T07:29:14Z

src/static/templates/email/invite_accepted.hbs

@@ -3,6 +3,6 @@ Invitation accepted
 <html>
 <p>
    Your invitation for <b>{{email}}</b> to join <b>{{org_name}}</b> was accepted.
-    Please <a href="{{url}}">log in</a> to the bitwarden_rs server and confirm them from the organization management page.
+    Please <a href="{{url}}/">log in</a> to the bitwarden_rs server and confirm them from the organization management page.


I added a / after all bare {{url}} links because, for reasons I don't quite understand, if the base URL is https://example.com/my/path, then visiting the web vault at https://example.com/my/path results in rendering issues, while https://example.com/my/path/ (with trailing /) works fine.

jjlin · 2020-02-19T07:30:36Z

src/config.rs

@@ -240,6 +242,10 @@ make_config! {
        domain:                 String, true,   def,    "http://localhost".to_string();
        /// Domain Set |> Indicates if the domain is set by the admin. Otherwise the default will be used.
        domain_set:             bool,   false,  def,    false;


It seems like domain_set could be made auto as well, but maybe there's some subtlety I'm missing, so I left it as is.

Yeah, domain_set is a bit special cased here:
https://github.com/dani-garcia/bitwarden_rs/blob/0a3008e7538c1a29b8b5a6439004e89465fce391/src/config.rs#L107-L111

jjlin · 2020-02-19T07:34:23Z

src/auth.rs

-    pub static ref JWT_DELETE_ISSUER: String = format!("{}|delete", CONFIG.domain());
-    pub static ref JWT_VERIFYEMAIL_ISSUER: String = format!("{}|verifyemail", CONFIG.domain());
-    pub static ref JWT_ADMIN_ISSUER: String = format!("{}|admin", CONFIG.domain());
+    pub static ref JWT_LOGIN_ISSUER: String = format!("{}|login", CONFIG.domain_origin());


I changed this to domain_origin() instead of domain() to avoid JWT encode/decode issues in case the installation is moved to a different base dir. Note that in the usual case where the backend is hosted at the root of the domain, domain_origin() and domain() should be identical.

jjlin · 2020-02-19T08:57:33Z

I've also added docs on the wiki: Using an alternate base dir

dani-garcia

Okay I've pushed a change to use the fixed web vault so when this is merged we get a working image in one docker build.

I've also used absolute paths in the admin page to solve the / issues, the emails and web vault are fine as it is.

Thanks for your work, @jjlin!

dani-garcia · 2020-02-22T16:28:10Z

src/config.rs

@@ -240,6 +242,10 @@ make_config! {
        domain:                 String, true,   def,    "http://localhost".to_string();
        /// Domain Set |> Indicates if the domain is set by the admin. Otherwise the default will be used.
        domain_set:             bool,   false,  def,    false;


Yeah, domain_set is a bit special cased here:
https://github.com/dani-garcia/bitwarden_rs/blob/0a3008e7538c1a29b8b5a6439004e89465fce391/src/config.rs#L107-L111

dani-garcia · 2020-02-22T16:51:55Z

src/static/templates/admin/base.hbs

@@ -6,10 +6,10 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>Bitwarden_rs Admin Panel</title>

-    <link rel="stylesheet" href="/bwrs_static/bootstrap.css" />


I've changed it to instead use an absolute path with the domain_path variable to avoid the / at the end issue that you mention for the emails

jjlin · 2020-02-22T17:47:31Z

src/static/templates/admin/page.hbs

@@ -1,6 +1,6 @@
 <main class="container">
    <div id="users-block" class="my-3 p-3 bg-white rounded shadow">
-        <h6 class="border-bottom pb-2 mb-0">Registered Users</h6>
+        <h6 class="border-bottom pb-2 mb-0">Registered Users {{urlpath}}</h6>


Was it intentional for this {{urlpath}} to be here?

Oops, no that was me checking that the urlpath was set to the correct value, forgot to remove it!

Add backend support for alternate base dir (subdir/subpath) hosting

Add backend support for alternate base dir (subdir/subpath) hosting

29a0795

To use this, include a path in the `DOMAIN` URL, e.g.: * `DOMAIN=https://example.com/custom-path` * `DOMAIN=https://example.com/multiple/levels/are/ok`

jjlin requested a review from dani-garcia February 19, 2020 05:54

jjlin commented Feb 19, 2020

View reviewed changes

This was referenced Feb 19, 2020

Unable to run bitwarden_rs with nginx and basic auth #857

Closed

Add web vault support for alternate base dir (subdir/subpath) hosting dani-garcia/bw_web_builds#11

Merged

dani-garcia added 2 commits February 22, 2020 16:00

Update web vault used in docker

0a3008e

Use absolute paths in the admin page

2f4a986

dani-garcia approved these changes Feb 22, 2020

View reviewed changes

jjlin commented Feb 22, 2020

View reviewed changes

Removed test urlpath

ad9f2b2

dani-garcia merged commit 8a5450e into dani-garcia:master Feb 22, 2020

jjlin deleted the alt-base branch February 23, 2020 04:10

thelittlefireman pushed a commit to thelittlefireman/bitwarden_rs that referenced this pull request Mar 19, 2021

Merge pull request dani-garcia#868 from jjlin/alt-base

103c34a

Add backend support for alternate base dir (subdir/subpath) hosting

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add backend support for alternate base dir (subdir/subpath) hosting #868

Add backend support for alternate base dir (subdir/subpath) hosting #868

jjlin commented Feb 19, 2020 •

edited

Loading

jjlin commented Feb 19, 2020

jjlin Feb 19, 2020

dani-garcia Feb 22, 2020

jjlin Feb 19, 2020

jjlin Feb 19, 2020

dani-garcia Feb 22, 2020

jjlin Feb 19, 2020

jjlin commented Feb 19, 2020

dani-garcia left a comment

dani-garcia Feb 22, 2020

dani-garcia Feb 22, 2020

jjlin Feb 22, 2020

dani-garcia Feb 22, 2020

Add backend support for alternate base dir (subdir/subpath) hosting #868

Add backend support for alternate base dir (subdir/subpath) hosting #868

Conversation

jjlin commented Feb 19, 2020 • edited Loading

jjlin commented Feb 19, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jjlin commented Feb 19, 2020

dani-garcia left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jjlin commented Feb 19, 2020 •

edited

Loading