Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issue with adding ciphers to organizations on native ios app #4800

Merged
merged 2 commits into from
Jul 30, 2024

Conversation

stefan0xC
Copy link
Contributor

@stefan0xC stefan0xC commented Jul 30, 2024

This should fix the issues reported in #4767 where an entry added via the native iOS app cannot be decrypted:
Screenshot 2024-07-30 at 08-46-28 353277473-652ee101-fd1e-4a6d-af6a-510dd90f4994 mp4

The problem seems to be that the iOS app sends an organizationID which serde fails to deseralize and because it's an optional argument adding the cipher will not fail but it will be added incorrectly to your personal vault, unless you have disabled personal ownerships. So to prevent such corruptions from occurring again I've added a reverse sanity check, just in case some other clients send the organization_id in an unrecognizable format.

Copy link
Collaborator

@BlackDex BlackDex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dani-garcia dani-garcia merged commit 7c8ba0c into dani-garcia:main Jul 30, 2024
5 checks passed
@stefan0xC stefan0xC deleted the fix-ios-issue branch July 31, 2024 10:47
truecharts-admin referenced this pull request in truecharts/public Aug 12, 2024
…1.32.0@71668d2 by renovate (#25023)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
|
[docker.io/vaultwarden/server](https://togithub.com/dani-garcia/vaultwarden)
| minor | `1.31.0` -> `1.32.0` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>dani-garcia/vaultwarden
(docker.io/vaultwarden/server)</summary>

###
[`v1.32.0`](https://togithub.com/dani-garcia/vaultwarden/releases/tag/1.32.0)

[Compare
Source](https://togithub.com/dani-garcia/vaultwarden/compare/1.31.0...1.32.0)

#### Security Fixes

This release has several CVE Reports fixed and we recommend everybody to
update to the latest version as soon as possible.

-
[CVE-2024-39924](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39924)
Fixed via
[#&#8203;4715](https://togithub.com/dani-garcia/vaultwarden/issues/4715)
-
[CVE-2024-39925](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39925)
Fixed via
[#&#8203;4837](https://togithub.com/dani-garcia/vaultwarden/issues/4837)
-
[CVE-2024-39926](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39926)
Fixed via
[#&#8203;4737](https://togithub.com/dani-garcia/vaultwarden/issues/4737)

#### Other changes

-   Updated web-vault to v2024.6.2
- Fixed issues with password reset enrollment by rolling back a
web-vault commit

#### What's Changed

- use a custom plan of enterprise tier to fix limits by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4726](https://togithub.com/dani-garcia/vaultwarden/pull/4726)
- chore: Dockerfile to Remove port 3012 by
[@&#8203;calvin-li-developer](https://togithub.com/calvin-li-developer)
in
[https://github.com/dani-garcia/vaultwarden/pull/4725](https://togithub.com/dani-garcia/vaultwarden/pull/4725)
- Fix bug where secureNotes is empty by
[@&#8203;cobyge](https://togithub.com/cobyge) in
[https://github.com/dani-garcia/vaultwarden/pull/4730](https://togithub.com/dani-garcia/vaultwarden/pull/4730)
- Improved HTTP client by
[@&#8203;dani-garcia](https://togithub.com/dani-garcia) in
[https://github.com/dani-garcia/vaultwarden/pull/4740](https://togithub.com/dani-garcia/vaultwarden/pull/4740)
- Update admin interface by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4737](https://togithub.com/dani-garcia/vaultwarden/pull/4737)
- Fix for RSA Keys which are read only by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4744](https://togithub.com/dani-garcia/vaultwarden/pull/4744)
- Fix Email 2FA login on native app by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4762](https://togithub.com/dani-garcia/vaultwarden/pull/4762)
- Update crates & fix crate vulnerability by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4771](https://togithub.com/dani-garcia/vaultwarden/pull/4771)
- Fix Dockerfile linter warnings by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4763](https://togithub.com/dani-garcia/vaultwarden/pull/4763)
- allow re-invitations of existing users by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4768](https://togithub.com/dani-garcia/vaultwarden/pull/4768)
- Allow to override log level for specific target by
[@&#8203;Timshel](https://togithub.com/Timshel) in
[https://github.com/dani-garcia/vaultwarden/pull/4305](https://togithub.com/dani-garcia/vaultwarden/pull/4305)
- Add support for MFA with Duo's Universal Prompt by
[@&#8203;0x0fbc](https://togithub.com/0x0fbc) in
[https://github.com/dani-garcia/vaultwarden/pull/4637](https://togithub.com/dani-garcia/vaultwarden/pull/4637)
- Allow to increase the note size to 100\_000 by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4772](https://togithub.com/dani-garcia/vaultwarden/pull/4772)
- Update Rust, Crates and GHA by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4783](https://togithub.com/dani-garcia/vaultwarden/pull/4783)
- Duo: use the formatted db email by
[@&#8203;Timshel](https://togithub.com/Timshel) in
[https://github.com/dani-garcia/vaultwarden/pull/4779](https://togithub.com/dani-garcia/vaultwarden/pull/4779)
- Update rust-toolchain.toml to 1.80.0 by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4784](https://togithub.com/dani-garcia/vaultwarden/pull/4784)
- fix issue with adding ciphers to organizations on native ios app by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4800](https://togithub.com/dani-garcia/vaultwarden/pull/4800)
- Rewrite the Push Notifications section in the configuration template
by [@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4805](https://togithub.com/dani-garcia/vaultwarden/pull/4805)
- Secure send file uploads by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4810](https://togithub.com/dani-garcia/vaultwarden/pull/4810)
- make access_all optional by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4812](https://togithub.com/dani-garcia/vaultwarden/pull/4812)
- Remove lowercase conversion for featureStates by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4820](https://togithub.com/dani-garcia/vaultwarden/pull/4820)
- Fix mail::send_incomplete\_2fa_login panic issue by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4792](https://togithub.com/dani-garcia/vaultwarden/pull/4792)
- Update crates, web-vault and fixes by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4823](https://togithub.com/dani-garcia/vaultwarden/pull/4823)
- Updated web-vault to v2024.6.2b by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4826](https://togithub.com/dani-garcia/vaultwarden/pull/4826)
- Update Rust to 1.80.1 by [@&#8203;dfunkt](https://togithub.com/dfunkt)
in
[https://github.com/dani-garcia/vaultwarden/pull/4831](https://togithub.com/dani-garcia/vaultwarden/pull/4831)
- Fix data disclosure on organization endpoints by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4837](https://togithub.com/dani-garcia/vaultwarden/pull/4837)

#### New Contributors

- [@&#8203;cobyge](https://togithub.com/cobyge) made their first
contribution in
[https://github.com/dani-garcia/vaultwarden/pull/4730](https://togithub.com/dani-garcia/vaultwarden/pull/4730)
- [@&#8203;0x0fbc](https://togithub.com/0x0fbc) made their first
contribution in
[https://github.com/dani-garcia/vaultwarden/pull/4637](https://togithub.com/dani-garcia/vaultwarden/pull/4637)

**Full Changelog**:
dani-garcia/vaultwarden@1.31.0...1.32.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNS4wIiwidXBkYXRlZEluVmVyIjoiMzguMjUuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJhdXRvbWVyZ2UiLCJ1cGRhdGUvZG9ja2VyL2dlbmVyYWwvbm9uLW1ham9yIl19-->
renovate bot referenced this pull request in NorkzYT/Wolflith Aug 15, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [vaultwarden/server](https://togithub.com/dani-garcia/vaultwarden) |
minor | `1.31.0` -> `1.32.0` |

---

### Release Notes

<details>
<summary>dani-garcia/vaultwarden (vaultwarden/server)</summary>

###
[`v1.32.0`](https://togithub.com/dani-garcia/vaultwarden/releases/tag/1.32.0)

[Compare
Source](https://togithub.com/dani-garcia/vaultwarden/compare/1.31.0...1.32.0)

#### Security Fixes

This release has several CVE Reports fixed and we recommend everybody to
update to the latest version as soon as possible.

-
[CVE-2024-39924](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39924)
Fixed via
[#&#8203;4715](https://togithub.com/dani-garcia/vaultwarden/issues/4715)
-
[CVE-2024-39925](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39925)
Fixed via
[#&#8203;4837](https://togithub.com/dani-garcia/vaultwarden/issues/4837)
-
[CVE-2024-39926](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39926)
Fixed via
[#&#8203;4737](https://togithub.com/dani-garcia/vaultwarden/issues/4737)

#### Other changes

-   Updated web-vault to v2024.6.2
- Fixed issues with password reset enrollment by rolling back a
web-vault commit

#### What's Changed

- use a custom plan of enterprise tier to fix limits by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4726](https://togithub.com/dani-garcia/vaultwarden/pull/4726)
- chore: Dockerfile to Remove port 3012 by
[@&#8203;calvin-li-developer](https://togithub.com/calvin-li-developer)
in
[https://github.com/dani-garcia/vaultwarden/pull/4725](https://togithub.com/dani-garcia/vaultwarden/pull/4725)
- Fix bug where secureNotes is empty by
[@&#8203;cobyge](https://togithub.com/cobyge) in
[https://github.com/dani-garcia/vaultwarden/pull/4730](https://togithub.com/dani-garcia/vaultwarden/pull/4730)
- Improved HTTP client by
[@&#8203;dani-garcia](https://togithub.com/dani-garcia) in
[https://github.com/dani-garcia/vaultwarden/pull/4740](https://togithub.com/dani-garcia/vaultwarden/pull/4740)
- Update admin interface by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4737](https://togithub.com/dani-garcia/vaultwarden/pull/4737)
- Fix for RSA Keys which are read only by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4744](https://togithub.com/dani-garcia/vaultwarden/pull/4744)
- Fix Email 2FA login on native app by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4762](https://togithub.com/dani-garcia/vaultwarden/pull/4762)
- Update crates & fix crate vulnerability by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4771](https://togithub.com/dani-garcia/vaultwarden/pull/4771)
- Fix Dockerfile linter warnings by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4763](https://togithub.com/dani-garcia/vaultwarden/pull/4763)
- allow re-invitations of existing users by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4768](https://togithub.com/dani-garcia/vaultwarden/pull/4768)
- Allow to override log level for specific target by
[@&#8203;Timshel](https://togithub.com/Timshel) in
[https://github.com/dani-garcia/vaultwarden/pull/4305](https://togithub.com/dani-garcia/vaultwarden/pull/4305)
- Add support for MFA with Duo's Universal Prompt by
[@&#8203;0x0fbc](https://togithub.com/0x0fbc) in
[https://github.com/dani-garcia/vaultwarden/pull/4637](https://togithub.com/dani-garcia/vaultwarden/pull/4637)
- Allow to increase the note size to 100\_000 by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4772](https://togithub.com/dani-garcia/vaultwarden/pull/4772)
- Update Rust, Crates and GHA by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4783](https://togithub.com/dani-garcia/vaultwarden/pull/4783)
- Duo: use the formatted db email by
[@&#8203;Timshel](https://togithub.com/Timshel) in
[https://github.com/dani-garcia/vaultwarden/pull/4779](https://togithub.com/dani-garcia/vaultwarden/pull/4779)
- Update rust-toolchain.toml to 1.80.0 by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4784](https://togithub.com/dani-garcia/vaultwarden/pull/4784)
- fix issue with adding ciphers to organizations on native ios app by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4800](https://togithub.com/dani-garcia/vaultwarden/pull/4800)
- Rewrite the Push Notifications section in the configuration template
by [@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4805](https://togithub.com/dani-garcia/vaultwarden/pull/4805)
- Secure send file uploads by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4810](https://togithub.com/dani-garcia/vaultwarden/pull/4810)
- make access_all optional by
[@&#8203;stefan0xC](https://togithub.com/stefan0xC) in
[https://github.com/dani-garcia/vaultwarden/pull/4812](https://togithub.com/dani-garcia/vaultwarden/pull/4812)
- Remove lowercase conversion for featureStates by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4820](https://togithub.com/dani-garcia/vaultwarden/pull/4820)
- Fix mail::send_incomplete\_2fa_login panic issue by
[@&#8203;dfunkt](https://togithub.com/dfunkt) in
[https://github.com/dani-garcia/vaultwarden/pull/4792](https://togithub.com/dani-garcia/vaultwarden/pull/4792)
- Update crates, web-vault and fixes by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4823](https://togithub.com/dani-garcia/vaultwarden/pull/4823)
- Updated web-vault to v2024.6.2b by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4826](https://togithub.com/dani-garcia/vaultwarden/pull/4826)
- Update Rust to 1.80.1 by [@&#8203;dfunkt](https://togithub.com/dfunkt)
in
[https://github.com/dani-garcia/vaultwarden/pull/4831](https://togithub.com/dani-garcia/vaultwarden/pull/4831)
- Fix data disclosure on organization endpoints by
[@&#8203;BlackDex](https://togithub.com/BlackDex) in
[https://github.com/dani-garcia/vaultwarden/pull/4837](https://togithub.com/dani-garcia/vaultwarden/pull/4837)

#### New Contributors

- [@&#8203;cobyge](https://togithub.com/cobyge) made their first
contribution in
[https://github.com/dani-garcia/vaultwarden/pull/4730](https://togithub.com/dani-garcia/vaultwarden/pull/4730)
- [@&#8203;0x0fbc](https://togithub.com/0x0fbc) made their first
contribution in
[https://github.com/dani-garcia/vaultwarden/pull/4637](https://togithub.com/dani-garcia/vaultwarden/pull/4637)

**Full Changelog**:
dani-garcia/vaultwarden@1.31.0...1.32.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 10pm every weekday,every
weekend,before 5am every weekday" in timezone America/New_York,
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job log](https://developer.mend.io/github/NorkzYT/Wolflith).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6InN0YWdpbmciLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwibWlub3IiLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@lapastillaroja
Copy link

I'm still having this same issue even after upgrading to 1.32 version. On iOS 17 (latest version 2024.9.2(1106) ) and also web app.
Apart from upgrading to 1.32 there's any other step to be done?

Screen shot from web console
image

@stefan0xC
Copy link
Contributor Author

@lapastillaroja you will have to either fix the offending item by adding the correct organization id manually in the database or remove it.

@lapastillaroja
Copy link

and advice on how to find the offending items?

@stefan0xC
Copy link
Contributor Author

If you are the only user of your instance just delete the latest entry (via created_at column) otherwise you might want to restrict this to just your account (user_uuid) or restore the latest working version from any backups you might have made.

@lapastillaroja
Copy link

Thank you @stefan0xC , removing the latest added item from the ciphers table fixed the issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants