Check queried host as well as MX host for blocklists

do-community · Jan 3, 2024 · 55ab523 · 55ab523
1 parent 10f0dea
commit 55ab523
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/dns-lookup/blocklists.ts b/src/dns-lookup/blocklists.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 DigitalOcean
+Copyright 2024 DigitalOcean
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -48,14 +48,23 @@ const checkDomainBlocklists = (domain: string) => {
 }
 
 // Gets any blocklists that the IP/domain is in.
-const getBlocklists = async (ip: string, domain: string) => {
+const getBlocklists = async (ip?: string | string[], domain?: string | string[]) => {
     const blocklists = {
         ip: [],
         domain: [],
     } as any
 
-    const promises = [...checkIpBlocklists(ip)]
-    if (domain) promises.push(...checkDomainBlocklists(domain))
+    const promises = []
+    if (ip) {
+        Array.isArray(ip)
+            ? ip.forEach(item => promises.push(...checkIpBlocklists(item)))
+            : promises.push(...checkIpBlocklists(ip))
+    }
+    if (domain) {
+        Array.isArray(domain)
+            ? domain.forEach(item => promises.push(...checkDomainBlocklists(item)))
+            : promises.push(...checkDomainBlocklists(domain))
+    }
 
     const data = await Promise.all(promises)
     data.forEach(item => {

diff --git a/src/dns-lookup/templates/record.vue b/src/dns-lookup/templates/record.vue
@@ -1,5 +1,5 @@
 <!--
-Copyright 2022 DigitalOcean
+Copyright 2024 DigitalOcean
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -62,11 +62,11 @@ limitations under the License.
                                         </div>
                                         <div v-else>
                                             {{ value.result }}
-                                            <div v-if="value.hostname">
+                                            <div v-if="value.ip">
                                                 <hr />
                                                 <WHOIS :ip="value.ip"></WHOIS>
                                                 <div v-if="recordType === 'MX'">
-                                                    <MXBlocklist :ip="value.ip" :hostname="value.hostname ? value.hostname : ''"></MXBlocklist>
+                                                    <MXBlocklist :ip="value.ip" :hostname="[ value.hostname, data ]" />
                                                 </div>
                                             </div>
                                         </div>