[PR #6411] [MERGED] Improve protected actions #20605

New Issue

Closed

opened 2026-04-25 22:36:51 -05:00 by GiteaMirror · 0 comments

GiteaMirror commented 2026-04-25 22:36:51 -05:00

Owner

Copy Link

Copy Source

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/6411
Author: @dani-garcia
Created: 10/29/2025
Status: ✅ Merged
Merged: 10/29/2025
Merged by: @dani-garcia

Base: main ← Head: improve-protected-actions

---

📝 Commits (4)

• 0c7ab88 Improve protected actions
• 8de1915 Match usage on two factor
• 3cdb557 Use saturating add
• 8e01bca Don't delete token when tracking attempts

📊 Changes

2 files changed (+25 additions, -15 deletions)

View changed files

📝 src/api/core/two_factor/email.rs (+1 -1)
📝 src/api/core/two_factor/protected_actions.rs (+24 -14)

📄 Description

• Use saturating ops when counting the attempts
• Use #[serde(with = "ts_seconds")] to simplify parsing of DB data, and add functions to simplify time handling code.
• Rate limit email sending.
• Use email_attempts_limit rather than hardcoded limit

---

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/6411 **Author:** [@dani-garcia](https://github.com/dani-garcia) **Created:** 10/29/2025 **Status:** ✅ Merged **Merged:** 10/29/2025 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `improve-protected-actions` --- ### 📝 Commits (4) - [`0c7ab88`](https://github.com/dani-garcia/vaultwarden/commit/0c7ab88320014415458a7ed2b67bb75a8755cfbe) Improve protected actions - [`8de1915`](https://github.com/dani-garcia/vaultwarden/commit/8de1915e31d080a6e2a9bf1ff6532600cce758ce) Match usage on two factor - [`3cdb557`](https://github.com/dani-garcia/vaultwarden/commit/3cdb557455e13549eb61f18512a8a61b7fd5fb0a) Use saturating add - [`8e01bca`](https://github.com/dani-garcia/vaultwarden/commit/8e01bcac7c1a8db7de1bb334bc7d972a357d99d6) Don't delete token when tracking attempts ### 📊 Changes **2 files changed** (+25 additions, -15 deletions) <details> <summary>View changed files</summary> 📝 `src/api/core/two_factor/email.rs` (+1 -1) 📝 `src/api/core/two_factor/protected_actions.rs` (+24 -14) </details> ### 📄 Description - Use saturating ops when counting the attempts - Use `#[serde(with = "ts_seconds")]` to simplify parsing of DB data, and add functions to simplify time handling code. - Rate limit email sending. - Use `email_attempts_limit` rather than hardcoded limit --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

GiteaMirror added the pull-request label 2026-04-25 22:36:51 -05:00

GiteaMirror closed this issue 2026-04-25 22:36:52 -05:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

v2-registration

revert-7033-patch-1

cached-config-operations

test_dylint

1.37.2

1.37.1

1.37.0

1.36.0

1.35.8

1.35.7

1.35.6

1.35.5

1.35.4

1.35.3

1.35.2

1.35.1

1.35.0

1.34.3

1.34.2

1.34.1

1.34.0

1.33.2

1.33.1

1.33.0

1.32.7

1.32.6

1.32.5

1.32.4

1.32.3

1.32.2

1.32.1

1.32.0

1.31.0

1.30.5

1.30.4

1.30.3

1.30.2

1.30.1

1.30.0

1.29.2

1.29.1

1.29.0

1.28.1

1.28.0

1.27.0

1.26.0

1.25.2

1.25.1

1.25.0

1.24.0

1.23.1

1.23.0

1.22.2

1.22.1

1.22.0

1.21.0

1.20.0

1.19.0

1.18.0

1.17.0

1.16.3

1.16.2

1.16.1

1.16.0

1.15.1

1.15.0

1.14.2

1.14.1

1.14

1.13.1

1.13.0

1.12.0

1.11.0

1.10.0

1.9.1

1.9.0

1.8.0

1.7.0

1.6.1

1.6.0

1.5.0

1.4.0

1.3.0

1.2.0

1.1.0

1.0.0

0.13.0

0.12.0

0.11.0

0.10.0

0.9.0

Labels

Clear labels

better for forum

bug

documentation

duplicate

enhancement

future Vault

good first issue

help wanted

low priority

notes

pull-request

Mirrored from GitHub Pull Request

question

SSO

Third party

troubleshooting

wontfix

No labels pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

GiteaMirror ninjasurge (Kaehlen Rog)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#20605