Skip to content

fix(ssurl): use percent_decode_str for userinfo encoded data #985

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
merged 2 commits into from
Oct 26, 2022
Merged

fix(ssurl): use percent_decode_str for userinfo encoded data #985

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c5463
fix(ssurl): use `percent_decode_str` for `userinfo` encoded data
RAX7 Oct 25, 2022
679daa0
fix(ssurl): check base64 padding for correct config
zonyitoo Oct 26, 2022
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
26 changes: 24 additions & 2 deletions crates/shadowsocks/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use std::{
time::Duration,
};

use base64::{decode_config, encode_config, URL_SAFE_NO_PAD};
use base64::{decode_config, encode_config, URL_SAFE, URL_SAFE_NO_PAD};
use byte_string::ByteStr;
use bytes::Bytes;
use cfg_if::cfg_if;
Expand Down Expand Up @@ -668,7 +668,29 @@ impl ServerConfig {
(m, p)
}
None => {
let account = match decode_config(user_info, URL_SAFE_NO_PAD) {
// userinfo is not required to be percent encoded, but some implementation did.
// If the base64 library have padding = added to the encoded string, then it will become %3D.

let decoded_user_info = match percent_encoding::percent_decode_str(user_info).decode_utf8() {
Ok(m) => m,
Err(err) => {
error!("failed to parse percent-encoded userinfo, err: {}", err);
return Err(UrlParseError::InvalidAuthInfo);
}
};

// reborrow to fit AsRef<[u8]>
let decoded_user_info: &str = &decoded_user_info;

let base64_config = if decoded_user_info.ends_with('=') {
// Some implementation, like outline,
// or those with Python (base64 in Python will still have '=' padding for URL safe encode)
URL_SAFE
} else {
URL_SAFE_NO_PAD
};

let account = match decode_config(decoded_user_info, base64_config) {
Ok(account) => match String::from_utf8(account) {
Ok(ac) => ac,
Err(..) => return Err(UrlParseError::InvalidAuthInfo),
Expand Down