Mirrors/Vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-10 13:02:41 +01:00
Code Issues Releases Activity

Fixed plain/text email format

Browse Source 
plain/text emails should not contain html elements like <p> <a> etc..
This triggers some spamfilters and increases the spam score.

Also added the github link into the text only emails since this also
triggers spamfilters to increase the score since the url/link count is
different between the multipart messages.
This commit is contained in:
BlackDex 2020-11-18 12:04:16 +01:00
parent 58a928547d
commit 3fed323385
13 changed files with 84 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/static/templates/email/change_email.hbs
View File

@ -1,6 +1,8 @@
Your Email Change Your Email Change
<!----------------> <!---------------->
<html> To finalize changing your email address enter the following code in web vault: {{token}}
<p>To finalize changing your email address enter the following code in web vault: <b>{{token}}</b></p>
<p>If you did not try to change an email address, you can safely ignore this email.</p> If you did not try to change an email address, you can safely ignore this email.
</html>
===
Github: https://github.com/dani-garcia/bitwarden_rs

18
src/static/templates/email/delete_account.hbs
View File

@ -1,12 +1,10 @@
Delete Your Account Delete Your Account
<!----------------> <!---------------->
<html> Click the link below to delete your account.
<p>
click the link below to delete your account. Delete Your Account: {{url}}/#/verify-recover-delete?userId={{user_id}}&token={{token}}&email={{email}}
<br>
<br> If you did not request this email to delete your account, you can safely ignore this email.
<a href="{{url}}/#/verify-recover-delete?userId={{user_id}}&token={{token}}&email={{email}}">
Delete Your Account</a> ===
</p> Github: https://github.com/dani-garcia/bitwarden_rs
<p>If you did not request this email to delete your account, you can safely ignore this email.</p>
</html>

11
src/static/templates/email/invite_accepted.hbs
View File

@ -1,8 +1,7 @@
Invitation to {{{org_name}}} accepted Invitation to {{{org_name}}} accepted
<!----------------> <!---------------->
<html> Your invitation for *{{email}}* to join *{{org_name}}* was accepted.
<p> Please log in via {{url}} to the bitwarden_rs server and confirm them from the organization management page.
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. ===
</p> Github: https://github.com/dani-garcia/bitwarden_rs
</html>

11
src/static/templates/email/invite_confirmed.hbs
View File

@ -1,8 +1,7 @@
Invitation to {{{org_name}}} confirmed Invitation to {{{org_name}}} confirmed
<!----------------> <!---------------->
<html> Your invitation to join *{{org_name}}* was confirmed.
<p> It will now appear under the Organizations the next time you log in to the web vault at {{url}}.
Your invitation to join <b>{{org_name}}</b> was confirmed.
It will now appear under the Organizations the next time you <a href="{{url}}/">log in</a> to the web vault. ===
</p> Github: https://github.com/dani-garcia/bitwarden_rs
</html>

18
src/static/templates/email/new_device_logged_in.hbs
View File

@ -1,14 +1,12 @@
New Device Logged In From {{{device}}} New Device Logged In From {{{device}}}
<!----------------> <!---------------->
<html> Your account was just logged into from a new device.
<p>
Your account was just logged into from a new device.
Date: {{datetime}} * Date: {{datetime}}
IP Address: {{ip}} * IP Address: {{ip}}
Device Type: {{device}} * Device Type: {{device}}
You can deauthorize all devices that have access to your account from the You can deauthorize all devices that have access to your account from the web vault ( {{url}} ) under Settings > My Account > Deauthorize Sessions.
<a href="{{url}}/">web vault</a> under Settings > My Account > Deauthorize Sessions.
</p> ===
</html> Github: https://github.com/dani-garcia/bitwarden_rs

5
src/static/templates/email/pw_hint_none.hbs
View File

