Personal AI, On Personal Devices
Python
fix(skills): satisfy Clippy + reject non-ASCII hex + add regression tests
krypticmouse4177b5c50e3e
diff --git a/rust/crates/openjarvis-python/src/skills.rs b/rust/crates/openjarvis-python/src/skills.rsindex 7f9cea4a..940c43d7 100644--- a/rust/crates/openjarvis-python/src/skills.rs+++ b/rust/crates/openjarvis-python/src/skills.rs@@ -48,20 +48,29 @@ impl PySkillManifest {}fn verify_signature(&self, public_key_hex: &str) -> bool {- if public_key_hex.len() % 2 != 0 {- return false;+ match parse_public_key_hex(public_key_hex) {+ Some(key_bytes) => openjarvis_skills::verify_signature(&self.inner, &key_bytes),+ None => false,}+ }+}- let mut key_bytes = Vec::with_capacity(public_key_hex.len() / 2);- for i in (0..public_key_hex.len()).step_by(2) {- match u8::from_str_radix(&public_key_hex[i..i + 2], 16) {- Ok(byte) => key_bytes.push(byte),- Err(_) => return false,- }- }+fn parse_public_key_hex(public_key_hex: &str) -> Option<Vec<u8>> {+ if !public_key_hex.len().is_multiple_of(2) {+ return None;+ }+ if !public_key_hex.is_ascii() {+ return None;+ }- openjarvis_skills::verify_signature(&self.inner, &key_bytes)+ let mut key_bytes = Vec::with_capacity(public_key_hex.len() / 2);+ for i in (0..public_key_hex.len()).step_by(2) {+ match u8::from_str_radix(&public_key_hex[i..i + 2], 16) {+ Ok(byte) => key_bytes.push(byte),+ Err(_) => return None,+ }}+ Some(key_bytes)}#[pyfunction]@@ -70,3 +79,50 @@ pub fn load_skill(toml_str: &str) -> PyResult<PySkillManifest> {.map_err(|e| PyErr::new::<pyo3::exceptions::PyValueError, _>(e))?;Ok(PySkillManifest { inner: manifest })}++#[cfg(test)]+mod tests {+ use super::parse_public_key_hex;++ #[test]+ fn empty_input_returns_empty_vec() {+ assert_eq!(parse_public_key_hex(""), Some(Vec::new()));+ }++ #[test]+ fn valid_hex_decodes() {+ assert_eq!(+ parse_public_key_hex("0a1b2cFF"),+ Some(vec![0x0a, 0x1b, 0x2c, 0xff])+ );+ }++ #[test]+ fn odd_length_rejected_without_panic() {+ // Regression: the pre-fix implementation sliced public_key_hex[i..i+2]+ // on an odd-length string, triggering an out-of-bounds panic and a+ // DoS vector when the input was attacker-controlled.+ assert_eq!(parse_public_key_hex("0"), None);+ assert_eq!(parse_public_key_hex("abc"), None);+ assert_eq!(parse_public_key_hex("0a1b2"), None);+ }++ #[test]+ fn non_hex_chars_rejected() {+ // Pre-fix `filter_map` silently dropped non-hex chars and produced a+ // truncated key, which would also have caused verification surprises.+ assert_eq!(parse_public_key_hex("zz"), None);+ assert_eq!(parse_public_key_hex("0aZZ"), None);+ assert_eq!(parse_public_key_hex("gh"), None);+ }++ #[test]+ fn multibyte_utf8_rejected_without_panic() {+ // Pre-fix indexing public_key_hex[i..i+2] on a non-ASCII string could+ // split a multi-byte UTF-8 codepoint and panic. The ASCII-only check+ // makes the rejection explicit instead of relying on from_str_radix's+ // post-slice error path.+ assert_eq!(parse_public_key_hex("é"), None);+ assert_eq!(parse_public_key_hex("aaé"), None);+ }+}