Skip to content

fix: percent-decode the address in dclogin:// URLs #7948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
link2xt merged 2 commits into from
Mar 5, 2026
+28 −13
Merged

fix: percent-decode the address in dclogin:// URLs #7948

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecabd0c
refactor: `use super::*` in qr::dclogin_scheme
link2xt Mar 4, 2026
f97f8b4
fix: percent-decode the address in `dclogin://` URLs
link2xt Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions src/qr/dclogin_scheme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,14 @@ pub(super) fn decode_login(qr: &str) -> Result<Qr> {
.map(|(key, value)| (key.into_owned(), value.into_owned()))
.collect();

let addr = percent_encoding::percent_decode_str(addr)
.decode_utf8()
.context("Address must be UTF-8")?
.to_string();

// check if username is there
if !may_be_valid_addr(addr) {
bail!("invalid DCLOGIN payload: invalid username E5");
if !may_be_valid_addr(&addr) {
bail!("Invalid DCLOGIN payload: invalid username {addr:?}.");
}

// apply to result struct
Expand Down Expand Up @@ -200,9 +205,7 @@ pub(crate) fn login_param_from_login_qr(

#[cfg(test)]
mod test {
use anyhow::bail;

use super::{LoginOptions, decode_login};
use super::*;
use crate::{login_param::EnteredCertificateChecks, provider::Socket, qr::Qr};

macro_rules! login_options_just_pw {
Expand All @@ -225,7 +228,7 @@ mod test {
}

#[test]
fn minimal_no_options() -> anyhow::Result<()> {
fn minimal_no_options() -> Result<()> {
let result = decode_login("dclogin://email@host.tld?p=123&v=1")?;
if let Qr::Login { address, options } = result {
assert_eq!(address, "email@host.tld".to_owned());
Expand All @@ -250,7 +253,7 @@ mod test {
Ok(())
}
#[test]
fn minimal_no_options_no_double_slash() -> anyhow::Result<()> {
fn minimal_no_options_no_double_slash() -> Result<()> {
let result = decode_login("dclogin:email@host.tld?p=123&v=1")?;
if let Qr::Login { address, options } = result {
assert_eq!(address, "email@host.tld".to_owned());
Expand Down Expand Up @@ -289,7 +292,7 @@ mod test {
}

#[test]
fn version_too_new() -> anyhow::Result<()> {
fn version_too_new() -> Result<()> {
let result = decode_login("dclogin:email@host.tld/?p=123456&v=2")?;
if let Qr::Login { options, .. } = result {
assert_eq!(options, LoginOptions::UnsuportedVersion(2));
Expand All @@ -306,7 +309,7 @@ mod test {
}

#[test]
fn all_advanced_options() -> anyhow::Result<()> {
fn all_advanced_options() -> Result<()> {
let result = decode_login(
"dclogin:email@host.tld?p=secret&v=1&ih=imap.host.tld&ip=4000&iu=max&ipw=87654&is=ssl&ic=1&sh=mail.host.tld&sp=3000&su=max@host.tld&spw=3242HS&ss=plain&sc=3",
)?;
Expand Down Expand Up @@ -336,7 +339,19 @@ mod test {
}

#[test]
fn uri_encoded_password() -> anyhow::Result<()> {
fn uri_encoded_login() -> Result<()> {
let result = decode_login("dclogin:username@%5b192.168.1.1%5d?p=1234&v=1")?;
if let Qr::Login { address, options } = result {
assert_eq!(address, "username@[192.168.1.1]".to_owned());
assert_eq!(options, login_options_just_pw!("1234".to_owned()));
} else {
bail!("wrong type")
}
Ok(())
}

#[test]
fn uri_encoded_password() -> Result<()> {
let result = decode_login(
"dclogin:email@host.tld?p=%7BDaehFl%3B%22as%40%21fhdodn5%24234%22%7B%7Dfg&v=1",
)?;
Expand All @@ -353,7 +368,7 @@ mod test {
}

#[test]
fn email_with_plus_extension() -> anyhow::Result<()> {
fn email_with_plus_extension() -> Result<()> {
let result = decode_login("dclogin:usename+extension@host?p=1234&v=1")?;
if let Qr::Login { address, options } = result {
assert_eq!(address, "usename+extension@host".to_owned());
Expand All @@ -365,7 +380,7 @@ mod test {
}

#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_decode_dclogin_ipv4() -> anyhow::Result<()> {
async fn test_decode_dclogin_ipv4() -> Result<()> {
let result = decode_login("dclogin://test@[127.0.0.1]?p=1234&v=1")?;
if let Qr::Login { address, options } = result {
assert_eq!(address, "test@[127.0.0.1]".to_owned());
Expand All @@ -377,7 +392,7 @@ mod test {
}

#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_decode_dclogin_ipv6() -> anyhow::Result<()> {
async fn test_decode_dclogin_ipv6() -> Result<()> {
let result =
decode_login("dclogin://test@[2001:0db8:85a3:0000:0000:8a2e:0370:7334]?p=1234&v=1")?;
if let Qr::Login { address, options } = result {
Expand Down