[PR #6262] [MERGED] Fix sso_user dropped on User::save #21952

New Issue

Closed

opened 2026-04-30 08:18:28 -05:00 by GiteaMirror · 0 comments

GiteaMirror commented 2026-04-30 08:18:28 -05:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/6262
Author: @Timshel
Created: 9/1/2025
Status: ✅ Merged
Merged: 10/13/2025
Merged by: @BlackDex

Base: main ← Head: fix/association

---

📝 Commits (4)

• e4e5a40 Admin delete SSO association prompt
• 5cb8fee User.save don't use replace_into
• 113a5ca User.save use upsert with sqlite
• ba6176d User.save use upsert with mysql

📊 Changes

2 files changed (+11 additions, -18 deletions)

View changed files

📝 src/db/models/user.rs (+9 -16)
📝 src/static/scripts/admin_users.js (+2 -2)

📄 Description

Should fix https://github.com/dani-garcia/vaultwarden/issues/6179#issuecomment-3242088962 and https://github.com/dani-garcia/vaultwarden/issues/6253

The issue is that if there is no ForeignKeyViolation a User::save first delete the record with sqlite and mysql.

Since the sso_user table was added with ON UPDATE CASCADE ON DELETE CASCADE, the violation was not triggered and the entry was deleted.

I thought changing the save logic was better than changing the cascade logic since :

• Especially for users update is the happy path (as opposed to the violation being triggered in most cases).
• It does not prevent using cascade
• Less of a trap (it was missed during the review and testing, running with SSO_SIGNUPS_MATCH_EMAIL the association was just restored).

Made the change only for User but it probably would apply to most table.

---

_{🔄 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/6262 **Author:** [@Timshel](https://github.com/Timshel) **Created:** 9/1/2025 **Status:** ✅ Merged **Merged:** 10/13/2025 **Merged by:** [@BlackDex](https://github.com/BlackDex) **Base:** `main` ← **Head:** `fix/association` --- ### 📝 Commits (4) - [`e4e5a40`](https://github.com/dani-garcia/vaultwarden/commit/e4e5a400ba2014adfb8bf4bc48f6d98d57edd09e) Admin delete SSO association prompt - [`5cb8fee`](https://github.com/dani-garcia/vaultwarden/commit/5cb8fee0add8ee78440d13f9a3d28bfcdd89d6c5) User.save don't use replace_into - [`113a5ca`](https://github.com/dani-garcia/vaultwarden/commit/113a5cae9f45a2aa48af284838d54603f3cb58d3) User.save use upsert with sqlite - [`ba6176d`](https://github.com/dani-garcia/vaultwarden/commit/ba6176d36d40aa4174da6d39f6aea9aa9fd78909) User.save use upsert with mysql ### 📊 Changes **2 files changed** (+11 additions, -18 deletions) <details> <summary>View changed files</summary> 📝 `src/db/models/user.rs` (+9 -16) 📝 `src/static/scripts/admin_users.js` (+2 -2) </details> ### 📄 Description Should fix https://github.com/dani-garcia/vaultwarden/issues/6179#issuecomment-3242088962 and https://github.com/dani-garcia/vaultwarden/issues/6253 The issue is that if there is no `ForeignKeyViolation` a `User::save` first delete the record with `sqlite` and `mysql`. Since the `sso_user` table was added with `ON UPDATE CASCADE ON DELETE CASCADE`, the violation was not triggered and the entry was deleted. I thought changing the `save` logic was better than changing the cascade logic since : - Especially for users `update` is the happy path (as opposed to the violation being triggered in most cases). - It does not prevent using cascade - Less of a trap (it was missed during the review and testing, running with `SSO_SIGNUPS_MATCH_EMAIL` the association was just restored). Made the change only for `User` but it probably would apply to most table. --- _{🔄 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-30 08:18:28 -05:00

GiteaMirror closed this issue 2026-04-30 08:18:29 -05:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

revert-7033-patch-1

cached-config-operations

test_dylint

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 Label pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

GiteaMirror ninjasurge

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#21952