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.
163 lines
5.0 KiB
Rust
163 lines
5.0 KiB
Rust
/*
|
|
* SPDX-FileCopyrightText: 2020 Stalwart Labs Ltd <[email protected]>
|
|
*
|
|
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
|
|
*/
|
|
|
|
use crate::compiler::{
|
|
CompileError, Value,
|
|
grammar::{Capability, Comparator, instruction::CompilerState},
|
|
lexer::{Token, word::Word},
|
|
};
|
|
|
|
use crate::compiler::grammar::{MatchType, test::Test};
|
|
|
|
/*
|
|
Usage: spamtest [":percent"] [COMPARATOR] [MATCH-TYPE]
|
|
<value: string>
|
|
*/
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
#[cfg_attr(
|
|
any(test, feature = "serde"),
|
|
derive(serde::Serialize, serde::Deserialize)
|
|
)]
|
|
#[cfg_attr(
|
|
feature = "rkyv",
|
|
derive(rkyv::Serialize, rkyv::Deserialize, rkyv::Archive)
|
|
)]
|
|
pub(crate) struct TestSpamTest {
|
|
pub value: Value,
|
|
pub match_type: MatchType,
|
|
pub comparator: Comparator,
|
|
pub percent: bool,
|
|
pub is_not: bool,
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
#[cfg_attr(
|
|
any(test, feature = "serde"),
|
|
derive(serde::Serialize, serde::Deserialize)
|
|
)]
|
|
#[cfg_attr(
|
|
feature = "rkyv",
|
|
derive(rkyv::Serialize, rkyv::Deserialize, rkyv::Archive)
|
|
)]
|
|
pub(crate) struct TestVirusTest {
|
|
pub value: Value,
|
|
pub match_type: MatchType,
|
|
pub comparator: Comparator,
|
|
pub is_not: bool,
|
|
}
|
|
|
|
impl CompilerState<'_> {
|
|
pub(crate) fn parse_test_spamtest(&mut self) -> Result<Test, CompileError> {
|
|
let mut match_type = MatchType::Is;
|
|
let mut comparator = Comparator::AsciiCaseMap;
|
|
let mut percent = false;
|
|
let value;
|
|
|
|
loop {
|
|
let token_info = self.tokens.unwrap_next()?;
|
|
match token_info.token {
|
|
Token::Tag(
|
|
word @ (Word::Is
|
|
| Word::Contains
|
|
| Word::Matches
|
|
| Word::Value
|
|
| Word::Count
|
|
| Word::Regex),
|
|
) => {
|
|
self.validate_argument(
|
|
1,
|
|
match word {
|
|
Word::Value | Word::Count => Capability::Relational.into(),
|
|
Word::Regex => Capability::Regex.into(),
|
|
Word::List => Capability::ExtLists.into(),
|
|
_ => None,
|
|
},
|
|
token_info.line_num,
|
|
token_info.line_pos,
|
|
)?;
|
|
|
|
match_type = self.parse_match_type(word)?;
|
|
}
|
|
Token::Tag(Word::Comparator) => {
|
|
self.validate_argument(2, None, token_info.line_num, token_info.line_pos)?;
|
|
comparator = self.parse_comparator()?;
|
|
}
|
|
Token::Tag(Word::Percent) => {
|
|
self.validate_argument(
|
|
3,
|
|
Capability::SpamTestPlus.into(),
|
|
token_info.line_num,
|
|
token_info.line_pos,
|
|
)?;
|
|
percent = true;
|
|
}
|
|
_ => {
|
|
value = self.parse_string_token(token_info)?;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(Test::SpamTest(TestSpamTest {
|
|
value,
|
|
percent,
|
|
match_type,
|
|
comparator,
|
|
is_not: false,
|
|
}))
|
|
}
|
|
|
|
pub(crate) fn parse_test_virustest(&mut self) -> Result<Test, CompileError> {
|
|
let mut match_type = MatchType::Is;
|
|
let mut comparator = Comparator::AsciiCaseMap;
|
|
let value;
|
|
|
|
loop {
|
|
let token_info = self.tokens.unwrap_next()?;
|
|
match token_info.token {
|
|
Token::Tag(
|
|
word @ (Word::Is
|
|
| Word::Contains
|
|
| Word::Matches
|
|
| Word::Value
|
|
| Word::Count
|
|
| Word::Regex),
|
|
) => {
|
|
self.validate_argument(
|
|
1,
|
|
match word {
|
|
Word::Value | Word::Count => Capability::Relational.into(),
|
|
Word::Regex => Capability::Regex.into(),
|
|
Word::List => Capability::ExtLists.into(),
|
|
_ => None,
|
|
},
|
|
token_info.line_num,
|
|
token_info.line_pos,
|
|
)?;
|
|
|
|
match_type = self.parse_match_type(word)?;
|
|
}
|
|
Token::Tag(Word::Comparator) => {
|
|
self.validate_argument(2, None, token_info.line_num, token_info.line_pos)?;
|
|
comparator = self.parse_comparator()?;
|
|
}
|
|
_ => {
|
|
value = self.parse_string_token(token_info)?;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(Test::VirusTest(TestVirusTest {
|
|
value,
|
|
match_type,
|
|
comparator,
|
|
is_not: false,
|
|
}))
|
|
}
|
|
}
|