-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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 for RSA Keys which are read only #4744
Conversation
Sometimes an RSA Key file could be read only. We currently failed because we also wanted to write. Added an extra check if the file exists already and is not 0 in size. If it does already exists and is larger then 0, then open in read only mode. Fixes dani-garcia#4644
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm thinking that we could instead make something like this:
pub fn initialize_keys() -> Result<(), crate::error::Error> {
fn read_key(create_if_missing: bool) -> Result<(Rsa<Private>, Vec<u8>), crate::error::Error> {
let mut priv_key_buffer = Vec::with_capacity(2048);
let mut priv_key_file = File::options()
.create(create_if_missing)
.truncate(false)
.read(true)
.write(create_if_missing)
.open(CONFIG.private_rsa_key())?;
#[allow(clippy::verbose_file_reads)]
let bytes_read = priv_key_file.read_to_end(&mut priv_key_buffer)?;
let rsa_key = if bytes_read > 0 {
Rsa::private_key_from_pem(&priv_key_buffer[..bytes_read])?
} else if create_if_missing {
// Only create the key if the file doesn't exist or is empty
let rsa_key = openssl::rsa::Rsa::generate(2048)?;
priv_key_buffer = rsa_key.private_key_to_pem()?;
priv_key_file.write_all(&priv_key_buffer)?;
info!("Private key created correctly.");
rsa_key
} else {
err!("Private key doesn't exist")
};
Ok((rsa_key, priv_key_buffer))
}
let (priv_key, priv_key_buffer) = read_key(true).or_else(|_| read_key(false))?;
let pub_key_buffer = priv_key.public_key_to_pem()?;
let enc = EncodingKey::from_rsa_pem(&priv_key_buffer)?;
let dec: DecodingKey = DecodingKey::from_rsa_pem(&pub_key_buffer)?;
if PRIVATE_RSA_KEY.set(enc).is_err() {
err!("PRIVATE_RSA_KEY must only be initialized once")
}
if PUBLIC_RSA_KEY.set(dec).is_err() {
err!("PUBLIC_RSA_KEY must only be initialized once")
}
Ok(())
}
We optimistically try to open it read/write and do the operation atomically, if that fails we can retry read-only. If the file is in read-only mode we don't really care about the atomicity of the operation anyway.
- Changed the code to work atomically - Also show the alert generated from `Io`
@dani-garcia, done :) |
…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 [#​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 [#​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 [#​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​BlackDex](https://togithub.com/BlackDex) in [https://github.com/dani-garcia/vaultwarden/pull/4837](https://togithub.com/dani-garcia/vaultwarden/pull/4837) #### New Contributors - [@​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) - [@​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-->
[![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 [#​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 [#​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 [#​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​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 [@​BlackDex](https://togithub.com/BlackDex) in [https://github.com/dani-garcia/vaultwarden/pull/4837](https://togithub.com/dani-garcia/vaultwarden/pull/4837) #### New Contributors - [@​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) - [@​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>
Sometimes an RSA Key file could be read only.
We currently failed because we also wanted to write. Added an extra check if the file exists already and is not 0 in size. If it does already exists and is larger then 0, then open in read only mode.
Fixes #4644