address link2xt comments

This commit is contained in:
holger krekel
2026-07-22 20:36:35 +02:00
parent 3c171d539b
commit eccd5ce03a
6 changed files with 11 additions and 17 deletions

View File

@@ -168,7 +168,8 @@ impl From<Socket> for dc::Socket {
#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
#[serde(rename_all = "camelCase")]
pub enum EnteredCertificateChecks {
/// `Automatic` means strict certificate checks.
/// `Automatic` means strict certificate checks,
/// unless a legacy-domain override disables them.
#[default]
Automatic,

View File

@@ -576,7 +576,6 @@ impl Context {
let Some((transport_id, param)) = ConfiguredLoginParam::load(self).await? else {
bail!("Not configured");
};
// A relay advertising its own limit via IMAP METADATA is authoritative.
let metadata_limit = self
.metadata
.read()
@@ -586,10 +585,9 @@ impl Context {
if let Some(limit) = metadata_limit {
return Ok(limit);
}
// A few legacy domains (e.g. nauta.cu) need a hard-coded limit.
if let Some(limit) = crate::provider::legacy_settings_for_addr(&param.addr).max_smtp_rcpt_to
{
return Ok(limit as u32);
return Ok(limit);
}
Ok(constants::DEFAULT_MAX_SMTP_RCPT_TO)
}

View File

@@ -37,7 +37,8 @@ use crate::tools::ToOption;
#[repr(u32)]
#[strum(serialize_all = "snake_case")]
pub enum EnteredCertificateChecks {
/// `Automatic` means strict certificate checks.
/// `Automatic` means strict certificate checks,
/// unless a legacy-domain override disables them.
#[default]
Automatic = 0,

View File

@@ -69,7 +69,7 @@ pub(crate) struct LegacyProviderSettings {
pub autoconfig_servers: Option<Vec<ServerParams>>,
/// Maximum number of recipients allowed in a single SMTP send, if limited.
pub max_smtp_rcpt_to: Option<usize>,
pub max_smtp_rcpt_to: Option<u32>,
/// Whether to disable strict TLS certificate checks by default.
pub disable_strict_tls: bool,

View File

@@ -1117,9 +1117,7 @@ UPDATE chats SET protected=1, type=120 WHERE type=130;"#,
.await?;
}
if dbversion < 71 {
sql.set_db_version(71).await?;
}
// Migration 71 was removed together with the provider database it read from.
if dbversion < 72 && !sql.col_exists("msgs", "mime_modified").await? {
sql.execute_migration(
r#"

View File

@@ -92,7 +92,8 @@ pub(crate) enum ConfiguredCertificateChecks {
/// Alias to `AcceptInvalidCertificates` for compatibility.
AcceptInvalidCertificates2 = 3,
/// Apply strict checks to TLS certificates.
/// Apply strict checks to TLS certificates,
/// unless a legacy-domain override disables them.
Automatic = 4,
}
@@ -464,13 +465,8 @@ impl ConfiguredLoginParam {
let disable_strict_tls =
crate::provider::legacy_settings_for_addr(&self.addr).disable_strict_tls;
match self.certificate_checks {
ConfiguredCertificateChecks::OldAutomatic => {
if disable_strict_tls {
false
} else {
connected_through_proxy
}
}
ConfiguredCertificateChecks::OldAutomatic if disable_strict_tls => false,
ConfiguredCertificateChecks::OldAutomatic => connected_through_proxy,
ConfiguredCertificateChecks::Automatic => !disable_strict_tls,
ConfiguredCertificateChecks::Strict => true,
ConfiguredCertificateChecks::AcceptInvalidCertificates