starred/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-12-10 01:10:09 +03:00
Code Issues 429 Packages Projects Releases 10 Wiki Activity

[PR #4903] [MERGED] Allow enforcing Single Org with pw reset policy #2696

New Issue
Closed
opened 2025-10-09 18:09:52 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2025-10-09 18:09:52 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/4903
Author: @BlackDex
Created: 8/28/2024
Status: ✅ Merged
Merged: 8/30/2024
Merged by: @dani-garcia

Base: main ← Head: enforce_single-org_with_pw-reset

📝 Commits (2)

  • 40be0a6 Allow enforcing Single Org with pw reset policy
  • 650da04 Removed some extra if checks

📊 Changes

3 files changed (+43 additions, -0 deletions)

View changed files

📝 .env.template (+6 -0)
📝 src/api/core/organizations.rs (+32 -0)
📝 src/config.rs (+5 -0)

📄 Description

Bitwarden only allows the Reset Password policy to be set when the Single Org policy is enabled already. This PR adds a check so that this can be enforced when a config option is enabled.

Since Vaultwarden encouraged to use multiple orgs when groups were not available yet we should not enable this by default now. This might be something to do in the future.

When enabled, it will prevent the Reset Password policy to be enabled if the Single Org policy is not enabled. It will also prevent the Single Org policy to be disabled if the Reset Password policy is enabled.

Fixes #4855

🔄 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/4903 **Author:** [@BlackDex](https://github.com/BlackDex) **Created:** 8/28/2024 **Status:** ✅ Merged **Merged:** 8/30/2024 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `enforce_single-org_with_pw-reset` --- ### 📝 Commits (2) - [`40be0a6`](https://github.com/dani-garcia/vaultwarden/commit/40be0a6427973cec58cbbc5688be8b7f33af78da) Allow enforcing Single Org with pw reset policy - [`650da04`](https://github.com/dani-garcia/vaultwarden/commit/650da0414d6c6966e260cf17fc0a65342deef61c) Removed some extra if checks ### 📊 Changes **3 files changed** (+43 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `.env.template` (+6 -0) 📝 `src/api/core/organizations.rs` (+32 -0) 📝 `src/config.rs` (+5 -0) </details> ### 📄 Description Bitwarden only allows the Reset Password policy to be set when the Single Org policy is enabled already. This PR adds a check so that this can be enforced when a config option is enabled. Since Vaultwarden encouraged to use multiple orgs when groups were not available yet we should not enable this by default now. This might be something to do in the future. When enabled, it will prevent the Reset Password policy to be enabled if the Single Org policy is not enabled. It will also prevent the Single Org policy to be disabled if the Reset Password policy is enabled. Fixes #4855 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2025-10-09 18:09:52 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
better for forum
bug
bug
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
troubleshooting
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/vaultwarden#2696
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?