Backup_Repos/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-05-08 12:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Corrections on env and naming.

Browse source
This commit is contained in:
Guilhem Zeitoun 2026-04-26 17:41:34 +02:00
parent daa9e075a2
commit f829426d2c
No known key found for this signature in database
2 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config.rs
View file

@ -886,8 +886,8 @@ make_config! {
smtp_username: String, true, option;
/// Password
smtp_password: Pass, true, option;
/// Dkim signature (type:privatekey). Private must be base64-encoded ed key or PKCS#1 format RSA key.
dkim_signature: String, true, option;
/// Dkim private key (type:privatekey). Private must be base64-encoded ed key or PKCS#1 format RSA key.
dkim_privatekey: String, true, option;
/// Dkim algo (true if RSA else ed25519)
dkim_use_rsa: bool, true, def, false;
/// Dkim infos (selector:domain)

35
src/mail.rs
View file

@ -14,14 +14,10 @@ use lettre::{
};
use crate::{
api::EmptyResult,
auth::{
CONFIG, api::EmptyResult, auth::{
encode_jwt, generate_delete_claims, generate_emergency_access_invite_claims, generate_invite_claims,
generate_verify_email_claims,
},
db::models::{Device, DeviceType, EmergencyAccessId, MembershipId, OrganizationId, User, UserId},
error::Error,
CONFIG,
}, db::models::{Device, DeviceType, EmergencyAccessId, MembershipId, OrganizationId, User, UserId}, error::Error, util::get_env
};
fn sendmail_transport() -> AsyncSendmailTransport<Tokio1Executor> {
@ -707,23 +703,11 @@ async fn send_with_selected_transport(email: Message) -> EmptyResult {
}
}
pub fn check_dkim() -> Result<Option<DkimConfig>, String> {
match (CONFIG.dkim_signature(), CONFIG.dkim_infos()) {
(Some(sig), Some(infos)) => {
let config = {
match (get_env::<String>("dkim_privatekey"), CONFIG.dkim_infos()) {
(Some(pk), Some(infos)) => {
let algo = if CONFIG.dkim_use_rsa() {DkimSigningAlgorithm::Rsa } else { DkimSigningAlgorithm::Ed25519 };
let sig = match std::fs::read_to_string(sig) {
Err(e) => {
return Err(format!("Cannot read DKIM key. Err is {:?}", e));
}
Ok(key) => match DkimSigningKey::new(&key, algo) {
Ok(d) => d,
Err(e) => {
return Err(format!("DKIM key is invalid. Err is {:?}", e));
}
},
};
match (sig, infos.split(':').collect::<Vec<&str>>()) {
(sig, split2) if split2.len() == 2 => {
let (selector, domain, privatekey) = match (DkimSigningKey::new(pk.as_str(), algo), infos.split(':').collect::<Vec<&str>>()) {
(Ok(sig), split2) if split2.len() == 2 => {
let (selector, domain, sig) =
(String::from(*split2.first().unwrap()), String::from(*split2.last().unwrap()), sig);
(selector, domain, sig)
@ -731,10 +715,9 @@ pub fn check_dkim() -> Result<Option<DkimConfig>, String> {
_ => {
return Err("DKIM issue, invalid domain, selector.".to_string());
}
}
};
Ok(Some(DkimConfig::default_config(config.0, config.1, config.2)))
}
};
return Ok(Some(DkimConfig::default_config(selector, domain, privatekey)));
},
(None, None) => Ok(None),
_ => {
Err("DKIM setting is badly implemented. One config is missing (DKIM signature or DKIM infos).".to_string())