jcoffey-dev
cc6f1eb298
Everything clients, users and operators meet now carries the fork's name, with no aliases (SPEC.md §2.4, changed here from "protocol identifiers stay"): - JMAP: upstream's registry capability is urn:inbuxa:jmap:registry, beside the fork's own urn:inbuxa:jmap. - WebDAV lock and sync tokens are urn:inbuxa:dav*; clients resync once. - Sieve: vnd.inbuxa.while and vnd.inbuxa.expressions. sieve-rs spells these into its compiler, so it's vendored (vendor/sieve-rs, 0.7.3) and patched in; a unit test fails if Cargo.lock ever moves past the vendored copy. The trusted runtime now names itself too, rather than answering sieve-rs's default. - The web interface's OAuth client is inbuxa-webui. On every start the old stalwart-webui client is removed and any application naming it is moved over. - The spam filter's blobs are INBUXA_SPAM_*; every start moves any left under the old keys, so a trained model survives. - SQL stores and log files default to inbuxa, in the code and in the schema served to the admin (checksum regenerated). - Settings are INBUXA_* only. A STALWART_* variable that's set where its INBUXA_* one isn't stops the server at startup, naming it. - The version-upgrade messages link docs.inbuxa.org's migration page, and the OpenAPI description, smtp crate metadata and web-push test fixtures lose the name. Kept on purpose, allowlisted with reasons: the OAuth key-derivation contexts (renaming them would end every session and invalidate every sealed client id) and the hashed application prefix. Also fixes a latent start-up failure: ensure_client updated an existing first-party client with a revision of 0, which the registry's assertion never matches, so adding a redirect URI or changing the webmail secret failed start-up. And the principal session test now expects legacyProtocols (C-1, added 2026-09-21), which it had missed. Tested: the server builds without warnings; common's 106 unit tests, including the vendoring check; a new integration test for the two start-up migrations; and the webdav, jmap, imap and SMTP Sieve suites.
100 lines
3.2 KiB
Rust
100 lines
3.2 KiB
Rust
/*
|
|
* SPDX-FileCopyrightText: 2020 Stalwart Labs Ltd <[email protected]>
|
|
*
|
|
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
|
|
*/
|
|
|
|
use std::borrow::Cow;
|
|
|
|
use crate::{
|
|
Context,
|
|
compiler::{
|
|
Number,
|
|
grammar::{
|
|
MatchType,
|
|
tests::test_notify::{TestNotifyMethodCapability, TestValidNotifyMethod},
|
|
},
|
|
},
|
|
runtime::actions::action_notify::validate_uri,
|
|
};
|
|
|
|
use super::TestResult;
|
|
|
|
impl TestValidNotifyMethod {
|
|
pub(crate) fn exec(&self, ctx: &mut Context) -> TestResult {
|
|
let mut num_valid = 0;
|
|
|
|
for uri in &self.notification_uris {
|
|
let uri_ = ctx.eval_value(uri);
|
|
let uri = uri_.to_string();
|
|
if let Some(scheme) = validate_uri(uri.as_ref())
|
|
&& (ctx
|
|
.runtime
|
|
.valid_notification_uris
|
|
.contains(&Cow::from(scheme))
|
|
|| ctx.runtime.valid_notification_uris.contains(&uri))
|
|
{
|
|
num_valid += 1;
|
|
}
|
|
}
|
|
|
|
TestResult::Bool((num_valid == self.notification_uris.len()) ^ self.is_not)
|
|
}
|
|
}
|
|
|
|
impl TestNotifyMethodCapability {
|
|
pub(crate) fn exec(&self, ctx: &mut Context) -> TestResult {
|
|
let uri_ = ctx.eval_value(&self.notification_uri);
|
|
let uri = uri_.to_string();
|
|
if !ctx
|
|
.eval_value(&self.notification_capability)
|
|
.to_string()
|
|
.eq_ignore_ascii_case("online")
|
|
|| !validate_uri(uri.as_ref()).is_some_and(|scheme| {
|
|
ctx.runtime
|
|
.valid_notification_uris
|
|
.contains(&Cow::from(scheme))
|
|
|| ctx.runtime.valid_notification_uris.contains(&uri)
|
|
})
|
|
{
|
|
return TestResult::Bool(false ^ self.is_not);
|
|
}
|
|
|
|
if let MatchType::Count(rel_match) = &self.match_type {
|
|
for key in &self.key_list {
|
|
if rel_match.cmp(&Number::from(1.0), &ctx.eval_value(key).to_number()) {
|
|
return TestResult::Bool(true ^ self.is_not);
|
|
}
|
|
}
|
|
} else {
|
|
for pattern in &self.key_list {
|
|
let key = ctx.eval_value(pattern);
|
|
if match &self.match_type {
|
|
MatchType::Is => self.comparator.is(&"maybe", &key),
|
|
MatchType::Contains => {
|
|
self.comparator.contains("maybe", key.to_string().as_ref())
|
|
}
|
|
MatchType::Value(relation) => {
|
|
self.comparator.relational(relation, &"maybe", &key)
|
|
}
|
|
MatchType::Matches(_) => self.comparator.matches(
|
|
"maybe",
|
|
key.to_string().as_ref(),
|
|
0,
|
|
&mut Vec::new(),
|
|
),
|
|
MatchType::Regex(_) => {
|
|
self.comparator
|
|
.regex(pattern, &key, "maybe", 0, &mut Vec::new())
|
|
}
|
|
_ => false,
|
|
} {
|
|
return TestResult::Bool(true ^ self.is_not);
|
|
}
|
|
}
|
|
}
|
|
|
|
TestResult::Bool(false ^ self.is_not)
|
|
}
|
|
}
|