Eight conflicted files resolved, plus the lock file and the schema:
- crates/services/src/task_manager/spam_classifier.rs: upstream's rules
update now replaces existing rules, DNSBL servers, lookups and file
extensions, keeping only whether each is on. Taken, with one difference:
an object an admin edited is kept as it is. Every object an update writes
is fingerprinted (content without `enable`, SHA-256, stored under
SUBSPACE_INBUXA "Sf"), and only one that still matches is replaced.
Scores are never replaced, as upstream has it. The AU-1.10 summary record
now names what was added, replaced and kept, and the bundled rules are
marked applied only when the update fully succeeded, so a failure runs
again on the next start. The marker becomes "3.0.2+2", which runs the
update once on upgrade to fingerprint every rule still as bundled.
- crates/common/src/network/autoconfig/autodiscover.rs: upstream's rewrite
(implicit TLS first, labeled SSL), with the per-protocol switches (LP-7,
LP-14a) passed in as a filter.
- crates/store/src/backend/mysql/{search,write}.rs: upstream's chunked
deletes (no unbounded first DELETE, stop on a short chunk, halve the
chunk on the new chunk-too-large errors) inside the fork's query timeout.
- crates/smtp/src/lib.rs: the fork's queue spawn kept. It already fixed the
stall upstream fixes here (a node without outboundMta stops accepting
mail at about 1024 queued messages), and follows role changes live.
- crates/jmap/src/registry/mapping/bootstrap.rs: the log path stays
/var/log/inbuxa/; upstream's PowerDNS mapping taken.
- crates/main/Cargo.toml: the AGPL-only license kept, version 0.16.24.
- tests/src/jmap/principal/get.rs: the fork's capabilities kept.
- resources/schema/schema.json.gz: merged as JSON; upstream relabeled the
vendor Sieve extensions "(Stalwart)", kept as "(vnd.inbuxa)".
- Cargo.lock: upstream's, with the fork's crates added by Cargo.
Also:
- tests/src/smtp/inbound/spam_rules_kept.rs: an edited rule survives an
update, an unedited one is updated, rules from before fingerprints are
handled, and the audit summary says so. Upstream's own spam_rules test
passes unchanged.
- tests/src/smtp/reporting/reschedule.rs moves to port 19058; upstream's
new spam_rules test took 19057.
- tools/fork/renames.py renames the "(Stalwart)" labels and the default
log path, so neither conflicts again.
- tools/fork/notice-check.py compares against the newest snapshot in the
checked-out history instead of the upstream branch head, so moving the
branch no longer fails other open pull requests.
- tests/src/directory/issuer.rs (since v0.16.23) stays out, and is on the
build check's known list: it tests issuer-based directory routing, which
the fork doesn't have (DIR-2).
- Strip report: docs/fork/strip-reports/v0.16.24.{md,json}.
418 lines
14 KiB
Rust
418 lines
14 KiB
Rust
/*
|
|
* SPDX-FileCopyrightText: 2020 Stalwart Labs LLC <[email protected]>
|
|
*
|
|
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
|
|
*
|
|
* Modified by Coffey Labs in 2026 for INBUXA.
|
|
*/
|
|
|
|
use ahash::AHashMap;
|
|
use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD};
|
|
use p256::{
|
|
SecretKey,
|
|
ecdsa::{Signature, SigningKey, signature::Signer},
|
|
pkcs8::{DecodePrivateKey, PrivateKeyInfo, der::SecretDocument},
|
|
};
|
|
use parking_lot::Mutex;
|
|
use reqwest::{Url, header::HeaderValue};
|
|
use std::sync::Arc;
|
|
|
|
const VAPID_TOKEN_TTL: u64 = 12 * 60 * 60;
|
|
const VAPID_TOKEN_REFRESH: u64 = VAPID_TOKEN_TTL / 2;
|
|
|
|
#[derive(Clone)]
|
|
pub struct Vapid {
|
|
key: VapidKey,
|
|
contact: Option<String>,
|
|
tokens: Arc<Mutex<AHashMap<String, VapidToken>>>,
|
|
}
|
|
|
|
struct VapidToken {
|
|
authorization: HeaderValue,
|
|
issued_at: u64,
|
|
}
|
|
|
|
impl Vapid {
|
|
pub fn new(key: VapidKey, contact: Option<String>) -> Self {
|
|
Self {
|
|
key,
|
|
contact,
|
|
tokens: Arc::default(),
|
|
}
|
|
}
|
|
|
|
pub fn public_key(&self) -> &str {
|
|
self.key.public_key()
|
|
}
|
|
|
|
pub fn authorization(&self, endpoint: &str, now: u64) -> Option<HeaderValue> {
|
|
let prefix = endpoint_prefix(endpoint)?;
|
|
if let Some(token) = self
|
|
.tokens
|
|
.lock()
|
|
.get(prefix)
|
|
.filter(|token| token.is_fresh(now))
|
|
{
|
|
return Some(token.authorization.clone());
|
|
}
|
|
|
|
let authorization = HeaderValue::try_from(self.key.authorization(
|
|
endpoint,
|
|
self.contact.as_deref(),
|
|
now,
|
|
)?)
|
|
.ok()?;
|
|
let mut tokens = self.tokens.lock();
|
|
tokens.retain(|_, token| token.is_fresh(now));
|
|
tokens.insert(
|
|
prefix.to_string(),
|
|
VapidToken {
|
|
authorization: authorization.clone(),
|
|
issued_at: now,
|
|
},
|
|
);
|
|
Some(authorization)
|
|
}
|
|
}
|
|
|
|
impl VapidToken {
|
|
fn is_fresh(&self, now: u64) -> bool {
|
|
now.checked_sub(self.issued_at)
|
|
.is_some_and(|age| age < VAPID_TOKEN_REFRESH)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct VapidKey {
|
|
signing_key: SigningKey,
|
|
public_key: String,
|
|
}
|
|
|
|
impl VapidKey {
|
|
pub fn from_pkcs8_pem(pem: &str) -> Result<Self, String> {
|
|
let pem = pem.trim_start_matches('\u{feff}').trim();
|
|
|
|
if let Ok(key) = SigningKey::from_pkcs8_pem(pem) {
|
|
return Ok(Self::from_signing_key(key));
|
|
}
|
|
if let Ok(secret) = SecretKey::from_sec1_pem(pem) {
|
|
return Ok(Self::from_signing_key(secret.into()));
|
|
}
|
|
if let Some(secret) = secret_key_from_explicit_params(pem) {
|
|
return Ok(Self::from_signing_key(secret.into()));
|
|
}
|
|
|
|
Err(SigningKey::from_pkcs8_pem(pem)
|
|
.err()
|
|
.map(|err| {
|
|
format!(
|
|
"{err}. Re-encode the key as named-curve PKCS#8, \
|
|
e.g. `openssl pkey -in key.pem -out key_pkcs8.pem`."
|
|
)
|
|
})
|
|
.unwrap_or_else(|| "unsupported VAPID key encoding".to_string()))
|
|
}
|
|
|
|
fn from_signing_key(signing_key: SigningKey) -> Self {
|
|
let public_key = URL_SAFE_NO_PAD.encode(
|
|
signing_key
|
|
.verifying_key()
|
|
.to_encoded_point(false)
|
|
.as_bytes(),
|
|
);
|
|
Self {
|
|
signing_key,
|
|
public_key,
|
|
}
|
|
}
|
|
|
|
pub fn public_key(&self) -> &str {
|
|
&self.public_key
|
|
}
|
|
|
|
pub fn authorization(&self, endpoint: &str, contact: Option<&str>, now: u64) -> Option<String> {
|
|
let mut claims = serde_json::Map::new();
|
|
claims.insert("aud".into(), endpoint_origin(endpoint)?.into());
|
|
claims.insert("exp".into(), (now + VAPID_TOKEN_TTL).into());
|
|
if let Some(sub) = contact {
|
|
claims.insert("sub".into(), sub.into());
|
|
}
|
|
|
|
let header = URL_SAFE_NO_PAD.encode(br#"{"typ":"JWT","alg":"ES256"}"#);
|
|
let payload = URL_SAFE_NO_PAD.encode(serde_json::to_vec(&claims).ok()?);
|
|
let signing_input = format!("{header}.{payload}");
|
|
let signature: Signature = self.signing_key.sign(signing_input.as_bytes());
|
|
|
|
Some(format!(
|
|
"vapid t={signing_input}.{}, k={}",
|
|
URL_SAFE_NO_PAD.encode(signature.to_bytes()),
|
|
self.public_key
|
|
))
|
|
}
|
|
}
|
|
|
|
fn endpoint_prefix(url: &str) -> Option<&str> {
|
|
let (scheme, rest) = url.split_once("://")?;
|
|
let authority = rest.split(['/', '?', '#']).next()?;
|
|
url.get(..scheme.len() + "://".len() + authority.len())
|
|
}
|
|
|
|
fn endpoint_origin(url: &str) -> Option<String> {
|
|
let origin = Url::parse(url).ok()?.origin();
|
|
origin.is_tuple().then(|| origin.ascii_serialization())
|
|
}
|
|
|
|
pub fn normalize_contact(contact: &str) -> Option<String> {
|
|
let contact = contact.trim();
|
|
|
|
match contact.split_once(':') {
|
|
Some((scheme, _)) if scheme.eq_ignore_ascii_case("mailto") => Some(contact.to_string()),
|
|
Some((scheme, _)) if scheme.eq_ignore_ascii_case("https") => Some(contact.to_string()),
|
|
Some(_) => None,
|
|
None if contact.contains('@') => Some(format!("mailto:{contact}")),
|
|
None => None,
|
|
}
|
|
}
|
|
|
|
pub fn generate_pkcs8_pem() -> Result<String, String> {
|
|
use p256::elliptic_curve::rand_core::OsRng;
|
|
use p256::pkcs8::{EncodePrivateKey, LineEnding};
|
|
|
|
SigningKey::random(&mut OsRng)
|
|
.to_pkcs8_pem(LineEnding::LF)
|
|
.map(|pem| pem.to_string())
|
|
.map_err(|err| err.to_string())
|
|
}
|
|
|
|
fn secret_key_from_explicit_params(pem: &str) -> Option<SecretKey> {
|
|
let (_, document) = SecretDocument::from_pem(pem).ok()?;
|
|
let private_key_info = PrivateKeyInfo::try_from(document.as_bytes()).ok()?;
|
|
SecretKey::from_sec1_der(private_key_info.private_key).ok()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use p256::ecdsa::{Signature, VerifyingKey, signature::Verifier};
|
|
|
|
fn test_key() -> VapidKey {
|
|
VapidKey::from_pkcs8_pem(&generate_pkcs8_pem().unwrap()).unwrap()
|
|
}
|
|
|
|
#[test]
|
|
fn generated_key_round_trips_through_pkcs8_pem() {
|
|
let pem = generate_pkcs8_pem().unwrap();
|
|
assert_eq!(
|
|
VapidKey::from_pkcs8_pem(&pem).unwrap().public_key(),
|
|
VapidKey::from_pkcs8_pem(&pem).unwrap().public_key()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn endpoint_origin_normalizes() {
|
|
assert_eq!(
|
|
endpoint_origin("HTTPS://Push.Example.COM:443/push?x=1").unwrap(),
|
|
"https://push.example.com"
|
|
);
|
|
assert_eq!(
|
|
endpoint_origin("https://127.0.0.1:19000/push").unwrap(),
|
|
"https://127.0.0.1:19000"
|
|
);
|
|
assert_eq!(
|
|
endpoint_origin("https://user:[email protected]/fcm/send/x").unwrap(),
|
|
"https://fcm.googleapis.com"
|
|
);
|
|
assert_eq!(
|
|
endpoint_origin("http://[2001:DB8::1]:80/p").unwrap(),
|
|
"http://[2001:db8::1]"
|
|
);
|
|
assert_eq!(
|
|
endpoint_origin("https://attacker.example\\@fcm.googleapis.com/fcm/send/x").unwrap(),
|
|
"https://attacker.example"
|
|
);
|
|
assert!(endpoint_origin("not-a-url").is_none());
|
|
assert!(endpoint_origin("mailto:[email protected]").is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn authorization_signs_a_verifiable_es256_token() {
|
|
let key = test_key();
|
|
let now = 1_700_000_000;
|
|
let header = key
|
|
.authorization(
|
|
"https://push.example.com/push/abc?token=1",
|
|
Some("mailto:[email protected]"),
|
|
now,
|
|
)
|
|
.unwrap();
|
|
|
|
let (token, advertised_key) = header
|
|
.strip_prefix("vapid ")
|
|
.and_then(|rest| rest.split_once(", "))
|
|
.unwrap();
|
|
let jwt = token.strip_prefix("t=").unwrap();
|
|
assert_eq!(advertised_key.strip_prefix("k=").unwrap(), key.public_key());
|
|
|
|
let parts = jwt.split('.').collect::<Vec<_>>();
|
|
assert_eq!(parts.len(), 3);
|
|
|
|
let verifying_key =
|
|
VerifyingKey::from_sec1_bytes(&URL_SAFE_NO_PAD.decode(key.public_key()).unwrap())
|
|
.unwrap();
|
|
let signature = Signature::from_slice(&URL_SAFE_NO_PAD.decode(parts[2]).unwrap()).unwrap();
|
|
verifying_key
|
|
.verify(format!("{}.{}", parts[0], parts[1]).as_bytes(), &signature)
|
|
.unwrap();
|
|
|
|
assert_eq!(
|
|
URL_SAFE_NO_PAD.decode(parts[0]).unwrap(),
|
|
br#"{"typ":"JWT","alg":"ES256"}"#
|
|
);
|
|
let claims: serde_json::Value =
|
|
serde_json::from_slice(&URL_SAFE_NO_PAD.decode(parts[1]).unwrap()).unwrap();
|
|
assert_eq!(claims["aud"], "https://push.example.com");
|
|
assert_eq!(claims["sub"], "mailto:[email protected]");
|
|
assert_eq!(claims["exp"], now + VAPID_TOKEN_TTL);
|
|
}
|
|
|
|
const SEC1_PEM: &str = "-----BEGIN EC PRIVATE KEY-----
|
|
MHcCAQEEIP4Zv7be5hDH0x4ur6ditW+whzyZBXK1Vyjn6aIDo0jhoAoGCCqGSM49
|
|
AwEHoUQDQgAEVc4PXr+z61s9/dIas44+S0Nza3gm1UW/avddp99dUsEi3JV0H4Yk
|
|
1yfqVJ/O9KPvQ69uMAY0t3A5lx/GvOOZfg==
|
|
-----END EC PRIVATE KEY-----";
|
|
|
|
const PKCS8_NAMED_PEM: &str = "-----BEGIN PRIVATE KEY-----
|
|
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/hm/tt7mEMfTHi6v
|
|
p2K1b7CHPJkFcrVXKOfpogOjSOGhRANCAARVzg9ev7PrWz390hqzjj5LQ3NreCbV
|
|
Rb9q912n311SwSLclXQfhiTXJ+pUn870o+9Dr24wBjS3cDmXH8a845l+
|
|
-----END PRIVATE KEY-----";
|
|
|
|
const PKCS8_EXPLICIT_PEM: &str = "-----BEGIN PRIVATE KEY-----
|
|
MIIBeQIBADCCAQMGByqGSM49AgEwgfcCAQEwLAYHKoZIzj0BAQIhAP////8AAAAB
|
|
AAAAAAAAAAAAAAAA////////////////MFsEIP////8AAAABAAAAAAAAAAAAAAAA
|
|
///////////////8BCBaxjXYqjqT57PrvVV2mIa8ZR0GsMxTsPY7zjw+J9JgSwMV
|
|
AMSdNgiG5wSTamZ44ROdJreBn36QBEEEaxfR8uEsQkf4vOblY6RA8ncDfYEt6zOg
|
|
9KE5RdiYwpZP40Li/hp/m47n60p8D54WK84zV2sxXs7LtkBoN79R9QIhAP////8A
|
|
AAAA//////////+85vqtpxeehPO5ysL8YyVRAgEBBG0wawIBAQQg/hm/tt7mEMfT
|
|
Hi6vp2K1b7CHPJkFcrVXKOfpogOjSOGhRANCAARVzg9ev7PrWz390hqzjj5LQ3Nr
|
|
eCbVRb9q912n311SwSLclXQfhiTXJ+pUn870o+9Dr24wBjS3cDmXH8a845l+
|
|
-----END PRIVATE KEY-----";
|
|
|
|
const PKCS8_P384_PEM: &str = "-----BEGIN PRIVATE KEY-----
|
|
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCUx+yT22yGHP9q+Y1y
|
|
UedDkevSvPaUuSPH8Q4FJBdYKKLqX4a5VdBIOonKPC4Yj7yhZANiAAQPRBsMOJy/
|
|
B4yDfR2rGOd2H6Kv3fQNHPj9Nu5Tks8QYMLzrX8ONCNoFnNUQl9S0r0QS6phVqD0
|
|
1kt0wbEvKr7mPM/R8XS8dX0xYC58CXHqBsTM0piQN2R7kqWDJ5i4OjE=
|
|
-----END PRIVATE KEY-----";
|
|
|
|
#[test]
|
|
fn accepts_equivalent_p256_encodings() {
|
|
let named = VapidKey::from_pkcs8_pem(PKCS8_NAMED_PEM).unwrap();
|
|
let sec1 = VapidKey::from_pkcs8_pem(SEC1_PEM).unwrap();
|
|
let explicit = VapidKey::from_pkcs8_pem(PKCS8_EXPLICIT_PEM).unwrap();
|
|
|
|
assert_eq!(named.public_key(), sec1.public_key());
|
|
assert_eq!(named.public_key(), explicit.public_key());
|
|
}
|
|
|
|
#[test]
|
|
fn accepts_pem_with_leading_bom_and_whitespace() {
|
|
let dirty = format!("\u{feff} \n{PKCS8_NAMED_PEM}\n ");
|
|
assert_eq!(
|
|
VapidKey::from_pkcs8_pem(&dirty).unwrap().public_key(),
|
|
VapidKey::from_pkcs8_pem(PKCS8_NAMED_PEM)
|
|
.unwrap()
|
|
.public_key()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_wrong_curve_key() {
|
|
assert!(VapidKey::from_pkcs8_pem(PKCS8_P384_PEM).is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_garbage_with_actionable_error() {
|
|
let err = VapidKey::from_pkcs8_pem("not a key").err().unwrap();
|
|
assert!(err.contains("openssl pkey"), "{err}");
|
|
}
|
|
|
|
#[test]
|
|
fn contact_is_normalized_to_a_uri() {
|
|
for (input, expected) in [
|
|
("[email protected]", Some("mailto:[email protected]")),
|
|
(" [email protected] ", Some("mailto:[email protected]")),
|
|
("mailto:[email protected]", Some("mailto:[email protected]")),
|
|
("MAILTO:[email protected]", Some("MAILTO:[email protected]")),
|
|
(
|
|
"https://example.org/contact",
|
|
Some("https://example.org/contact"),
|
|
),
|
|
("example.org", None),
|
|
("http://example.org", None),
|
|
("tel:+123456789", None),
|
|
("", None),
|
|
] {
|
|
assert_eq!(
|
|
normalize_contact(input).as_deref(),
|
|
expected,
|
|
"unexpected normalization of {input:?}"
|
|
);
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn authorization_is_reused_per_endpoint_prefix() {
|
|
let vapid = Vapid::new(test_key(), None);
|
|
let now = 1_700_000_000;
|
|
let token = vapid
|
|
.authorization("https://push.example.com/push/a", now)
|
|
.unwrap();
|
|
|
|
assert_eq!(
|
|
vapid
|
|
.authorization("https://push.example.com/push/b?x=1", now + 60)
|
|
.unwrap(),
|
|
token
|
|
);
|
|
assert_ne!(
|
|
vapid
|
|
.authorization("https://other.example.com/push/a", now)
|
|
.unwrap(),
|
|
token
|
|
);
|
|
assert_ne!(
|
|
vapid
|
|
.authorization("https://push.example.com/push/a", now - 1)
|
|
.unwrap(),
|
|
token
|
|
);
|
|
let refreshed = vapid
|
|
.authorization("https://push.example.com/push/a", now + VAPID_TOKEN_REFRESH)
|
|
.unwrap();
|
|
assert_ne!(refreshed, token);
|
|
assert_eq!(
|
|
vapid
|
|
.authorization(
|
|
"https://push.example.com/push/c",
|
|
now + VAPID_TOKEN_REFRESH + 1
|
|
)
|
|
.unwrap(),
|
|
refreshed
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn authorization_omits_subject_when_no_contact() {
|
|
let key = test_key();
|
|
let header = key
|
|
.authorization("https://fcm.googleapis.com/fcm/send/xyz", None, 0)
|
|
.unwrap();
|
|
let payload = header.split('.').nth(1).unwrap();
|
|
let claims: serde_json::Value =
|
|
serde_json::from_slice(&URL_SAFE_NO_PAD.decode(payload).unwrap()).unwrap();
|
|
assert_eq!(claims["aud"], "https://fcm.googleapis.com");
|
|
assert!(claims.get("sub").is_none());
|
|
}
|
|
}
|