From 6915a60332445e36dc942865a374cbdb5043b518 Mon Sep 17 00:00:00 2001
From: "Helmut K. C. Tessarek" <tessarek@evermeet.cx>
Date: Fri, 9 Dec 2022 17:32:59 -0500
Subject: [PATCH 1/4] use black favicon for /admin

---
 src/api/web.rs                            |   1 +
 src/static/images/vaultwarden-favicon.png | Bin 0 -> 1615 bytes
 src/static/templates/404.hbs              |   2 +-
 src/static/templates/admin/base.hbs       |   2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 src/static/images/vaultwarden-favicon.png

diff --git a/src/api/web.rs b/src/api/web.rs
index a7640cd9..72bb66d0 100644
--- a/src/api/web.rs
+++ b/src/api/web.rs
@@ -101,6 +101,7 @@ pub fn static_files(filename: String) -> Result<(ContentType, &'static [u8]), Er
         "error-x.svg" => Ok((ContentType::SVG, include_bytes!("../static/images/error-x.svg"))),
         "hibp.png" => Ok((ContentType::PNG, include_bytes!("../static/images/hibp.png"))),
         "vaultwarden-icon.png" => Ok((ContentType::PNG, include_bytes!("../static/images/vaultwarden-icon.png"))),
+        "vaultwarden-favicon.png" => Ok((ContentType::PNG, include_bytes!("../static/images/vaultwarden-favicon.png"))),
         "bootstrap.css" => Ok((ContentType::CSS, include_bytes!("../static/scripts/bootstrap.css"))),
         "bootstrap-native.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/bootstrap-native.js"))),
         "jdenticon.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/jdenticon.js"))),
