anna/async-graphql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed panic when uploading binary file

Browse Source
This commit is contained in:
sunli 2020-04-03 09:27:22 +08:00
parent 1078f7fb42
commit c60e4a51ab
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/context.rs
View File

@ -103,10 +103,9 @@ impl Variables {
fn file_string(filename: &str, content_type: Option<&str>, content: &[u8]) -> String {
if let Some(content_type) = content_type {
format!("file:{}:{}|", filename, content_type)
+ unsafe { std::str::from_utf8_unchecked(content) }
format!("file:{}:{}|", filename, content_type) + &base64::encode(content)
} else {
format!("file:{}|", filename) + unsafe { std::str::from_utf8_unchecked(content) }
format!("file:{}|", filename) + &base64::encode(content)
}
}

8
src/types/upload.rs
View File

@ -80,20 +80,22 @@ impl<'a> InputValueType for Upload {
let s = &s[5..];
if let Some(idx) = s.find('|') {
let name_and_type = &s[..idx];
let content = &s[idx + 1..];
let content_b64 = &s[idx + 1..];
if let Some(type_idx) = name_and_type.find(':') {
let name = &name_and_type[..type_idx];
let mime_type = &name_and_type[type_idx + 1..];
let content = base64::decode(content_b64).ok().unwrap_or_default();
return Some(Self {
filename: name.to_string(),
content_type: Some(mime_type.to_string()),
content: content.as_bytes().to_vec(),
content,
});
} else {
let content = base64::decode(content_b64).ok().unwrap_or_default();
return Some(Self {
filename: name_and_type.to_string(),
content_type: None,
content: content.as_bytes().to_vec(),
content,
});
}
}