diff --git a/Cargo.lock b/Cargo.lock index 27ee6fb7..5ab8dfef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1001,6 +1001,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.12.1" @@ -1280,6 +1286,12 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + [[package]] name = "combine" version = "4.6.9" @@ -2561,6 +2573,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" +[[package]] +name = "fdeflate" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + [[package]] name = "ferroid" version = "2.0.0" @@ -2620,7 +2641,7 @@ checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.9.1", "zlib-rs", ] @@ -2871,6 +2892,34 @@ dependencies = [ "slab", ] +[[package]] +name = "g2gen" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5a7e0eb46f83a20260b850117d204366674e85d3a908d90865c78df9a6b1dfc" +dependencies = [ + "g2poly", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "g2p" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539e2644c030d3bf4cd208cb842d2ce2f80e82e6e8472390bcef83ceba0d80ad" +dependencies = [ + "g2gen", + "g2poly", +] + +[[package]] +name = "g2poly" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312d2295c7302019c395cfb90dacd00a82a2eabd700429bba9c7a3f38dbbe11b" + [[package]] name = "generic-array" version = "0.14.7" @@ -2971,6 +3020,16 @@ dependencies = [ "polyval 0.7.3", ] +[[package]] +name = "gif" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8cfcc411d9adbbaba82fb72661cc1bcca13e8bba98b364e62b2dba8f960159" +dependencies = [ + "color_quant", + "weezl", +] + [[package]] name = "git-version" version = "0.3.9" @@ -3867,6 +3926,34 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "image" +version = "0.25.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104" +dependencies = [ + "bytemuck", + "byteorder-lite", + "color_quant", + "gif", + "image-webp", + "moxcms", + "num-traits", + "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" +dependencies = [ + "byteorder-lite", + "quick-error", +] + [[package]] name = "imagesize" version = "0.15.0" @@ -5027,6 +5114,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "miniz_oxide" version = "0.9.1" @@ -5106,6 +5203,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "moxcms" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "multiversion_no_op" version = "1.0.0" @@ -6036,6 +6143,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "png" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" +dependencies = [ + "bitflags 2.13.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.8.9", +] + [[package]] name = "poly1305" version = "0.9.1" @@ -6387,6 +6507,18 @@ dependencies = [ "sha2 0.9.9", ] +[[package]] +name = "pxfm" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-xml" version = "0.31.0" @@ -7128,6 +7260,16 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "rqrr" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d084c50c5cfa397a081850da329566c8667b0b6c4e81da16abff1fef27de93b" +dependencies = [ + "g2p", + "lru", +] + [[package]] name = "rsa" version = "0.9.10" @@ -8254,6 +8396,7 @@ dependencies = [ "hashify", "hyper", "idna", + "image", "inbuxa-features", "infer 0.22.0", "mail-auth", @@ -8262,6 +8405,7 @@ dependencies = [ "psl", "registry", "rkyv", + "rqrr", "serde", "sha1 0.11.0", "smtp-proto", @@ -9824,6 +9968,12 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "weezl" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" + [[package]] name = "whatlang" version = "0.18.0" @@ -10921,6 +11071,21 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "zune-core" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b" + +[[package]] +name = "zune-jpeg" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296" +dependencies = [ + "zune-core", +] + [[package]] name = "zxcvbn" version = "3.1.1" diff --git a/crates/common/src/config/mailstore/spamfilter.rs b/crates/common/src/config/mailstore/spamfilter.rs index e8194acc..2ef1534d 100644 --- a/crates/common/src/config/mailstore/spamfilter.rs +++ b/crates/common/src/config/mailstore/spamfilter.rs @@ -60,6 +60,8 @@ pub struct SpamFilterConfig { pub scores: SpamFilterScoreConfig, pub spam_rules_url: Option, pub url_client: reqwest::Client, + // inbuxa: #401, read links in QR codes in a message's images + pub scan_qr_codes: bool, } #[derive(Debug, Clone, Default)] @@ -218,6 +220,8 @@ pub enum Location { BodyHtml, Attachment, Tcp, + // inbuxa: #401, a link read from a QR code in an image + QrCode, } #[derive(Debug, Clone)] @@ -249,6 +253,7 @@ impl SpamFilterConfig { grey_list_expiry: spam.greylist_for.map(|d| d.into_inner().as_secs()), // inbuxa: unset, empty or upstream's old default means the bundled rules spam_rules_url: crate::manager::spam_rules::rules_url(spam.spam_filter_rules_url), + scan_qr_codes: spam.scan_qr_codes, // inbuxa: redirectors are looked up over verified https, at // public addresses only url_client: utils::http::http_client_builder(false) @@ -623,6 +628,7 @@ impl Location { Location::BodyHtml => "body_html", Location::Attachment => "attachment", Location::Tcp => "tcp", + Location::QrCode => "qr_code", } } } diff --git a/crates/common/src/manager/spam_rules.rs b/crates/common/src/manager/spam_rules.rs index 289021af..212fc167 100644 --- a/crates/common/src/manager/spam_rules.rs +++ b/crates/common/src/manager/spam_rules.rs @@ -31,12 +31,12 @@ use trc::AddContext; /// The version of the embedded rules: the spam-filter release they started /// from, then the fork's own revision of them (resources/spam-filter/README.md). -pub const BUNDLED_SPAM_RULES_VERSION: &str = "3.0.2-inbuxa.1"; +pub const BUNDLED_SPAM_RULES_VERSION: &str = "3.0.2-inbuxa.2"; /// What's recorded once the bundled rules are loaded: their version, then the /// fork's own generation of the update, so a change to how an update applies /// runs it once more. Generation 2 fingerprints (upstream v0.16.24). -pub const BUNDLED_SPAM_RULES_APPLIED: &str = "3.0.2-inbuxa.1+2"; +pub const BUNDLED_SPAM_RULES_APPLIED: &str = "3.0.2-inbuxa.2+2"; static BUNDLED_SPAM_RULES: &[u8] = include_bytes!("../../../../resources/spam-filter/spam-filter-rules.json.gz"); diff --git a/crates/registry/src/inbuxa_tests.rs b/crates/registry/src/inbuxa_tests.rs index 5a4f2a91..46b50fc6 100644 --- a/crates/registry/src/inbuxa_tests.rs +++ b/crates/registry/src/inbuxa_tests.rs @@ -13,7 +13,7 @@ use crate::{ prelude::{ObjectImpl, ObjectInner, ObjectType}, structs::{ Bootstrap, Directory, DirectoryBootstrap, Domain, Enterprise, MtaRoute, MtaRouteCommon, - MtaRouteInbuxaRelay, OidcDirectory, Tenant, Tracer, TracerLog, + MtaRouteInbuxaRelay, OidcDirectory, SpamSettings, Tenant, Tracer, TracerLog, }, }, types::{EnumImpl, map::Map}, @@ -303,3 +303,33 @@ fn log_tracers_saved_before_the_format_read_back_as_text() { ObjectInner::Bootstrap(bootstrap) ); } + +// #401: spam settings saved before scanQrCodes read back with it off; saved +// now, with it +#[test] +fn spam_settings_saved_before_qr_codes_read_back_with_scanning_off() { + let settings = SpamSettings { + trust_contacts: false, + spam_filter_rules_url: Some("https://example.org/rules.json.gz".to_string()), + ..Default::default() + }; + let mut unset = Vec::new(); + false.pickle(&mut unset); + let mut old = settings.to_pickled_vec(); + assert!(old.ends_with(&unset)); + old.truncate(old.len() - unset.len()); + old[0] = 0; + assert_eq!( + read(ObjectType::SpamSettings, &old), + ObjectInner::SpamSettings(settings.clone()) + ); + + let settings = SpamSettings { + scan_qr_codes: true, + ..settings + }; + assert_eq!( + read(ObjectType::SpamSettings, &settings.to_pickled_vec()), + ObjectInner::SpamSettings(settings) + ); +} diff --git a/crates/registry/src/schema/properties.rs b/crates/registry/src/schema/properties.rs index 5cedf7b0..2d9954ce 100644 --- a/crates/registry/src/schema/properties.rs +++ b/crates/registry/src/schema/properties.rs @@ -996,6 +996,8 @@ pub enum Property { // inbuxa: branding BT-27, dark-mode logos LogoDark = 941, LogoUrlDark = 942, + // inbuxa: #401, links in QR codes + ScanQrCodes = 943, RequireClientRegistration = 615, RequireScopes = 608, RequireTls = 525, diff --git a/crates/registry/src/schema/properties_impl.rs b/crates/registry/src/schema/properties_impl.rs index 828df96e..2c5b5d68 100644 --- a/crates/registry/src/schema/properties_impl.rs +++ b/crates/registry/src/schema/properties_impl.rs @@ -1189,6 +1189,7 @@ impl EnumImpl for Property { b"scoreDiscard" => Property::ScoreDiscard, b"scoreReject" => Property::ScoreReject, b"scoreSpam" => Property::ScoreSpam, + b"scanQrCodes" => Property::ScanQrCodes, b"script" => Property::Script, b"searchStore" => Property::SearchStore, b"secret" => Property::Secret, @@ -2137,6 +2138,7 @@ impl EnumImpl for Property { Property::ScoreDiscard => "scoreDiscard", Property::ScoreReject => "scoreReject", Property::ScoreSpam => "scoreSpam", + Property::ScanQrCodes => "scanQrCodes", Property::Script => "script", Property::SearchStore => "searchStore", Property::Secret => "secret", @@ -3045,6 +3047,7 @@ impl EnumImpl for Property { 940 => Some(Property::Kind), 941 => Some(Property::LogoDark), 942 => Some(Property::LogoUrlDark), + 943 => Some(Property::ScanQrCodes), 615 => Some(Property::RequireClientRegistration), 608 => Some(Property::RequireScopes), 525 => Some(Property::RequireTls), @@ -3256,7 +3259,7 @@ impl EnumImpl for Property { } } - const COUNT: usize = 943; + const COUNT: usize = 944; } impl serde::Serialize for Property { diff --git a/crates/registry/src/schema/structs.rs b/crates/registry/src/schema/structs.rs index f5622376..e81adc19 100644 --- a/crates/registry/src/schema/structs.rs +++ b/crates/registry/src/schema/structs.rs @@ -5390,6 +5390,9 @@ pub struct SpamSettings { pub trust_replies: bool, #[serde(rename = "spamFilterRulesUrl")] pub spam_filter_rules_url: Option, + // inbuxa: #401, read links in QR codes in a message's images + #[serde(rename = "scanQrCodes")] + pub scan_qr_codes: bool, } #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] diff --git a/crates/registry/src/schema/structs_impl.rs b/crates/registry/src/schema/structs_impl.rs index eec24487..5dca3c6d 100644 --- a/crates/registry/src/schema/structs_impl.rs +++ b/crates/registry/src/schema/structs_impl.rs @@ -40507,7 +40507,8 @@ impl RegistryJsonPropertyPatch for SpamRuleUrl { impl ObjectImpl for SpamSettings { const FLAGS: u64 = OBJ_SINGLETON; - const VERSION: u8 = 0; + // inbuxa: version 1 adds scanQrCodes (#401) + const VERSION: u8 = 1; const OBJECT: ObjectType = ObjectType::SpamSettings; fn validate(&self, errors: &mut Vec) -> bool { @@ -40554,6 +40555,7 @@ impl Pickle for SpamSettings { self.score_spam.pickle(out); self.trust_replies.pickle(out); self.spam_filter_rules_url.pickle(out); + self.scan_qr_codes.pickle(out); } fn unpickle(stream: &mut crate::pickle::PickledStream<'_>) -> Option { @@ -40566,6 +40568,10 @@ impl Pickle for SpamSettings { this.score_spam = Pickle::unpickle(stream)?; this.trust_replies = Pickle::unpickle(stream)?; this.spam_filter_rules_url = Pickle::unpickle(stream)?; + // inbuxa: #401, stored from version 1 + if stream.version() >= 1 { + this.scan_qr_codes = Pickle::unpickle(stream)?; + } Some(this) } } @@ -40581,6 +40587,7 @@ impl Default for SpamSettings { score_spam: Float::new(5.0f64), trust_replies: true, spam_filter_rules_url: None, + scan_qr_codes: false, } } } @@ -40599,6 +40606,7 @@ impl IntoValue for SpamSettings { Property::SpamFilterRulesUrl, self.spam_filter_rules_url.into_value(), ); + map.insert_unchecked(Property::ScanQrCodes, self.scan_qr_codes.into_value()); JmapValue::Object(map) } } @@ -40617,6 +40625,7 @@ impl RegistryJsonPropertyPatch for SpamSettings { Some(Property::ScoreReject) => self.score_reject.patch(pointer, value), Some(Property::ScoreSpam) => self.score_spam.patch(pointer, value), Some(Property::TrustReplies) => self.trust_replies.patch(pointer, value), + Some(Property::ScanQrCodes) => self.scan_qr_codes.patch(pointer, value), Some(Property::SpamFilterRulesUrl) => self .spam_filter_rules_url .patch(pointer.with_validators(&[StringValidator::Trim]), value), diff --git a/crates/spam-filter/Cargo.toml b/crates/spam-filter/Cargo.toml index 3a5561e7..53ebdc12 100644 --- a/crates/spam-filter/Cargo.toml +++ b/crates/spam-filter/Cargo.toml @@ -15,7 +15,7 @@ inbuxa-features = { path = "../features" } smtp-proto = { version = "0.2", features = ["rkyv"] } mail-parser = { version = "0.11", features = ["full_encoding"] } mail-auth = { version = "0.13" } -tokio = { version = "1.53", features = ["net", "macros"] } +tokio = { version = "1.53", features = ["net", "macros", "rt"] } futures = "0.3" psl = "2" hyper = { version = "1.11.1", features = ["server", "http1", "http2"] } @@ -30,6 +30,10 @@ rkyv = { version = "0.8.18", features = ["little_endian"] } serde = { version = "1.0", features = ["derive"]} unicode-general-category = "1.1.0" unicode-normalization = "0.1.25" +# inbuxa: #401, links in QR codes: the four image formats mail uses, and a +# QR reader that takes greyscale pixels (no image dependency of its own) +image = { version = "0.25", default-features = false, features = ["png", "jpeg", "gif", "webp"] } +rqrr = { version = "0.11", default-features = false } [features] test_mode = [] diff --git a/crates/spam-filter/src/analysis/mod.rs b/crates/spam-filter/src/analysis/mod.rs index 097a0d20..595bf4b6 100644 --- a/crates/spam-filter/src/analysis/mod.rs +++ b/crates/spam-filter/src/analysis/mod.rs @@ -31,6 +31,7 @@ pub mod messageid; pub mod mime; mod mime_types; pub mod pyzor; +pub mod qr; // inbuxa: #401, links in QR codes pub mod received; pub mod recipient; pub mod replyto; diff --git a/crates/spam-filter/src/analysis/qr.rs b/crates/spam-filter/src/analysis/qr.rs new file mode 100644 index 00000000..59e90323 --- /dev/null +++ b/crates/spam-filter/src/analysis/qr.rs @@ -0,0 +1,313 @@ +/* + * SPDX-FileCopyrightText: 2026 Coffey Labs LLC + * + * SPDX-License-Identifier: AGPL-3.0-only + */ + +//! inbuxa: #401: links in QR codes in a message's images ("quishing"). +//! +//! A phishing message can carry its link only as a QR code in an image, where +//! the URL checks, which read text, never see it. When `scanQrCodes` is on, +//! the images a message carries (image parts, and `data:` images in its HTML) +//! are read for QR codes, and the web links in them go through the same URL +//! checks as the message's other links, at location `qr_code`. +//! +//! Images come from the sender, so everything here is capped: which formats +//! are read (PNG, JPEG, GIF, WebP, sniffed from the bytes, not the declared +//! type), how many images, their size in bytes and pixels, how large they are +//! scanned, how many links are kept and how long a message may take. Decoding +//! runs on a blocking thread. + +use crate::{SpamFilterContext, TextPart, modules::html::HtmlToken, modules::html::SRC}; +use image::{ImageFormat, ImageReader, Limits}; +use mail_parser::PartType; +use std::io::Cursor; +use std::time::{Duration, Instant}; + +/// The most images read in one message +pub(crate) const MAX_IMAGES: usize = 4; +/// Images larger than this, in bytes, are skipped +pub(crate) const MAX_IMAGE_BYTES: usize = 4 * 1024 * 1024; +/// Images with more pixels than this are skipped before they're decoded +pub(crate) const MAX_PIXELS: u64 = 16_000_000; +/// Images with a side shorter than this (spacers, tracking pixels, icons) +/// can't hold a readable QR code and are skipped +pub(crate) const MIN_SIDE: u32 = 64; +/// Larger images are scaled down to this longest side before they're scanned +pub(crate) const SCAN_SIDE: u32 = 1600; +/// No image is started once a message has taken this long +pub(crate) const TIME_BUDGET: Duration = Duration::from_millis(1000); +/// The most links kept from one message's QR codes +pub(crate) const MAX_URLS: usize = 10; +/// Longer QR texts aren't treated as links +const MAX_URL_LEN: usize = 2048; + +/// The images in a message worth reading, copied so a blocking thread can +/// read them: image parts first, then `data:` images in HTML parts. +pub(crate) fn images(ctx: &SpamFilterContext<'_>) -> Vec> { + let mut images = Vec::new(); + + for part in &ctx.input.message.parts { + if images.len() >= MAX_IMAGES { + return images; + } + if let PartType::Binary(bytes) | PartType::InlineBinary(bytes) = &part.body + && is_candidate(bytes) + { + images.push(bytes.to_vec()); + } + } + + for part in &ctx.output.text_parts { + if let TextPart::Html { html_tokens, .. } = part { + for token in html_tokens { + if let HtmlToken::StartTag { attributes, .. } = token { + for (attr, value) in attributes { + if images.len() >= MAX_IMAGES { + return images; + } + if *attr == SRC + && let Some(bytes) = value.as_deref().and_then(data_image) + && is_candidate(&bytes) + { + images.push(bytes); + } + } + } + } + } + } + + images +} + +/// The bytes of a base64 `data:image/...` URL +fn data_image(value: &str) -> Option> { + let value = value.trim(); + let rest = value + .get(..11) + .filter(|scheme| scheme.eq_ignore_ascii_case("data:image/")) + .map(|_| &value[11..])?; + let (header, data) = rest.split_once(',')?; + if !header.to_ascii_lowercase().ends_with(";base64") + || data.len() > MAX_IMAGE_BYTES.div_ceil(3) * 4 + 4 + { + return None; + } + mail_parser::decoders::base64::base64_decode(data.as_bytes()) +} + +fn format(bytes: &[u8]) -> Option { + match infer::get(bytes)?.mime_type() { + "image/png" => Some(ImageFormat::Png), + "image/jpeg" => Some(ImageFormat::Jpeg), + "image/gif" => Some(ImageFormat::Gif), + "image/webp" => Some(ImageFormat::WebP), + _ => None, + } +} + +fn is_candidate(bytes: &[u8]) -> bool { + bytes.len() <= MAX_IMAGE_BYTES && format(bytes).is_some() +} + +/// The web links in the QR codes of these images, within the caps above +pub(crate) fn qr_urls(images: &[Vec]) -> Vec { + let started = Instant::now(); + let mut urls: Vec = Vec::new(); + + for image in images.iter().take(MAX_IMAGES) { + if started.elapsed() >= TIME_BUDGET || urls.len() >= MAX_URLS { + break; + } + for text in qr_texts(image) { + if let Some(url) = as_url(&text) + && !urls.contains(&url) + && urls.len() < MAX_URLS + { + urls.push(url); + } + } + } + + urls +} + +/// The texts of the QR codes in one image; nothing for an image that isn't +/// one of the four formats, is outside the size caps or doesn't decode +pub(crate) fn qr_texts(bytes: &[u8]) -> Vec { + let Some(format) = format(bytes).filter(|_| bytes.len() <= MAX_IMAGE_BYTES) else { + return vec![]; + }; + + // The dimensions come from the header, before anything is decoded + let Ok((width, height)) = + ImageReader::with_format(Cursor::new(bytes), format).into_dimensions() + else { + return vec![]; + }; + if width.min(height) < MIN_SIDE || u64::from(width) * u64::from(height) > MAX_PIXELS { + return vec![]; + } + + let mut reader = ImageReader::with_format(Cursor::new(bytes), format); + let mut limits = Limits::default(); + limits.max_image_width = Some(width); + limits.max_image_height = Some(height); + limits.max_alloc = Some(MAX_PIXELS * 4 + 16 * 1024 * 1024); + reader.limits(limits); + let Ok(image) = reader.decode() else { + return vec![]; + }; + + let image = if width.max(height) > SCAN_SIDE { + image.thumbnail(SCAN_SIDE, SCAN_SIDE) + } else { + image + }; + let luma = image.into_luma8(); + let (width, height) = luma.dimensions(); + let mut prepared = + rqrr::PreparedImage::prepare_from_greyscale(width as usize, height as usize, |x, y| { + luma.get_pixel(x as u32, y as u32).0[0] + }); + + prepared + .detect_grids() + .into_iter() + .filter_map(|grid| grid.decode().ok().map(|(_, text)| text)) + .collect() +} + +/// A QR code's text as a web link: only http and https, the way phones +/// open them +fn as_url(text: &str) -> Option { + let text = text.trim(); + if text.len() > MAX_URL_LEN || text.chars().any(|ch| ch.is_whitespace()) { + return None; + } + let scheme = text.split_once("://")?.0; + (scheme.eq_ignore_ascii_case("http") || scheme.eq_ignore_ascii_case("https")) + .then(|| text.to_string()) +} + +#[cfg(test)] +mod tests { + use super::*; + + // A QR code for the URL below, 287x287 PNG + static QR_PNG: &[u8] = include_bytes!("../../../../tests/resources/spam-filter/qr/phish.png"); + // The same code on a 480x640 JPEG flyer, and a JPEG with no code + static FLYER_JPG: &[u8] = + include_bytes!("../../../../tests/resources/spam-filter/qr/flyer.jpg"); + static NO_QR_JPG: &[u8] = + include_bytes!("../../../../tests/resources/spam-filter/qr/no-qr.jpg"); + const QR_URL: &str = "https://login-micros0ft-secure.example/verify?id=8f3a9c2b"; + + #[test] + fn reads_the_link_in_a_qr_code() { + assert_eq!(qr_texts(QR_PNG), vec![QR_URL.to_string()]); + assert_eq!(qr_urls(&[QR_PNG.to_vec()]), vec![QR_URL.to_string()]); + } + + #[test] + fn reads_a_photo_and_skips_one_without_a_code() { + assert_eq!(qr_texts(FLYER_JPG), vec![QR_URL.to_string()]); + assert!(qr_texts(NO_QR_JPG).is_empty()); + } + + #[test] + fn reads_a_data_url() { + let data = format!("data:image/png;base64,{}", base64_encode(QR_PNG)); + assert_eq!(data_image(&data).as_deref(), Some(QR_PNG)); + assert_eq!(data_image("data:text/html;base64,PGI+"), None); + assert_eq!(data_image("https://example.com/a.png"), None); + } + + #[test] + fn skips_what_it_must_not_read() { + // Not an image + assert!(qr_texts(b"%PDF-1.7 not an image").is_empty()); + assert!(!is_candidate(b"plain text")); + // Says it's a GIF, isn't one + assert!(qr_texts(b"GIF89a").is_empty()); + // Too many bytes + let mut big = QR_PNG.to_vec(); + big.resize(MAX_IMAGE_BYTES + 1, 0); + assert!(!is_candidate(&big)); + assert!(qr_texts(&big).is_empty()); + // Too many pixels: a PNG header claiming 5000x5000, never decoded + assert!(qr_texts(&png_header(5000, 5000)).is_empty()); + // Too small to hold a QR code + assert!(qr_texts(&png_header(32, 32)).is_empty()); + // Truncated image + assert!(qr_texts(&QR_PNG[..QR_PNG.len() / 2]).is_empty()); + } + + #[test] + fn keeps_only_web_links() { + assert_eq!( + as_url(" HTTPS://a.example/x "), + Some("HTTPS://a.example/x".into()) + ); + assert_eq!(as_url("http://a.example"), Some("http://a.example".into())); + assert_eq!(as_url("WIFI:S:home;T:WPA;P:secret;;"), None); + assert_eq!(as_url("tel:+15555550100"), None); + assert_eq!(as_url("javascript://x"), None); + assert_eq!(as_url("https://a.example/x y"), None); + assert_eq!( + as_url(&format!("https://a.example/{}", "x".repeat(MAX_URL_LEN))), + None + ); + } + + #[test] + fn caps_the_images_read() { + let many = vec![QR_PNG.to_vec(); MAX_IMAGES + 3]; + // Same link in every image: kept once + assert_eq!(qr_urls(&many), vec![QR_URL.to_string()]); + } + + fn png_header(width: u32, height: u32) -> Vec { + let mut out = b"\x89PNG\r\n\x1a\n\0\0\0\x0dIHDR".to_vec(); + out.extend_from_slice(&width.to_be_bytes()); + out.extend_from_slice(&height.to_be_bytes()); + out.extend_from_slice(&[8, 0, 0, 0, 0]); + let crc = crc32(&out[12..]); + out.extend_from_slice(&crc.to_be_bytes()); + out + } + + fn crc32(bytes: &[u8]) -> u32 { + let mut crc = 0xffff_ffffu32; + for byte in bytes { + crc ^= u32::from(*byte); + for _ in 0..8 { + crc = if crc & 1 != 0 { + (crc >> 1) ^ 0xedb8_8320 + } else { + crc >> 1 + }; + } + } + !crc + } + + fn base64_encode(bytes: &[u8]) -> String { + const TABLE: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + let mut out = String::new(); + for chunk in bytes.chunks(3) { + let n = (u32::from(chunk[0]) << 16) + | (u32::from(*chunk.get(1).unwrap_or(&0)) << 8) + | u32::from(*chunk.get(2).unwrap_or(&0)); + for i in 0..4 { + if i <= chunk.len() { + out.push(TABLE[(n >> (18 - 6 * i) & 63) as usize] as char); + } else { + out.push('='); + } + } + } + out + } +} diff --git a/crates/spam-filter/src/analysis/url.rs b/crates/spam-filter/src/analysis/url.rs index bcf0cb75..fe89199d 100644 --- a/crates/spam-filter/src/analysis/url.rs +++ b/crates/spam-filter/src/analysis/url.rs @@ -178,6 +178,23 @@ impl SpamFilterAnalyzeUrl for Server { urls.extend(inferred_urls); + // inbuxa: #401, the web links in QR codes in the message's images go + // through the same checks, at location qr_code + if self.core.spam.scan_qr_codes { + let images = super::qr::images(ctx); + if !images.is_empty() { + let found = tokio::task::spawn_blocking(move || super::qr::qr_urls(&images)) + .await + .unwrap_or_default(); + if !found.is_empty() { + ctx.result.add_tag("QR_CODE_URL"); + for url in found { + urls.insert(ElementLocation::new(UrlParts::new(url), Location::QrCode)); + } + } + } + } + if !ctx.input.is_train { let mut redirected_urls = HashSet::new(); let mut trusted_domains: HashSet = HashSet::new(); diff --git a/resources/schema/schema.json.gz b/resources/schema/schema.json.gz index 9b0cb7a9..0e1fb7b7 100644 Binary files a/resources/schema/schema.json.gz and b/resources/schema/schema.json.gz differ diff --git a/resources/schema/schema.json.sha256 b/resources/schema/schema.json.sha256 index 8ef9f0b9..40e614d9 100644 --- a/resources/schema/schema.json.sha256 +++ b/resources/schema/schema.json.sha256 @@ -1 +1 @@ -3kPB2eR8b9fyGhyDoSsRlB2AE3HhJrOzVnsdCpoURJY +T-xLEZBDmOur8knYrcWTKjFlDkKtBi2tqNsJDSCwWSw \ No newline at end of file diff --git a/resources/spam-filter/README.md b/resources/spam-filter/README.md index fb7c644b..5059bdcf 100644 --- a/resources/spam-filter/README.md +++ b/resources/spam-filter/README.md @@ -27,6 +27,7 @@ high-confidence spam categories, −3.0 for legitimate), which match | Revision | Change | |---|---| | `inbuxa.1` | Scores for the DKIM2 result tags the server already emits (`crates/spam-filter/src/analysis/dmarc.rs`): `DKIM2_ALLOW` −0.2, `DKIM2_REJECT` 1.0, and `DKIM2_NA`, `DKIM2_PERMFAIL`, `DKIM2_TEMPFAIL` 0.0. The values are spam-filter v3.0.3's. | +| `inbuxa.2` | `QR_CODE_URL` 0.0: the tag the URL checks add when a message's images hold a QR code with a web link (#401, `crates/spam-filter/src/analysis/qr.rs`). A QR code alone isn't a spam sign; its link is scored by the URL checks it goes through, at location `qr_code`. The tag is listed so an administrator can give it a score. | ## Changing the rules diff --git a/resources/spam-filter/spam-filter-rules.json.gz b/resources/spam-filter/spam-filter-rules.json.gz index 6ebc658b..85bbaaeb 100644 Binary files a/resources/spam-filter/spam-filter-rules.json.gz and b/resources/spam-filter/spam-filter-rules.json.gz differ diff --git a/tests/resources/smtp/antispam/url.test b/tests/resources/smtp/antispam/url.test index b9b0b8c0..3aea1209 100644 --- a/tests/resources/smtp/antispam/url.test +++ b/tests/resources/smtp/antispam/url.test @@ -149,3 +149,277 @@ Subject: Special offer An offer for world.com + +expect QR_CODE_URL SUSPICIOUS_URL + +Subject: scan to sign in +MIME-Version: 1.0 +Content-Type: multipart/related; boundary="b1" + +--b1 +Content-Type: text/plain + +Scan the code below to keep your mailbox. +--b1 +Content-Type: image/png +Content-Transfer-Encoding: base64 +Content-ID: + +iVBORw0KGgoAAAANSUhEUgAAAOcAAADnCAAAAADAnx78AAAFE0lEQVR4Ae3AA6AkWZbG8f937o3I +zKdyS2Oubdu2bdu2bdu2bWmMnpZKr54yMyLu+Xa3anqmhztr1a+a/xeC/x+C/x+C/x+C/x+C/x+C +/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C +/x+C/x+C/x8qL4T4VzIPJF4w80Digcxl4l/JvGDB/w/B/w/B/w/B/w/B/w/B/w+Vf5n5F4kXzFwm +LjP/SuZfJP5Fwf8Pwf8Pwf8Pwf8Pwf8Pwf8PlReZeD7Mv5K4zAAgHsi8YOL5MC+q4P+H4P+H4P+H +4P+H4P+H4P+Hyn8e83yYBzL/RYL/H4L/H4L/H4L/H4L/H4L/Hyr/ecRl5jLzfIgHMv9pgv8fgv8f +gv8fgv8fgv8fgv8fKi8y86ISDyQeyDyQAUBcJi4zz4f5dwn+fwj+fwj+fwj+fwj+fwj+f6j8y8S/ +jblMXGYuE5cZAAQA5jLxfIj/CMH/D8H/D8H/D8H/D8H/D8H/D5UXwvzbmBfMPB/i+TD/gYL/H4L/ +H4L/H4L/H4L/H4L/HyovhLjMPJC4zFwmHshcJi4zl5nLxGXmMvFA5oHEZeYycZn5dwn+fwj+fwj+ +fwj+fwj+fwj+f5D5F4nLzL9IXGaeD3GZeVGJBzIvmLjMvGDB/w/B/w/B/w/B/w/B/w/B/w+VF0Jc +Zp4PcZkBQABgLhMPZC4zDyQAMP8ic5m4zDyQeFEF/z8E/z8E/z8E/z8E/z8E/z/I/CuJy8zzIS4z +l4kHMg8kHshcJi4zl4kHMv8uwf8Pwf8Pwf8Pwf8Pwf8Pwf8PlRdCXGYuE5eZy8RlBgABgLlMPB/i +MvNABgDxohIAGADEA5kXLPj/Ifj/Ifj/Ifj/Ifj/Ifj/ofJCmOdDXGYeyAAgLjOXiReVuUxcJh7I +PB8CAHOZ+BcF/z8E/z8E/z8E/z8E/z8E/z9UXghxmbnMXCaeDwGAuUy8qAQA5oHMA4nLzGUGAPGv +FPz/EPz/EPz/EPz/EPz/EPz/UHkhzGXiX2QAEJeZ50O8YOIyc5l4wQQABgBxmfkXBf8/BP8/BP8/ +BP8/BP8/BP8/yLxg4vkwz4cAwDyQeCBzmbjMPJD4tzEvquD/h+D/h+D/h+D/h+D/h+D/h8oLYV5U +5oHEZeYy8XyIBzKXicvM8yFeMHGZecGC/x+C/x+C/x+C/x+C/x+C/x8qL4T4VzKXmcvEZeYy8XwY +AMTzIS4zD2QeSLyogv8fgv8fgv8fgv8fgv8fgv8fKv8y8y8SDyQuM5eJy8xl4jIDgHjBzPMhng/z +Lwr+fwj+fwj+fwj+fwj+fwj+f6i8yMTzYZ4P8y8SD2QuE5eJF8w8kHhRBf8/BP8/BP8/BP8/BP8/ +BP8/VP4TiMvMA4nLzPMhng/zQOKBBADmRRX8/xD8/xD8/xD8/xD8/xD8/1D5T2AuEw9kLhMvmLlM +PJB4IPF8iMvMCxb8/xD8/xD8/xD8/xD8/xD8/1B5kZl/F/F8mAcSl5kHMg8kADAPZP5Fwf8Pwf8P +wf8Pwf8Pwf8Pwf8PlX+Z+FcSl5nLxL+SeD7MZeaBxAOZFyz4/yH4/yH4/yH4/yH4/yH4/0Hm/4Xg +/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg +/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4d/BBNiiu+LZK0YAAAAAElFTkSuQmCC +--b1-- + +expect QR_CODE_URL SUSPICIOUS_URL + +Subject: scan to sign in (sent as octet-stream) +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="b1" + +--b1 +Content-Type: text/plain + +Scan the attached code. +--b1 +Content-Type: application/octet-stream; name="code.bin" +Content-Disposition: attachment; filename="code.bin" +Content-Transfer-Encoding: base64 + +iVBORw0KGgoAAAANSUhEUgAAAOcAAADnCAAAAADAnx78AAAFE0lEQVR4Ae3AA6AkWZbG8f937o3I +zKdyS2Oubdu2bdu2bdu2bWmMnpZKr54yMyLu+Xa3anqmhztr1a+a/xeC/x+C/x+C/x+C/x+C/x+C +/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C/x+C +/x+C/x+C/x8qL4T4VzIPJF4w80Digcxl4l/JvGDB/w/B/w/B/w/B/w/B/w/B/w+Vf5n5F4kXzFwm +LjP/SuZfJP5Fwf8Pwf8Pwf8Pwf8Pwf8Pwf8PlReZeD7Mv5K4zAAgHsi8YOL5MC+q4P+H4P+H4P+H +4P+H4P+H4P+Hyn8e83yYBzL/RYL/H4L/H4L/H4L/H4L/H4L/Hyr/ecRl5jLzfIgHMv9pgv8fgv8f +gv8fgv8fgv8fgv8fKi8y86ISDyQeyDyQAUBcJi4zz4f5dwn+fwj+fwj+fwj+fwj+fwj+f6j8y8S/ +jblMXGYuE5cZAAQA5jLxfIj/CMH/D8H/D8H/D8H/D8H/D8H/D5UXwvzbmBfMPB/i+TD/gYL/H4L/ +H4L/H4L/H4L/H4L/HyovhLjMPJC4zFwmHshcJi4zl5nLxGXmMvFA5oHEZeYycZn5dwn+fwj+fwj+ +fwj+fwj+fwj+f5D5F4nLzL9IXGaeD3GZeVGJBzIvmLjMvGDB/w/B/w/B/w/B/w/B/w/B/w+VF0Jc +Zp4PcZkBQABgLhMPZC4zDyQAMP8ic5m4zDyQeFEF/z8E/z8E/z8E/z8E/z8E/z/I/CuJy8zzIS4z +l4kHMg8kHshcJi4zl4kHMv8uwf8Pwf8Pwf8Pwf8Pwf8Pwf8PlRdCXGYuE5eZy8RlBgABgLlMPB/i +MvNABgDxohIAGADEA5kXLPj/Ifj/Ifj/Ifj/Ifj/Ifj/ofJCmOdDXGYeyAAgLjOXiReVuUxcJh7I +PB8CAHOZ+BcF/z8E/z8E/z8E/z8E/z8E/z9UXghxmbnMXCaeDwGAuUy8qAQA5oHMA4nLzGUGAPGv +FPz/EPz/EPz/EPz/EPz/EPz/UHkhzGXiX2QAEJeZ50O8YOIyc5l4wQQABgBxmfkXBf8/BP8/BP8/ +BP8/BP8/BP8/yLxg4vkwz4cAwDyQeCBzmbjMPJD4tzEvquD/h+D/h+D/h+D/h+D/h+D/h8oLYV5U +5oHEZeYy8XyIBzKXicvM8yFeMHGZecGC/x+C/x+C/x+C/x+C/x+C/x8qL4T4VzKXmcvEZeYy8XwY +AMTzIS4zD2QeSLyogv8fgv8fgv8fgv8fgv8fgv8fKv8y8y8SDyQuM5eJy8xl4jIDgHjBzPMhng/z +Lwr+fwj+fwj+fwj+fwj+fwj+f6i8yMTzYZ4P8y8SD2QuE5eJF8w8kHhRBf8/BP8/BP8/BP8/BP8/ +BP8/VP4TiMvMA4nLzPMhng/zQOKBBADmRRX8/xD8/xD8/xD8/xD8/xD8/1D5T2AuEw9kLhMvmLlM +PJB4IPF8iMvMCxb8/xD8/xD8/xD8/xD8/xD8/1B5kZl/F/F8mAcSl5kHMg8kADAPZP5Fwf8Pwf8P +wf8Pwf8Pwf8Pwf8PlX+Z+FcSl5nLxL+SeD7MZeaBxAOZFyz4/yH4/yH4/yH4/yH4/yH4/0Hm/4Xg +/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4fg +/4fg/4fg/4fg/4fg/4fg/4fg/4fg/4d/BBNiiu+LZK0YAAAAAElFTkSuQmCC +--b1-- + +expect QR_CODE_URL SUSPICIOUS_URL + +Subject: scan to sign in (data URL) +MIME-Version: 1.0 +Content-Type: text/html + +

Scan the code to keep your mailbox.

+ +expect + +Subject: a photo, no code +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="b1" + +--b1 +Content-Type: text/plain + +Here's the photo. +--b1 +Content-Type: image/jpeg +Content-Transfer-Encoding: base64 + +/9j/4AAQSkZJRgABAgAAAQABAAD/wAARCAEsAZADAREAAhEBAxEB/9sAQwAKBwcIBwYKCAgICwoK +Cw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3LyYpNCkhIjBBMTQ5Oz4+PiUuRElDPEg3PT47/9sAQwEK +CwsODQ4cEBAcOygiKDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 +Ozs7Ozs7/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA +AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 +ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm +p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA +AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx +BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK +U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 +uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDyYLX1 +5zpjgKm5omOApXLTHAUrlpjgKVy0xwFK5aY4Clc0TFApXLTHAUrlpjgKVy0xwWkWmOApXNExwFK5 +aY4ClctMcBU3LTHAUrlpjgKVzRMcBSuWmKBSuWmOApXLTHAUi0xwFK5omOC0rlpjgtK5aY4ClctM +cBSuWmOApXNExwFTctMcBSuWmOApXLTFApFpjgKVzRM4QLX0R+NpjgKm5omOApXLTHAUrlpjgKVy +0xwFK5aY4Clc0TFApXLTHAUrlpjgKVy0xwWkWmOApXNExwFK5aY4ClctMcBU3LTHAUrlpjgKVzRM +cBSuWmYQFejc+GTHAVJaY4ClctMcBSuWmKBSuaJjgKVy0xwFK5aY4ClctMcBSuWmOApXNExwFK5a +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 +--b1-- diff --git a/tests/resources/spam-filter/qr/flyer.jpg b/tests/resources/spam-filter/qr/flyer.jpg new file mode 100644 index 00000000..fac5b294 Binary files /dev/null and b/tests/resources/spam-filter/qr/flyer.jpg differ diff --git a/tests/resources/spam-filter/qr/ip-link.png b/tests/resources/spam-filter/qr/ip-link.png new file mode 100644 index 00000000..49dfc2c2 Binary files /dev/null and b/tests/resources/spam-filter/qr/ip-link.png differ diff --git a/tests/resources/spam-filter/qr/no-qr.jpg b/tests/resources/spam-filter/qr/no-qr.jpg new file mode 100644 index 00000000..c33717c7 Binary files /dev/null and b/tests/resources/spam-filter/qr/no-qr.jpg differ diff --git a/tests/resources/spam-filter/qr/phish.png b/tests/resources/spam-filter/qr/phish.png new file mode 100644 index 00000000..10ce8f50 Binary files /dev/null and b/tests/resources/spam-filter/qr/phish.png differ diff --git a/tests/src/smtp/inbound/antispam.rs b/tests/src/smtp/inbound/antispam.rs index 1d3d4ff4..68799c1e 100644 --- a/tests/src/smtp/inbound/antispam.rs +++ b/tests/src/smtp/inbound/antispam.rs @@ -86,6 +86,8 @@ async fn antispam() { // (resources/spam-filter/), the path production takes; // SPAM_RULES_URL tests another set. spam_filter_rules_url: std::env::var("SPAM_RULES_URL").ok(), + // inbuxa: #401, the url tests read QR codes in images + scan_qr_codes: true, ..Default::default() }) .await;