From 7e8aee072ec90deeb70ca91fe0f0abaabec24882 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Tue, 5 Nov 2024 06:37:03 -0600 Subject: [PATCH] r/bitwarden_rs: Redirect to canonical host name Bitwarden has not worked correctly for clients using the non-canonical domain name (i.e. _bitwarden.pyrocufflink.blue_) for quite some time. This still trips me up occasionally, though, so hopefully adding a server-side redirect will help. Eventually, I'll probably remove the non-canonical name entirely. --- group_vars/bitwarden_rs.yml | 2 +- roles/bitwarden_rs/defaults/main.yml | 1 + roles/bitwarden_rs/templates/bitwarden.httpd.conf.j2 | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 roles/bitwarden_rs/defaults/main.yml diff --git a/group_vars/bitwarden_rs.yml b/group_vars/bitwarden_rs.yml index b797b3e..f410513 100644 --- a/group_vars/bitwarden_rs.yml +++ b/group_vars/bitwarden_rs.yml @@ -1,4 +1,4 @@ -bitwarden_domain: https://bitwarden.pyrocufflink.net +bitwarden_host: bitwarden.pyrocufflink.net burp_backup_script_pre: /etc/burp/backup-pre.sh burp_backup: - include: /var/lib/vaultwarden/data diff --git a/roles/bitwarden_rs/defaults/main.yml b/roles/bitwarden_rs/defaults/main.yml new file mode 100644 index 0000000..be4c7f4 --- /dev/null +++ b/roles/bitwarden_rs/defaults/main.yml @@ -0,0 +1 @@ +bitwarden_domain: https://{{ bitwarden_host }} diff --git a/roles/bitwarden_rs/templates/bitwarden.httpd.conf.j2 b/roles/bitwarden_rs/templates/bitwarden.httpd.conf.j2 index d19ff4d..bbe92dd 100644 --- a/roles/bitwarden_rs/templates/bitwarden.httpd.conf.j2 +++ b/roles/bitwarden_rs/templates/bitwarden.httpd.conf.j2 @@ -16,6 +16,10 @@ Header always set \ Strict-Transport-Security "max-age=63072000; includeSubDomains" RewriteEngine On +{% if bitwarden_host is defined %} +RewriteCond %{SERVER_NAME} !{{ bitwarden_host }} +RewriteRule /.* https://{{ bitwarden_host }}$0 +{% endif %} RewriteCond %{HTTP:Upgrade} =websocket [NC] RewriteRule /notifications/hub(.*) ws://localhost:3012/$1 [QSA,P,L]