From 8406235c208ba1517f5cc9e5b38db1012d896532 Mon Sep 17 00:00:00 2001
From: Richard Walters <rwalters@digitalstirling.com>
Date: Wed, 7 Oct 2020 18:09:59 -0700
Subject: (Rust) Make setting scheme fallible by checking for invalid
characters
---
src/lib.rs | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index 5323fa8..819abf6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1090,10 +1090,15 @@ impl Uri {
self.query = query.map(|q| q.into());
}
- pub fn set_scheme<T>(&mut self, scheme: Option<T>)
+ pub fn set_scheme<T>(&mut self, scheme: Option<T>) -> Result<(), Error>
where String: From<T>
{
- self.scheme = scheme.map(|s| s.into());
+ let scheme: Option<String> = scheme.map(|s| s.into());
+ if let Some(scheme) = &scheme {
+ Self::check_scheme(scheme)?;
+ }
+ self.scheme = scheme;
+ Ok(())
}
fn split_authority_from_path_and_parse_them(
@@ -2008,7 +2013,7 @@ mod tests {
];
for test_vector in &test_vectors {
let mut uri = Uri::default();
- uri.set_scheme(test_vector.scheme);
+ assert!(uri.set_scheme(test_vector.scheme).is_ok());
#[allow(unused_parens)]
if (
test_vector.userinfo.is_some()
@@ -2108,4 +2113,20 @@ mod tests {
assert_eq!(uri.to_string(), "?foo%2Bbar");
}
+ #[test]
+ fn set_illegal_schemes() {
+ let test_vectors = [
+ "ab_de",
+ "ab/de",
+ "ab:de",
+ "",
+ "&",
+ "foo&bar",
+ ];
+ for test_vector in &test_vectors {
+ let mut uri = Uri::default();
+ assert!(uri.set_scheme(Some(*test_vector)).is_err());
+ }
+ }
+
}
--
cgit v1.2.3