jcoffey-dev
b2453d066b
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}.
99 lines
4.3 KiB
TOML
99 lines
4.3 KiB
TOML
[package]
|
|
name = "tests"
|
|
version = "0.16.24"
|
|
edition = "2024"
|
|
|
|
[features]
|
|
# `pending-rebuild` held the shared tests of features the fork hadn't rebuilt
|
|
# yet. All nine are built and every gate is off, so the feature went on
|
|
# 2026-09-19 (docs/spec/SPEC.md §2.2b).
|
|
#default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis", "nats", "azure", "foundationdb"]
|
|
#default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis", "foundationdb"]
|
|
default = ["rocks", "sqlite"]
|
|
sqlite = ["store/sqlite", "directory/sqlite"]
|
|
foundationdb = ["store/foundation", "common/foundation"]
|
|
postgres = ["store/postgres", "directory/postgres"]
|
|
mysql = ["store/mysql", "directory/mysql"]
|
|
rocks = ["store/rocks"]
|
|
s3 = ["store/s3"]
|
|
redis = ["store/redis", "coordinator/redis"]
|
|
nats = ["coordinator/nats"]
|
|
kafka = ["coordinator/kafka"]
|
|
azure = ["store/azure"]
|
|
|
|
[dev-dependencies]
|
|
store = { path = "../crates/store", features = ["test_mode"] }
|
|
nlp = { path = "../crates/nlp" }
|
|
directory = { path = "../crates/directory", features = ["test_mode"] }
|
|
coordinator = { path = "../crates/coordinator", features = ["test_mode"] }
|
|
jmap = { path = "../crates/jmap", features = ["test_mode"] }
|
|
jmap_proto = { path = "../crates/jmap-proto" }
|
|
imap = { path = "../crates/imap", features = ["test_mode"] }
|
|
imap_proto = { path = "../crates/imap-proto" }
|
|
types = { path = "../crates/types" }
|
|
dav = { path = "../crates/dav", features = ["test_mode"] }
|
|
dav-proto = { path = "../crates/dav-proto", features = ["test_mode"] }
|
|
calcard = { version = "0.3", features = ["rkyv"] }
|
|
groupware = { path = "../crates/groupware", features = ["test_mode"] }
|
|
http = { path = "../crates/http", features = ["test_mode"] }
|
|
http_proto = { path = "../crates/http-proto", features = ["test_mode"] }
|
|
scim = { path = "../crates/scim", features = ["test_mode"] }
|
|
scim-proto = { path = "../crates/scim-proto" }
|
|
services = { path = "../crates/services", features = ["test_mode"] }
|
|
pop3 = { path = "../crates/pop3", features = ["test_mode"] }
|
|
smtp = { path = "../crates/smtp", features = ["test_mode"] }
|
|
common = { path = "../crates/common", features = ["test_mode"] }
|
|
registry = { path = "../crates/registry" }
|
|
inbuxa-features = { path = "../crates/features" }
|
|
email = { path = "../crates/email", features = ["test_mode"] }
|
|
spam-filter = { path = "../crates/spam-filter", features = ["test_mode"] }
|
|
trc = { path = "../crates/trc", features = [] }
|
|
managesieve = { path = "../crates/managesieve", features = ["test_mode"] }
|
|
migration = { path = "../crates/migration" }
|
|
smtp-proto = { version = "0.2" }
|
|
mail-auth = { version = "0.13", features = ["test"] }
|
|
mail-parser = { version = "0.11", features = ["full_encoding", "rkyv"] }
|
|
mail-builder = "1.0"
|
|
sieve-rs = { version = "0.7", features = ["rkyv"] }
|
|
utils = { path = "../crates/utils", features = ["test_mode"] }
|
|
jmap-client = { version = "0.4", features = ["websockets", "debug", "async"] }
|
|
tokio = { version = "1.53", features = ["full"] }
|
|
tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] }
|
|
rustls = { version = "0.23.43", default-features = false, features = ["std", "aws_lc_rs", "tls12"] }
|
|
rustls-pki-types = { version = "1" }
|
|
csv = "1.4"
|
|
rayon = { version = "1.12.0" }
|
|
flate2 = { version = "1.1.10", features = ["zlib"], default-features = false }
|
|
serde = { version = "1.0", features = ["derive"]}
|
|
serde_json = "1.0"
|
|
reqwest = { version = "0.13", default-features = false, features = ["rustls", "multipart", "http2", "form"]}
|
|
bytes = "1.12.1"
|
|
futures = "0.3"
|
|
ece = "2.3"
|
|
hyper = { version = "1.11.1", features = ["server", "http1", "http2"] }
|
|
hyper-util = { version = "0.1.20", features = ["tokio"] }
|
|
base64 = "0.23"
|
|
ahash = { version = "0.8" }
|
|
serial_test = "4.0.1"
|
|
chrono = "0.4"
|
|
aws-lc-rs = { version = "1" }
|
|
biscuit = "0.8.0"
|
|
form_urlencoded = "1.2.2"
|
|
rkyv = { version = "0.8.18", features = ["little_endian"] }
|
|
quick-xml = "0.41"
|
|
jmap-tools = { version = "0.1" }
|
|
dns-update = { version = "0.5", features = ["test_provider"] }
|
|
x509-parser = "0.18"
|
|
rcgen = "0.14"
|
|
sha2 = "0.11"
|
|
zip = "8.6" # inbuxa: reading legal hold exports
|
|
time = "0.3"
|
|
testcontainers = { version = "0.28", features = ["reusable-containers"] }
|
|
rust-s3 = { version = "0.37", default-features = false, features = ["tokio-rustls-tls"] }
|
|
|
|
[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
|
|
tikv-jemallocator = "0.7"
|
|
|
|
[lints]
|
|
workspace = true
|