Rejected urls (#1990)

* add test_check_data_uris

* Update lychee-bin/tests/data_uris.rs

Co-authored-by: Thomas Zahner <thomas.zahner@protonmail.ch>

* fmt

* Convert InvalidUrlHost into Unsupported status

* Inline conversion from reqwest::Error into Status

---------

Co-authored-by: rina <k@rina.fyi>
Co-authored-by: katrinafyi <39479354+katrinafyi@users.noreply.github.com>

Author: thomas-zahner

lychee-bin/tests/data_uris.rs

@@ -53,4 +53,16 @@ mod cli {
         let output = std::str::from_utf8(&output.stdout).unwrap();
         assert_eq!(output.lines().count(), 5);
     }
+
+    #[test]
+    fn test_check_data_uris() {
+        let input = fixtures_path().join("TEST_DATA_URIS.html");
+
+        cargo_bin_cmd!()
+            .arg(input)
+            .arg("--exclude-loopback")
+            .assert()
+            .success()
+            .stdout(contains("3 Unsupported"));
+    }
 }

lychee-lib/src/checker/website.rs

@@ -158,10 +158,7 @@ impl WebsiteChecker {
                     status
                 }
             }
-            Err(e) => match e {
-                ErrorKind::NetworkRequest(error) => Status::from(error),
-                _ => e.into(),
-            },
+            Err(e) => e.into(),
         }
     }
 

lychee-lib/src/types/status.rs

@@ -296,20 +296,22 @@ impl Status {
 
 impl From<ErrorKind> for Status {
     fn from(e: ErrorKind) -> Self {
-        Self::Error(e)
-    }
-}
-
-impl From<reqwest::Error> for Status {
-    fn from(e: reqwest::Error) -> Self {
-        if e.is_timeout() {
-            Self::Timeout(e.status())
-        } else if e.is_builder() {
-            Self::Unsupported(ErrorKind::BuildRequestClient(e))
-        } else if e.is_body() || e.is_decode() {
-            Self::Unsupported(ErrorKind::ReadResponseBody(e))
-        } else {
-            Self::Error(ErrorKind::NetworkRequest(e))
+        match e {
+            ErrorKind::InvalidUrlHost => Status::Unsupported(ErrorKind::InvalidUrlHost),
+            ErrorKind::NetworkRequest(e)
+            | ErrorKind::ReadResponseBody(e)
+            | ErrorKind::BuildRequestClient(e) => {
+                if e.is_timeout() {
+                    Self::Timeout(e.status())
+                } else if e.is_builder() {
+                    Self::Unsupported(ErrorKind::BuildRequestClient(e))
+                } else if e.is_body() || e.is_decode() {
+                    Self::Unsupported(ErrorKind::ReadResponseBody(e))
+                } else {
+                    Self::Error(ErrorKind::NetworkRequest(e))
+                }
+            }
+            e => Self::Error(e),
         }
     }
 }