diff --git a/README.md b/README.md index 0712173d..6a76f70a 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ All documentation is available at [stalw.art/docs/get-started](https://stalw.art ## Support If you are having problems running Stalwart Mail Server, you found a bug or just have a question, -do not hesitate to reach us on [Github Discussions](https://github.com/stalwartlabs/mail-server/discussions), +do not hesitate to reach us on [GitHub Discussions](https://github.com/stalwartlabs/mail-server/discussions), [Reddit](https://www.reddit.com/r/stalwartlabs), [Discord](https://discord.gg/aVQr3jF8jd) or [Matrix](https://matrix.to/#/#stalwart:matrix.org). Additionally you may purchase a subscription to obtain priority support from Stalwart Labs Ltd. diff --git a/crates/common/src/config/jmap/capabilities.rs b/crates/common/src/config/jmap/capabilities.rs index c922c502..df7f58ed 100644 --- a/crates/common/src/config/jmap/capabilities.rs +++ b/crates/common/src/config/jmap/capabilities.rs @@ -18,7 +18,7 @@ use utils::{config::Config, map::vec_map::VecMap}; use super::settings::JmapConfig; impl JmapConfig { - pub fn add_capabilites(&mut self, config: &mut Config) { + pub fn add_capabilities(&mut self, config: &mut Config) { // Add core capabilities self.capabilities.session.append( Capability::Core, diff --git a/crates/common/src/config/jmap/settings.rs b/crates/common/src/config/jmap/settings.rs index 580bcd94..79dc965e 100644 --- a/crates/common/src/config/jmap/settings.rs +++ b/crates/common/src/config/jmap/settings.rs @@ -436,7 +436,7 @@ impl JmapConfig { }; // Add capabilities - jmap.add_capabilites(config); + jmap.add_capabilities(config); jmap } } diff --git a/crates/common/src/config/smtp/session.rs b/crates/common/src/config/smtp/session.rs index d9698dd0..06606b66 100644 --- a/crates/common/src/config/smtp/session.rs +++ b/crates/common/src/config/smtp/session.rs @@ -113,7 +113,7 @@ pub struct Rcpt { // Limits pub max_recipients: IfBlock, - // Catch-all and sub-adressing + // Catch-all and sub-addressing pub catch_all: AddressMapping, pub subaddressing: AddressMapping, } diff --git a/crates/imap-proto/src/protocol/capability.rs b/crates/imap-proto/src/protocol/capability.rs index c73be683..224471be 100644 --- a/crates/imap-proto/src/protocol/capability.rs +++ b/crates/imap-proto/src/protocol/capability.rs @@ -96,7 +96,7 @@ impl Capability { } pub fn all_capabilities(is_authenticated: bool, is_tls: bool) -> Vec { - let mut capabilties = vec![ + let mut capabilities = vec![ Capability::IMAP4rev2, Capability::IMAP4rev1, Capability::Enable, @@ -107,7 +107,7 @@ impl Capability { ]; if is_authenticated { - capabilties.extend([ + capabilities.extend([ Capability::Idle, Capability::Namespace, Capability::Children, @@ -135,16 +135,16 @@ impl Capability { Capability::Preview, ]); } else { - capabilties.extend([ + capabilities.extend([ Capability::Auth(Mechanism::OAuthBearer), Capability::Auth(Mechanism::Plain), ]); } if !is_tls { - capabilties.push(Capability::StartTLS); + capabilities.push(Capability::StartTLS); } - capabilties + capabilities } } diff --git a/crates/smtp/src/outbound/delivery.rs b/crates/smtp/src/outbound/delivery.rs index 72d25ed4..876275b2 100644 --- a/crates/smtp/src/outbound/delivery.rs +++ b/crates/smtp/src/outbound/delivery.rs @@ -767,7 +767,7 @@ impl DeliveryAttempt { } // Say EHLO - let capabilties = match say_helo(&mut smtp_client, ¶ms).await { + let capabilities = match say_helo(&mut smtp_client, ¶ms).await { Ok(capabilities) => capabilities, Err(status) => { tracing::info!( @@ -794,7 +794,7 @@ impl DeliveryAttempt { smtp_client, tls_connector, envelope.mx, - &capabilties, + &capabilities, ) .await { diff --git a/crates/smtp/src/outbound/mod.rs b/crates/smtp/src/outbound/mod.rs index c1083137..a543f3e8 100644 --- a/crates/smtp/src/outbound/mod.rs +++ b/crates/smtp/src/outbound/mod.rs @@ -38,7 +38,7 @@ impl Status<(), Error> { mail_send::Error::Io(_) | mail_send::Error::Tls(_) | mail_send::Error::Base64(_) - | mail_send::Error::UnparseableReply + | mail_send::Error::UnparsableReply | mail_send::Error::AuthenticationFailed(_) | mail_send::Error::MissingCredentials | mail_send::Error::MissingMailFrom diff --git a/crates/smtp/src/outbound/session.rs b/crates/smtp/src/outbound/session.rs index c4c4bd07..0c1b2861 100644 --- a/crates/smtp/src/outbound/session.rs +++ b/crates/smtp/src/outbound/session.rs @@ -258,7 +258,7 @@ impl Message { } } else { // Handle LMTP responses - match read_lmtp_data_respone( + match read_lmtp_data_response( &mut smtp_client, params.hostname, accepted_rcpts.len(), @@ -481,7 +481,7 @@ pub async fn read_smtp_data_response( }) } -pub async fn read_lmtp_data_respone( +pub async fn read_lmtp_data_response( smtp_client: &mut SmtpClient, hostname: &str, num_responses: usize, diff --git a/crates/smtp/src/reporting/dmarc.rs b/crates/smtp/src/reporting/dmarc.rs index efebba6a..d947d53e 100644 --- a/crates/smtp/src/reporting/dmarc.rs +++ b/crates/smtp/src/reporting/dmarc.rs @@ -240,7 +240,7 @@ impl Session { } } - // Send agregate reports + // Send aggregate reports let interval = self .core .core diff --git a/crates/smtp/src/reporting/mod.rs b/crates/smtp/src/reporting/mod.rs index e5dda014..6d3f320e 100644 --- a/crates/smtp/src/reporting/mod.rs +++ b/crates/smtp/src/reporting/mod.rs @@ -196,7 +196,7 @@ impl SMTP { pub async fn schedule_report(&self, report: impl Into) { if self.inner.report_tx.send(report.into()).await.is_err() { - tracing::warn!(contex = "report", "Channel send failed."); + tracing::warn!(context = "report", "Channel send failed."); } } diff --git a/resources/config/spamfilter.toml b/resources/config/spamfilter.toml index e07edc7a..ebdc8883 100644 --- a/resources/config/spamfilter.toml +++ b/resources/config/spamfilter.toml @@ -611,7 +611,7 @@ if eval "!is_empty(rto_raw)" { } } else { - let "t.REPLYTO_UNPARSEABLE" "1"; + let "t.REPLYTO_UNPARSABLE" "1"; } if eval "is_ascii(header.reply-to) && contains(rto_raw, '=?') && contains(rto_raw, '?=')" { @@ -2793,7 +2793,7 @@ spam-scores = {"ABUSE_SURBL" = "5.0", "REPLYTO_EQ_TO_ADDR" = "5.0", "REPLYTO_EXCESS_BASE64" = "1.5", "REPLYTO_EXCESS_QP" = "1.2", -"REPLYTO_UNPARSEABLE" = "1.0", +"REPLYTO_UNPARSABLE" = "1.0", "RWL_MAILSPIKE_EXCELLENT" = "-0.4", "RWL_MAILSPIKE_GOOD" = "-0.1", "RWL_MAILSPIKE_NEUTRAL" = "0.0", diff --git a/resources/config/spamfilter/maps/scores.map b/resources/config/spamfilter/maps/scores.map index 3ed1d0dd..9dad8564 100644 --- a/resources/config/spamfilter/maps/scores.map +++ b/resources/config/spamfilter/maps/scores.map @@ -270,7 +270,7 @@ spam-scores = {"ABUSE_SURBL" = "5.0", "REPLYTO_EQ_TO_ADDR" = "5.0", "REPLYTO_EXCESS_BASE64" = "1.5", "REPLYTO_EXCESS_QP" = "1.2", -"REPLYTO_UNPARSEABLE" = "1.0", +"REPLYTO_UNPARSABLE" = "1.0", "RWL_MAILSPIKE_EXCELLENT" = "-0.4", "RWL_MAILSPIKE_GOOD" = "-0.1", "RWL_MAILSPIKE_NEUTRAL" = "0.0", diff --git a/resources/config/spamfilter/scripts/replyto.sieve b/resources/config/spamfilter/scripts/replyto.sieve index 8e2d2079..bf0ef348 100644 --- a/resources/config/spamfilter/scripts/replyto.sieve +++ b/resources/config/spamfilter/scripts/replyto.sieve @@ -59,7 +59,7 @@ if eval "!is_empty(rto_raw)" { } } else { - let "t.REPLYTO_UNPARSEABLE" "1"; + let "t.REPLYTO_UNPARSABLE" "1"; } if eval "is_ascii(header.reply-to) && contains(rto_raw, '=?') && contains(rto_raw, '?=')" { diff --git a/tests/resources/jmap/sieve/test_mailbox.sieve b/tests/resources/jmap/sieve/test_mailbox.sieve index 590c0db0..2bd9ddba 100644 --- a/tests/resources/jmap/sieve/test_mailbox.sieve +++ b/tests/resources/jmap/sieve/test_mailbox.sieve @@ -15,7 +15,7 @@ if specialuse_exists "dingleberry" { } if specialuse_exists "archive" { - error "A non-existant special-use exists."; + error "A non-existent special-use exists."; } # MailboxId tests diff --git a/tests/resources/smtp/antispam/replyto.test b/tests/resources/smtp/antispam/replyto.test index c7ec2b68..5980fe97 100644 --- a/tests/resources/smtp/antispam/replyto.test +++ b/tests/resources/smtp/antispam/replyto.test @@ -1,4 +1,4 @@ -expect REPLYTO_UNPARSEABLE +expect REPLYTO_UNPARSABLE Reply-to: hello diff --git a/tests/src/jmap/auth_acl.rs b/tests/src/jmap/auth_acl.rs index 19d169dd..fa127bde 100644 --- a/tests/src/jmap/auth_acl.rs +++ b/tests/src/jmap/auth_acl.rs @@ -180,7 +180,7 @@ pub async fn test(params: &mut JMAPTest) { .await .unwrap(); - // John shoud have ReadItems access to Inbox + // John should have ReadItems access to Inbox assert_eq!( john_client .set_default_account_id(&jane_id.to_string()) diff --git a/tests/src/jmap/delivery.rs b/tests/src/jmap/delivery.rs index ebf9527b..bcf90262 100644 --- a/tests/src/jmap/delivery.rs +++ b/tests/src/jmap/delivery.rs @@ -498,7 +498,7 @@ impl SmtpConnection { pub trait AssertResult: Sized { fn assert_contains(self, text: &str) -> Self; - fn assert_count(self, text: &str, occurences: usize) -> Self; + fn assert_count(self, text: &str, occurrences: usize) -> Self; fn assert_equals(self, text: &str) -> Self; } @@ -512,12 +512,12 @@ impl AssertResult for Vec { panic!("Expected response to contain {:?}, got {:?}", text, self); } - fn assert_count(self, text: &str, occurences: usize) -> Self { + fn assert_count(self, text: &str, occurrences: usize) -> Self { assert_eq!( self.iter().filter(|l| l.contains(text)).count(), - occurences, + occurrences, "Expected {} occurrences of {:?}, found {}.", - occurences, + occurrences, text, self.iter().filter(|l| l.contains(text)).count() ); diff --git a/tests/src/smtp/inbound/dmarc.rs b/tests/src/smtp/inbound/dmarc.rs index 09d1f47d..4c093a95 100644 --- a/tests/src/smtp/inbound/dmarc.rs +++ b/tests/src/smtp/inbound/dmarc.rs @@ -290,7 +290,7 @@ async fn dmarc() { .await; qr.assert_no_events(); - // Messagess passing DMARC should be accepted + // Messages passing DMARC should be accepted session .send_message( "bill@example.com", diff --git a/tests/src/smtp/inbound/mail.rs b/tests/src/smtp/inbound/mail.rs index 5d422d07..9f0da043 100644 --- a/tests/src/smtp/inbound/mail.rs +++ b/tests/src/smtp/inbound/mail.rs @@ -303,7 +303,7 @@ async fn mail() { assert_eq!(session.data.future_release, 10); session.rset().await; - // Test FUTURERELEASE extension with invalud HOLDUNTIL value + // Test FUTURERELEASE extension with invalid HOLDUNTIL value session .ingest(format!("MAIL FROM: HOLDUNTIL={}\r\n", now + 99999).as_bytes()) .await diff --git a/tests/src/smtp/lookup/sql.rs b/tests/src/smtp/lookup/sql.rs index e97a7453..416057f9 100644 --- a/tests/src/smtp/lookup/sql.rs +++ b/tests/src/smtp/lookup/sql.rs @@ -220,7 +220,7 @@ async fn lookup_sql() { // External domain session.rcpt_to("user@otherdomain.org", "550 5.1.2").await; - // Non-existant user + // Non-existent user session.rcpt_to("jack@foobar.org", "550 5.1.2").await; // Valid users