Fixed small issues

berrysauce · Dec 16, 2024 · 07c6934 · 07c6934
1 parent 24db1d9
commit 07c6934
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/api/src/rdap.ts b/api/src/rdap.ts
@@ -1,4 +1,5 @@
 import { ASNInfo, resolveNameserversAndFetchASN } from "./asn";
+import { isValidEmail } from "./utils";
 import localRdapServicesFile from "./rdap_services.json";
 
 interface RDAPServices {
@@ -238,6 +239,10 @@ const fetchRdapData = async (rdapService: string, domain: string, featureASNLook
 				);
 				if (contactEntry) {
 					registrantData.contact_uri = contactEntry[3];
+
+					if (registrantData.contact_uri && isValidEmail(registrantData.contact_uri) && !registrantData.contact_uri.startsWith("mailto:")) {
+						registrantData.contact_uri = `mailto:${registrantData.contact_uri}`;
+					}
 				}
 			}
 		}

diff --git a/api/src/rdap_services.json b/api/src/rdap_services.json
@@ -1,4 +1,5 @@
 {
     "org": "https://rdap.publicinterestregistry.org/rdap",
+    "dev": "https://www.registry.google/rdap",
     "de": "https://rdap.denic.de"
 }
diff --git a/api/src/utils.ts b/api/src/utils.ts
@@ -9,4 +9,9 @@ function isValidDomain(domain: string): boolean {
     return domainRegex.test(domain);
 }
 
-export { isValidDomain };
+function isValidEmail(email: string): boolean {
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return emailRegex.test(email);
+}
+
+export { isValidDomain, isValidEmail };
diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte
@@ -342,7 +342,7 @@
                                                 {result.registrant.organization}<br>
                                             {/if}
                                             {#if result.registrant.contact_uri}
-                                                <a href="{result.registrant.contact_uri}" target="_blank" style="color: inherit;">Contact registrant (external link)</a><br>
+                                                <a href="{result.registrant.contact_uri}" target="_blank" style="color: inherit;">Contact registrant</a><br>
                                             {/if}
 
                                             {#if !result.registrant.name && !result.registrant.organization}