Skip to content
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

Jump to bottom

Fix Bytes deserialization for unicode values #695

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Fix Bytes deserialization for unicode values #695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 27 additions & 2 deletions src/types/bytes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ impl<'a> Visitor<'a> for BytesVisitor {
where
E: Error,
{
if value.len() >= 2 && &value[0..2] == "0x" {
let bytes = hex::decode(&value[2..]).map_err(|e| Error::custom(format!("Invalid hex: {}", e)))?;
if let Some(value) = value.strip_prefix("0x") {
let bytes = hex::decode(value).map_err(|e| Error::custom(format!("Invalid hex: {}", e)))?;
Ok(Bytes(bytes))
} else {
Err(Error::invalid_value(Unexpected::Str(value), &"0x prefix"))
Expand All @@ -69,3 +69,28 @@ impl<'a> Visitor<'a> for BytesVisitor {
self.visit_str(value.as_ref())
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn deserialize() {
assert_eq!(serde_json::from_str::<Bytes>(r#""0x00""#).unwrap(), Bytes(vec![0x00]));
assert_eq!(
serde_json::from_str::<Bytes>(r#""0x0123456789AaBbCcDdEeFf""#).unwrap(),
Bytes(vec![0x01, 0x23, 0x45, 0x67, 0x89, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF])
);
assert_eq!(serde_json::from_str::<Bytes>(r#""0x""#).unwrap(), Bytes(vec![]));

assert!(serde_json::from_str::<Bytes>("0").is_err(), "Not a string");
assert!(serde_json::from_str::<Bytes>(r#""""#).is_err(), "Empty string");
assert!(serde_json::from_str::<Bytes>(r#""0xZZ""#).is_err(), "Invalid hex");
assert!(
serde_json::from_str::<Bytes>(r#""deadbeef""#).is_err(),
"Missing 0x prefix"
);
assert!(serde_json::from_str::<Bytes>(r#""数字""#).is_err(), "Non-ASCII");
assert!(serde_json::from_str::<Bytes>(r#""0x数字""#).is_err(), "Non-ASCII");
}
}