Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 13:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
link2xt
2026-03-04 14:11:06 +00:00
committed by l
parent 8ff8ba7416
commit 89b5675b83
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/qr/dclogin_scheme.rs
View File

@@ -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
@@ -333,6 +338,18 @@ mod test {
Ok(())
}
#[test]
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(