Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-26 01:46:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: decode dcaccount:// URLs and error out on empty URLs early

Browse Source 
The problem was reported at
<https://support.delta.chat/t/could-not-find-dns-resolutions-for-imap-993-when-adding-a-relay/4907>

iOS typically transforms `:` into `://`,
we already handle this in `dclogin` URLs,
so handle it for `dcaccount` as well.
This commit is contained in:
link2xt
2026-03-15 20:17:41 +00:00
committed by l
parent cff0192e38
commit 52f4293bc5
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/qr.rs
View File

@@ -682,6 +682,12 @@ fn decode_account(qr: &str) -> Result<Qr> {
let payload = qr
.get(DCACCOUNT_SCHEME.len()..)
.context("Invalid DCACCOUNT payload")?;
// Handle `dcaccount://...` URLs.
let payload = payload.strip_prefix("//").unwrap_or(payload);
if payload.is_empty() {
bail!("dcaccount payload is empty");
}
if payload.starts_with("https://") {
let url = url::Url::parse(payload).context("Invalid account URL")?;
if url.scheme() == "https" {
@@ -695,6 +701,12 @@ fn decode_account(qr: &str) -> Result<Qr> {
bail!("Bad scheme for account URL: {:?}.", url.scheme());
}
} else {
if payload.starts_with("/") {
// Handle `dcaccount:///` URL reported to have been created
// by Telegram link parser at
// <https://support.delta.chat/t/could-not-find-dns-resolutions-for-imap-993-when-adding-a-relay/4907>
bail!("Hostname in dcaccount URL cannot start with /");
}
Ok(Qr::Account {
domain: payload.to_string(),
})

17
src/qr/qr_tests.rs
View File

@@ -721,7 +721,9 @@ async fn test_decode_account() -> Result<()> {
for text in [
"DCACCOUNT:example.org",
"DCACCOUNT://example.org",
"dcaccount:example.org",
"dcaccount://example.org",
"DCACCOUNT:https://example.org/new_email?t=1w_7wDjgjelxeX884x96v3",
"dcaccount:https://example.org/new_email?t=1w_7wDjgjelxeX884x96v3",
] {
@@ -737,6 +739,21 @@ async fn test_decode_account() -> Result<()> {
Ok(())
}
/// Tests that decoding empty `dcaccount://` URL results in an error.
/// We should not suggest trying to configure an account in this case.
/// Such links may be created by copy-paste error or because of incorrect parsing.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_decode_empty_account() -> Result<()> {
let ctx = TestContext::new().await;
for text in ["DCACCOUNT:", "dcaccount:", "dcaccount://", "dcaccount:///"] {
let qr = check_qr(&ctx.ctx, text).await;
assert!(qr.is_err(), "Invalid {text:?} is parsed as dcaccount URL");
}
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_decode_tg_socks_proxy() -> Result<()> {
let t = TestContext::new().await;