Merge pull request #5503 from Turbo87/domain-block

Fix documentation URL blocking for substring domains

Author: Turbo87

src/views.rs

@@ -350,17 +350,29 @@ impl EncodableCrate {
         };
 
         // Match documentation URL host against blocked host array elements
-        if DOCUMENTATION_BLOCKLIST
-            .iter()
-            .any(|blocked| url_host.ends_with(blocked))
-        {
+        if domain_is_blocked(url_host) {
             None
         } else {
             Some(url)
         }
     }
 }
 
+fn domain_is_blocked(domain: &str) -> bool {
+    DOCUMENTATION_BLOCKLIST
+        .iter()
+        .any(|blocked| &domain == blocked || domain_is_subdomain(domain, blocked))
+}
+
+fn domain_is_subdomain(potential_subdomain: &str, root: &str) -> bool {
+    if !potential_subdomain.ends_with(root) {
+        return false;
+    }
+
+    let root_with_prefix = format!(".{root}");
+    potential_subdomain.ends_with(&root_with_prefix)
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct EncodableCrateLinks {
     pub version_downloads: String,
@@ -910,4 +922,11 @@ mod tests {
             None
         );
     }
+
+    #[test]
+    fn documentation_blocked_non_subdomain() {
+        let input = Some(String::from("http://foorust-ci.org/"));
+        let result = EncodableCrate::remove_blocked_documentation_urls(input);
+        assert_some_eq!(result, "http://foorust-ci.org/");
+    }
 }