Merge pull request #24 from Y2Z/nosniff

Get rid of mime-sniffer dependency

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monolith"
-version = "2.0.6"
+version = "2.0.7"
 authors = ["Sunshine <sunshine@uberspace.net>"]
 description = "CLI tool to save webpages as a single HTML file"
 
@@ -9,8 +9,7 @@ base64 = "0.10.1"
 clap = "2.33.0"
 html5ever = "0.24.0"
 indicatif = "0.11.0"
-mime-sniffer = "0.1.2"
+lazy_static = "1.3.0"
 regex = "1.2.1"
 reqwest = "0.9.20"
 url = "2.1.0"
-lazy_static = "1.3.0"

src/utils.rs

@@ -1,8 +1,31 @@
 extern crate base64;
-extern crate mime_sniffer;
 
 use self::base64::encode;
-use self::mime_sniffer::MimeTypeSniffer;
+
+static MAGIC: [[&[u8]; 2]; 19]  = [
+    // Image
+    [b"GIF87a", b"image/gif"],
+    [b"GIF89a", b"image/gif"],
+    [b"\xFF\xD8\xFF", b"image/jpeg"],
+    [b"\x89PNG\x0D\x0A\x1A\x0A", b"image/png"],
+    [b"<?xml ", b"image/svg+xml"],
+    [b"<svg ", b"image/svg+xml"],
+    [b"RIFF....WEBPVP8 ", b"image/webp"],
+    [b"\x00\x00\x01\x00", b"image/x-icon"],
+    // Audio
+    [b"ID3", b"audio/mpeg"],
+    [b"\xFF\x0E", b"audio/mpeg"],
+    [b"\xFF\x0F", b"audio/mpeg"],
+    [b"OggS", b"audio/ogg"],
+    [b"RIFF....WAVEfmt ", b"audio/wav"],
+    [b"fLaC", b"audio/x-flac"],
+    // Video
+    [b"RIFF....AVI LIST", b"video/avi"],
+    [b"....ftyp", b"video/mp4"],
+    [b"\x00\x00\x01\x0B", b"video/mpeg"],
+    [b"....moov", b"video/quicktime"],
+    [b"\x1A\x45\xDF\xA3", b"video/webm"],
+];
 
 pub fn data_to_dataurl(mime: &str, data: &[u8]) -> String {
     let mimetype = if mime == "" {
@@ -14,7 +37,16 @@ pub fn data_to_dataurl(mime: &str, data: &[u8]) -> String {
 }
 
 fn detect_mimetype(data: &[u8]) -> String {
-    data.sniff_mime_type().unwrap_or("").to_string()
+    let mut re = String::new();
+
+    for item in MAGIC.iter()  {
+        if data.starts_with(item[0]) {
+            re = String::from_utf8(item[1].to_vec()).unwrap();
+            break;
+        }
+    }
+
+    re
 }
 
 #[cfg(test)]
@@ -31,4 +63,30 @@ mod tests {
             "data:application/javascript;base64,dmFyIHdvcmQgPSAnaGVsbG8nOwphbGVydCh3b3JkKTsK"
         );
     }
+
+    #[test]
+    fn test_detect_mimetype() {
+        // Image
+        assert_eq!(detect_mimetype(b"GIF87a"), "image/gif");
+        assert_eq!(detect_mimetype(b"GIF89a"), "image/gif");
+        assert_eq!(detect_mimetype(b"\xFF\xD8\xFF"), "image/jpeg");
+        assert_eq!(detect_mimetype(b"\x89PNG\x0D\x0A\x1A\x0A"), "image/png");
+        assert_eq!(detect_mimetype(b"<?xml "), "image/svg+xml");
+        assert_eq!(detect_mimetype(b"<svg "), "image/svg+xml");
+        assert_eq!(detect_mimetype(b"RIFF....WEBPVP8 "), "image/webp");
+        assert_eq!(detect_mimetype(b"\x00\x00\x01\x00"), "image/x-icon");
+        // Audio
+        assert_eq!(detect_mimetype(b"ID3"), "audio/mpeg");
+        assert_eq!(detect_mimetype(b"\xFF\x0E"), "audio/mpeg");
+        assert_eq!(detect_mimetype(b"\xFF\x0F"), "audio/mpeg");
+        assert_eq!(detect_mimetype(b"OggS"), "audio/ogg");
+        assert_eq!(detect_mimetype(b"RIFF....WAVEfmt "), "audio/wav");
+        assert_eq!(detect_mimetype(b"fLaC"), "audio/x-flac");
+        // Video
+        assert_eq!(detect_mimetype(b"RIFF....AVI LIST"), "video/avi");
+        assert_eq!(detect_mimetype(b"....ftyp"), "video/mp4");
+        assert_eq!(detect_mimetype(b"\x00\x00\x01\x0B"), "video/mpeg");
+        assert_eq!(detect_mimetype(b"....moov"), "video/quicktime");
+        assert_eq!(detect_mimetype(b"\x1A\x45\xDF\xA3"), "video/webm");
+    }
 }