chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Emit error on non-UTF8 characters in path segments

Browse Source
This commit is contained in:
Donough Liu 2020-03-08 00:06:24 +08:00 committed by GitHub
parent e5e89b8929
commit c346b4f681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruma-api-macros/src/api.rs
View File

@ -151,9 +151,16 @@ impl ToTokens for Api {
use ruma_api::error::RequestDeserializationError; use ruma_api::error::RequestDeserializationError;
let segment = path_segments.get(#i).unwrap().as_bytes(); let segment = path_segments.get(#i).unwrap().as_bytes();
let decoded = let decoded = match ruma_api::exports::percent_encoding::percent_decode(
ruma_api::exports::percent_encoding::percent_decode(segment) segment
.decode_utf8_lossy(); ).decode_utf8() {
Ok(x) => x,
Err(err) => {
return Err(
RequestDeserializationError::new(err, request).into()
);
}
};
match std::convert::TryFrom::try_from(decoded.deref()) { match std::convert::TryFrom::try_from(decoded.deref()) {
Ok(val) => val, Ok(val) => val,
Err(err) => { Err(err) => {

9
src/error.rs
View File

@ -191,6 +191,7 @@ enum SerializationError {
#[doc(hidden)] #[doc(hidden)]
#[derive(Debug)] #[derive(Debug)]
pub enum DeserializationError { pub enum DeserializationError {
Utf8(std::str::Utf8Error),
Json(serde_json::Error), Json(serde_json::Error),
Query(serde_urlencoded::de::Error), Query(serde_urlencoded::de::Error),
Ident(ruma_identifiers::Error), Ident(ruma_identifiers::Error),
@ -202,6 +203,7 @@ pub enum DeserializationError {
impl Display for DeserializationError { impl Display for DeserializationError {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
match self { match self {
DeserializationError::Utf8(err) => Display::fmt(err, f),
DeserializationError::Json(err) => Display::fmt(err, f), DeserializationError::Json(err) => Display::fmt(err, f),
DeserializationError::Query(err) => Display::fmt(err, f), DeserializationError::Query(err) => Display::fmt(err, f),
DeserializationError::Ident(err) => Display::fmt(err, f), DeserializationError::Ident(err) => Display::fmt(err, f),
@ -210,6 +212,13 @@ impl Display for DeserializationError {
} }
} }
#[doc(hidden)]
impl From<std::str::Utf8Error> for DeserializationError {
fn from(err: std::str::Utf8Error) -> Self {
Self::Utf8(err)
}
}
#[doc(hidden)] #[doc(hidden)]
impl From<serde_json::Error> for DeserializationError { impl From<serde_json::Error> for DeserializationError {
fn from(err: serde_json::Error) -> Self { fn from(err: serde_json::Error) -> Self {

8
src/lib.rs
View File

@ -352,7 +352,13 @@ mod tests {
room_id: request_body.room_id, room_id: request_body.room_id,
room_alias: { room_alias: {
let segment = path_segments.get(5).unwrap().as_bytes(); let segment = path_segments.get(5).unwrap().as_bytes();
let decoded = percent_encoding::percent_decode(segment).decode_utf8_lossy(); let decoded = match percent_encoding::percent_decode(segment).decode_utf8()
{
Ok(x) => x,
Err(err) => {
return Err(RequestDeserializationError::new(err, request).into())
}
};
match serde_json::from_str(decoded.deref()) { match serde_json::from_str(decoded.deref()) {
Ok(id) => id, Ok(id) => id,
Err(err) => { Err(err) => {