diff --git a/src/static/images/vaultwarden-favicon.png b/src/static/images/vaultwarden-favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb0e169a1e008dc0e41548c87a8b83c7fbdb6488
GIT binary patch
literal 1615
zcmV-V2C(^wP)<h;3K|Lk000e1NJLTq002M$002M;00000j{+_N000ISNkl<Zc-qC6
z1Dqqv8pZ!vhKreGH<RA5doO>uwr$(CZQHhO+qQl4W^LQ4`d-rAwb{B_J&dQm^vNmw
zt4<+{`SITrP+BDXQi~)IJlptQXa~VFpN*HATzO^v$N0~JrUe(!qGd4qPm{0VYniq`
zgZ-uj63|-9#C_fpc??b;v;*ug=nQyF<gI-sHi`@2pe8@SP5rl~0`%$)RM@Kj&G3WN
z=IcO9wO!<WRsiC(^abeKLL69u_eI*Pf9wgiebGB|dG!+7a``wd4hIb%eh^MwA@8(t
zN%eAe)QwmDy#u9=1?UDDH;2QgBA?=rb2EM;9IMnnIG9xvIi01;E#ykTu4{6u$gQlg
zD^PN1DKE|GBDGn6Cot=XJs)~+6Ozyc4t!}qZN#dab{eY;uMK?ZAipueChtA8=Ml61
zQb0>>Pk<O5qMZ4Y?{wtqu<A&^Z$F<!v;#4KJ!_)>ETBcnLoDych;;76c+sk^C?k(O
zcBCjDhRF`m2r+kg9%{7wg##t;;R4|Dt~4B2KR%@r7T*(PI|$}~$74_5B(O-1(?lC4
z%pVt%2O!2KrysjxRkS6bq#YnmHbsPv-5DX;USQ*(3lUOT;sEWUYzH;DoTZawAq9B6
zBG!B>c^41Am?gP1mrKodAR<-D6uInRdO$CZ)M7h0jW+1PA(v64Ow}HPI)6WWa0xAG
zR#wm9LL|!|(epk(g6<u`<vF!7=@u^e;D<V!O$T}(pnLBk-^u{85pa20)Vw`-1<%(V
zAm38#-5uCR&+FhVR>*Y&Mu|F#-q6b4bF3~LNiXVOM=2Qvbjz*4Tb2X4nO2V7m^(#Y
z!vpgCt7$>YAm5kAt0H%@@v*dWlW1!Y`@@?udK-qz2ojy3!UIhKB~Rf(rvxKpINOYo
zH=)0^kOn`tHB1({v0>qC9O%K;Gn>OWXD?d8;p~Qi8$~9=){hM~0!lsuN<1+8w{<yM
z<U>55%uk|>fhq;S<3o|7S?{;m4^RR=6XgqN8Gis3;;adK3=o-ECJH5PYYN;?1)`KE
ziVWBj)+A1a{p-X9UC=V^3^KUv@o7!8mTM?Lk~OCWeb6#<OS(gWYZ_Jc=^nVGIb)h%
zCfJ7uQRu^!I-vR+DuBz^2E-pJ0~NjrIM!FvC(poOkH*LC>m5in=4ejfXMIvo;A+u<
zz%7&@#ro6zhB@*oUWy&QmbqQH5|X&QW!~{_$`GY8F~E7sswAMy-KPE)E=hdHO#!^7
zz;6@*kB=J-O1{Jeiu~3T@B#s=3ob93VV}JlE#Po|;NS}K(86xB&7{1D+w6iF#C)0i
zLIEXD;zE6E9Mc%~2@YMs<%zlF`zYrb6b_=9#&jPp5N$1ezf-EQuq?o}oKGJ!jm?E*
zEne*-ndPKL^&A`@L{pQQThqfVq~=nN(|ixrm?-Gb!Z4B1L^}l_s!(7cS>k3X8<@5t
z?()*y*NpO!^mtL^4Ll#jQKFk;824eaan5Hr$N;PZBr_bU<T$bch=xsd5ShG<v%jG@
zl=wNc&>XoDV@P)hKs2SFDUstQ`Qw(>hQk?VphF}*-gzG{1ksdE$D!?yTiQNAH!6G`
zrkD`PR*pWFbO>T-;A<*$Yi_F6w%(Hsr-{-^DT8DJ5(dQjhgLFeLwZ`<x^=KrxXS!H
z-A9sSibw!r_;D2#`(Uw;w!S>4#<aipnbHB000D?vefD1a81)=|?W4^;Tw^5J8sKdS
zk%SOLc^hDBlEm!8)jr;%9SUrD`?g$VkOTwbRcw3vmJ~Wf?c?1F81Li8SaGBb;s_NY
z3E=XiD0KvbWaNs(Ou+b?h_fvFi>P&%nk6!THUMa2fXJ++)>R_=v#g0Ye;cxRZv4aW
zk%$~i79h*9BJwdjJpNfs$okuu_x>gTF*xA4QO{8VDDm9r=MVH7VUzbw%=`PGxzaKo
z9UNdCA^;KA2AmFf%dBLA=7L0BFGB|a=s?<Au&8Uo_N9%m9V2EO#E9o}3l_HRxS!6a
zAeB#(u;TtgT{x1-1-)=sSDt+r{K~WVm#)RX_AUO!bMdae|Nq<jzX7*j$~a>~D<S{@
N002ovPDHLkV1lQx0&M^Q

literal 0
HcmV?d00001

diff --git a/src/static/templates/404.hbs b/src/static/templates/404.hbs
index dc30b9e4..230c30ca 100644
--- a/src/static/templates/404.hbs
+++ b/src/static/templates/404.hbs
@@ -4,7 +4,7 @@
     <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="{{urlpath}}/vw_static/vaultwarden-favicon.png">
     <title>Page not found!</title>
     <link rel="stylesheet" href="{{urlpath}}/vw_static/bootstrap.css" />
     <style>
diff --git a/src/static/templates/admin/base.hbs b/src/static/templates/admin/base.hbs
index 8b5e891b..b9ccbfae 100644
--- a/src/static/templates/admin/base.hbs
+++ b/src/static/templates/admin/base.hbs
@@ -4,7 +4,7 @@
     <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="{{urlpath}}/vw_static/vaultwarden-favicon.png">
     <title>Vaultwarden Admin Panel</title>
     <link rel="stylesheet" href="{{urlpath}}/vw_static/bootstrap.css" />
     <style>

From 213909baa579a697590e8080994e3dff3ce29152 Mon Sep 17 00:00:00 2001
From: "Helmut K. C. Tessarek" <tessarek@evermeet.cx>
Date: Fri, 9 Dec 2022 19:06:31 -0500
Subject: [PATCH 2/4] use 32x32 favicon for consistency

---
 src/static/images/vaultwarden-favicon.png | Bin 1615 -> 886 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/static/images/vaultwarden-favicon.png b/src/static/images/vaultwarden-favicon.png
index bb0e169a1e008dc0e41548c87a8b83c7fbdb6488..15b499e8c0b98e39bd821adeeb4e792e04224c47 100644
GIT binary patch
literal 886
zcmV-+1Bv{JP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0009$Nkl<Zc-oYe
zQ?xZl6omJg^V_y<TNkly+qP}vIj^y8+qRvVYx7I3o}O8Axss}v-nFYOOTcK3;dw$@
z=myG0yvXs4wJZqOidShQgF5~IJ{RE+MOn!C2HO%?400UAKiN*+CE`ie@eEsw&#3ey
zk<{$qBpl(JU@QK{qd|HFn<!>8jG^=vhhl6dZc-+qA=||E@!Ve_#RshCC`MwAc`g+5
zJ{rl<td}E$HyLjnn>6|tuW~;FoH<}TTQi%>#o27FC~*1!IbN01qlr_D=kR!$k&JN0
zAzaQ^H1ax2#Mfz5bcLHrAje2KQ@mz`@!UV;{&eW0_?Q^qiZMQCY&w<u<@Up_Fq#1(
z*3*vw^SpufxGl{Ea;_)Bq1EDztLA8o983HfY%V2>TDI|PutYACyUK5>0lZ6r8~$|O
zWUVs}<t?&!pAk-9E5~#<jRM|H8z5veda_9TmP;_lOUdFYuU;aDd~$C_m^4twQxvk2
zpV^TMd7Gimx}I_pR8ru_^|l;4%DGa?Q`7+lf3n^s_hLRbQp4uXJdhVj@G67jl~ML4
z7RWi&b@691g{Pgc$?Z6@nB!R_I6qdDfhM^&xelLBrtk$@lgGG*7@so6*_ZhnR>Ddb
zk5R@!P9x9Oe9?IW4eW}EeR-UCeEm=?wV~4n(kYxqf;;??Iu3x7T{)2IA!j;;bP>gE
zsVBzwOm)g!{@`yGy7E-1G3w<szliBJZiX>|FViRGU}x#cgFH%aS3X#3j4$OhHcPh=
z2>sSwLxTJ0<&;A>3=?}vNpOwd(y-%Ep3T?9_=5%Uy%bGcAjLtB+3k;VdYQ!i3HgiP
zq@0Xpc(Rn=lnLdqc9$u0opbbJC2Ls9mpo5@%(K6uFQu+#r5w5Jb;gL=J}8TMna#M1
zO4eYWYp9g6nKFypKPZ*P3)v@a7&Ew?g&e?loP&9uqv!ysw<|lW?UVL~aRQB<J*pE~
zK;X*@6m{{ao^Fig_0FI5_8h59yJ!6!CYl-B5w-tVHWQ6u^c076^|6$)OY$=wLCOFA
z+R8YVeEPYvJ#W$UpFh_o-eqU<mIdQEh1aOy-w^_zfHiXo(C<(H05zNzaBnU1)&Kwi
M07*qoM6N<$g2tS)nE(I)

literal 1615
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
N002ovPDHLkV1lQx0&M^Q


From cec45ae9bdcdcd0c5f839aa8477885e6434e8519 Mon Sep 17 00:00:00 2001
From: BlackDex <black.dex@gmail.com>
Date: Thu, 8 Dec 2022 13:35:53 +0100
Subject: [PATCH 3/4] Increase privacy of masked config

This changes the masking function to hide a bit more information from
the generated support string. It will still keep showing the `://` for
example, and `,`, but other characters will be hidden.

Also did some small changes on some key's which all showed up as
`Internal` on the Settings page.

Fixes #2929
---
 src/config.rs | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index eb776bb9..edf5bbfe 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -232,14 +232,23 @@ macro_rules! make_config {
                 /// We map over the string and remove all alphanumeric, _ and - characters.
                 /// This is the fastest way (within micro-seconds) instead of using a regex (which takes mili-seconds)
                 fn _privacy_mask(value: &str) -> String {
-                    value.chars().map(|c|
-                        match c {
-                            c if c.is_alphanumeric() => '*',
-                            '_' => '*',
-                            '-' => '*',
-                            _ => c
-                        }
-                    ).collect::<String>()
+                    let mut n: u16 = 0;
+                    let mut colon_match = false;
+                    value
+                        .chars()
+                        .map(|c| {
+                            n += 1;
+                            match c {
+                                ':' if n <= 11 => {
+                                    colon_match = true;
+                                    c
+                                }
+                                '/' if n <= 13 && colon_match => c,
+                                ',' => c,
+                                _ => '*',
+                            }
+                        })
+                        .collect::<String>()
                 }
 
                 serde_json::Value::Object({
@@ -475,9 +484,9 @@ make_config! {
         /// service is set, an icon request to Vaultwarden will return an HTTP redirect to the
         /// corresponding icon at the external service.
         icon_service:           String, false,  def,    "internal".to_string();
-        /// Internal
+        /// _icon_service_url
         _icon_service_url:      String, false,  gen,    |c| generate_icon_service_url(&c.icon_service);
-        /// Internal
+        /// _icon_service_csp
         _icon_service_csp:      String, false,  gen,    |c| generate_icon_service_csp(&c.icon_service, &c._icon_service_url);
         /// Icon redirect code |> The HTTP status code to use for redirects to an external icon service.
         /// The supported codes are 301 (legacy permanent), 302 (legacy temporary), 307 (temporary), and 308 (permanent).
@@ -613,7 +622,7 @@ make_config! {
         helo_name:                     String, true,   option;
         /// Embed images as email attachments.
         smtp_embed_images:             bool, true, def, true;
-        /// Internal
+        /// _smtp_img_src
         _smtp_img_src:                 String, false, gen, |c| generate_smtp_img_src(c.smtp_embed_images, &c.domain);
         /// Enable SMTP debugging (Know the risks!) |> DANGEROUS: Enabling this will output very detailed SMTP messages. This could contain sensitive information like passwords and usernames! Only enable this during troubleshooting!
         smtp_debug:                    bool,   false,  def,     false;

From b093384385b1a78e7bce4b0ae2e54211f638cc3c Mon Sep 17 00:00:00 2001
From: "Helmut K. C. Tessarek" <tessarek@evermeet.cx>
Date: Fri, 9 Dec 2022 16:31:40 -0500
Subject: [PATCH 4/4] Improve comments

- The first one was not a proper sentence.
- The second one mixed passive and active form in the secon d part of the sentence.
---
 .env.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.template b/.env.template
index 22877f15..7ccdacd3 100644
--- a/.env.template
+++ b/.env.template
@@ -83,11 +83,11 @@
 
 ## Controls whether event logging is enabled for organizations
 ## This setting applies to organizations.
-## Default this is disabled. Also check the EVENT_CLEANUP_SCHEDULE and EVENTS_DAYS_RETAIN settings.
+## Disabled by default. Also check the EVENT_CLEANUP_SCHEDULE and EVENTS_DAYS_RETAIN settings.
 # ORG_EVENTS_ENABLED=false
 
 ## Number of days to retain events stored in the database.
-## If unset (the default), events are kept indefently and also disables the scheduled job!
+## If unset (the default), events are kept indefinitely and the scheduled job is disabled!
 # EVENTS_DAYS_RETAIN=
 
 ## Job scheduler settings