@ -2,6 +2,9 @@ Your master password hint
<!----------------> <!---------------->
You (or someone) recently requested your master password hint. Unfortunately, your account does not have a master password hint. You (or someone) recently requested your master password hint. Unfortunately, your account does not have a master password hint.
If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to <a href="{{url}}/#/recover-delete">delete the account</a> so that you can register again and start over. All data associated with your account will be deleted. If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to delete the account ( {{url}}/#/recover-delete ) so that you can register again and start over. All data associated with your account will be deleted.
If you did not request your master password hint you can safely ignore this email. If you did not request your master password hint you can safely ignore this email.
===
Github: https://github.com/dani-garcia/bitwarden_rs

9
src/static/templates/email/pw_hint_some.hbs
View File

@ -2,9 +2,12 @@ Your master password hint
<!----------------> <!---------------->
You (or someone) recently requested your master password hint. You (or someone) recently requested your master password hint.
Your hint is: "{{hint}}" Your hint is: *{{hint}}*
Log in: <a href="{{url}}/">Web Vault</a> Log in to the web vault: {{url}}
If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to <a href="{{url}}/#/recover-delete">delete the account</a> so that you can register again and start over. All data associated with your account will be deleted. If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to delete the account ( {{url}}/#/recover-delete ) so that you can register again and start over. All data associated with your account will be deleted.
If you did not request your master password hint you can safely ignore this email. If you did not request your master password hint you can safely ignore this email.
===
Github: https://github.com/dani-garcia/bitwarden_rs

20
src/static/templates/email/send_org_invite.hbs
View File

@ -1,12 +1,12 @@
Join {{{org_name}}} Join {{{org_name}}}
<!----------------> <!---------------->
<html> You have been invited to join the *{{org_name}}* organization.
<p>
You have been invited to join the <b>{{org_name}}</b> organization.
<br> Click here to join: {{url}}/#/accept-organization/?organizationId={{org_id}}&organizationUserId={{org_user_id}}&email={{email}}&organizationName={{org_name}}&token={{token}}
<br>
<a href="{{url}}/#/accept-organization/?organizationId={{org_id}}&organizationUserId={{org_user_id}}&email={{email}}&organizationName={{org_name}}&token={{token}}">
Click here to join</a> If you do not wish to join this organization, you can safely ignore this email.
</p>
<p>If you do not wish to join this organization, you can safely ignore this email.</p> ===
</html> Github: https://github.com/dani-garcia/bitwarden_rs

12
src/static/templates/email/smtp_test.hbs
View File

@ -1,8 +1,8 @@
Bitwarden_rs SMTP Test Bitwarden_rs SMTP Test
<!----------------> <!---------------->
<html> This is a test email to verify the SMTP configuration for {{url}}.
<p>
This is a test email to verify the SMTP configuration for <a href="{{url}}">{{url}}</a>. When you can read this email it is probably configured correctly.
</p>
<p>When you can read this email it is probably configured correctly.</p> ===
</html> Github: https://github.com/dani-garcia/bitwarden_rs

11
src/static/templates/email/twofactor_email.hbs
View File

@ -1,9 +1,8 @@
Your Two-step Login Verification Code Your Two-step Login Verification Code
<!----------------> <!---------------->
<html> Your two-step verification code is: {{token}}
<p>
Your two-step verification code is: <b>{{token}}</b>
Use this code to complete logging in with Bitwarden. Use this code to complete logging in with Bitwarden.
</p>
</html> ===
Github: https://github.com/dani-garcia/bitwarden_rs

16
src/static/templates/email/verify_email.hbs
View File

@ -1,12 +1,10 @@
Verify Your Email Verify Your Email
<!----------------> <!---------------->
<html>
<p>
Verify this email address for your account by clicking the link below. Verify this email address for your account by clicking the link below.
<br>
<br> Verify Email Address Now: {{url}}/#/verify-email/?userId={{user_id}}&token={{token}}
<a href="{{url}}/#/verify-email/?userId={{user_id}}&token={{token}}">
Verify Email Address Now</a> If you did not request to verify your account, you can safely ignore this email.
</p>
<p>If you did not request to verify your account, you can safely ignore this email.</p> ===
</html> Github: https://github.com/dani-garcia/bitwarden_rs

12
src/static/templates/email/welcome.hbs
View File

@ -1,8 +1,8 @@
Welcome Welcome
<!----------------> <!---------------->
<html> Thank you for creating an account at {{url}}. You may now log in with your new account.
<p>
Thank you for creating an account at <a href="{{url}}/">{{url}}</a>. You may now log in with your new account. If you did not request to create an account, you can safely ignore this email.
</p>
<p>If you did not request to create an account, you can safely ignore this email.</p> ===
</html> Github: https://github.com/dani-garcia/bitwarden_rs

18
src/static/templates/email/welcome_must_verify.hbs
View File

@ -1,12 +1,10 @@
Welcome Welcome
<!----------------> <!---------------->
<html> Thank you for creating an account at {{url}}. Before you can login with your new account, you must verify this email address by clicking the link below.
<p>
Thank you for creating an account at <a href="{{url}}/">{{url}}</a>. Before you can login with your new account, you must verify this email address by clicking the link below. Verify Email Address Now: {{url}}/#/verify-email/?userId={{user_id}}&token={{token}}
<br>
<br> If you did not request to create an account, you can safely ignore this email.
<a href="{{url}}/#/verify-email/?userId={{user_id}}&token={{token}}">
Verify Email Address Now</a> ===
</p> Github: https://github.com/dani-garcia/bitwarden_rs
<p>If you did not request to create an account, you can safely ignore this email.</p>
</html>