LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Changing image_content_type function to Result. (#711) 

* Changing image_content_type function to Result.

* Changing image to image/
This commit is contained in:
Dessalines 2020-05-12 15:23:48 -04:00 committed by GitHub
parent c22310bdaf
commit f971e31171
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/src/lib.rs
View File

@ -73,13 +73,17 @@ pub fn is_email_regex(test: &str) -> bool {
EMAIL_REGEX.is_match(test) EMAIL_REGEX.is_match(test)
} }
pub fn is_image_content_type(test: &str) -> bool { pub fn is_image_content_type(test: &str) -> Result<(), failure::Error> {
match isahc::get(test) { if isahc::get(test)?
Ok(res) => match res.headers().get("Content-Type") { .headers()
Some(header) => header.to_str().unwrap_or("not_an_img").contains("image"), .get("Content-Type")
None => false, .ok_or_else(|| format_err!("No Content-Type header"))?
}, .to_str()?
Err(_) => false, .starts_with("image/")
{
Ok(())
} else {
Err(format_err!("Not an image type."))
} }
} }
@ -190,9 +194,7 @@ pub struct PictshareResponse {
} }
pub fn fetch_pictshare(image_url: &str) -> Result<PictshareResponse, failure::Error> { pub fn fetch_pictshare(image_url: &str) -> Result<PictshareResponse, failure::Error> {
if !is_image_content_type(image_url) { is_image_content_type(image_url)?;
return Err(format_err!("Not an image type."));
}
let fetch_url = format!( let fetch_url = format!(
"http://pictshare/api/geturl.php?url={}", "http://pictshare/api/geturl.php?url={}",
@ -276,10 +278,11 @@ mod tests {
#[test] #[test]
fn test_image() { fn test_image() {
assert!(is_image_content_type("https://1734811051.rsc.cdn77.org/data/images/full/365645/as-virus-kills-navajos-in-their-homes-tribal-women-provide-lifeline.jpg?w=600?w=650")); assert!(is_image_content_type("https://1734811051.rsc.cdn77.org/data/images/full/365645/as-virus-kills-navajos-in-their-homes-tribal-women-provide-lifeline.jpg?w=600?w=650").is_ok());
assert!(!is_image_content_type( assert!(is_image_content_type(
"https://twitter.com/BenjaminNorton/status/1259922424272957440?s=20" "https://twitter.com/BenjaminNorton/status/1259922424272957440?s=20"
)); )
.is_err());
} }
#[test] #[test]