Skip to content

fix(rpc): accept jwt's starting with 0x #1589

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
onbjerg merged 2 commits into from
Feb 28, 2023
Merged

fix(rpc): accept jwt's starting with 0x #1589

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3dace
fix(rpc): accept JWTs starting with `0x`
palango Feb 28, 2023
e83ae1c
docs: note `0x` stripping
onbjerg Feb 28, 2023
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
12 changes: 11 additions & 1 deletion crates/rpc/rpc/src/layers/jwt_secret.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ impl JwtSecret {
/// Returns an error if one of the following applies:
/// - `hex` is not a valid hexadecimal string
/// - `hex` argument length is less than `JWT_SECRET_LEN`
///
/// This strips the leading `0x`, if any.
pub fn from_hex<S: AsRef<str>>(hex: S) -> Result<Self, JwtError> {
let hex: &str = hex.as_ref().trim();
let hex: &str = hex.as_ref().trim().trim_start_matches("0x");
if hex.len() != JWT_SECRET_LEN {
Err(JwtError::InvalidLength(JWT_SECRET_LEN, hex.len()))
} else {
Expand Down Expand Up @@ -212,6 +214,14 @@ mod tests {
assert_eq!(hex.len(), expected_len);
}

#[test]
fn creation_ok_hex_string_with_0x() {
let hex: String =
"0x7365637265747365637265747365637265747365637265747365637265747365".into();
let result = JwtSecret::from_hex(hex);
assert!(matches!(result, Ok(_)));
}

#[test]
fn creation_error_wrong_len() {
let hex = "f79ae8046";
Expand Down