From f9ae99a440a0b31d05d0af8acfb1d8dfbd1b3f83 Mon Sep 17 00:00:00 2001
From: Elias Ojala <git@eliasojala.me>
Date: Tue, 10 Mar 2020 15:04:54 +0200
Subject: [PATCH] Improve SPF parser on RFC7208

---
 src/view-functions/txtParser.ts | 3 ++-
 views/docs/index.twig           | 2 ++
 views/home/about.twig           | 7 ++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/view-functions/txtParser.ts b/src/view-functions/txtParser.ts
index 6413a86..d9ef862 100644
--- a/src/view-functions/txtParser.ts
+++ b/src/view-functions/txtParser.ts
@@ -5,7 +5,8 @@ function txtParser(record: string): string {
    * See https://telcodb.net/dns/amazon.com for example.
    */
   if(record.includes("v=spf1") || record.includes("spf2.0/pra")) {
-    record = record.replace(/(include|ip4|ip6|a|ptr)\:([^\s]+)/g, '$1:<a href="/search?q=$2">$2</a>');
+    // https://tools.ietf.org/html/rfc7208#section-5
+    record = record.replace(/(a|mx|ptr|ip4|ip6|include)\:([^\s]+)/g, '$1:<a href="/search?q=$2">$2</a>');
 
     record = record.replace(/(redirect)\=([^\s]+)/g, '$1=<a href="/search?q=$2">$2</a>');
 
diff --git a/views/docs/index.twig b/views/docs/index.twig
index 75269b8..e789a7d 100644
--- a/views/docs/index.twig
+++ b/views/docs/index.twig
@@ -86,6 +86,7 @@ location: <a href="https://peeringdb.com/api/net/291" class="text-dark">https://
     <li><a href="/docs/speedtest-servers-json/">List of Speedtest.net servers in JSON</a></li>
   </ul>
 
+  {#
   <h2>DNS-over-HTTPS</h2>
 
   <ul>
@@ -94,4 +95,5 @@ location: <a href="https://peeringdb.com/api/net/291" class="text-dark">https://
   </ul>
 
   <p>See our DNS resolver's privacy policy <a href="https://lelux.fi/resolver/#privacy-policy">here</a>.</p>
+  #}
 {% endblock %}
\ No newline at end of file
diff --git a/views/home/about.twig b/views/home/about.twig
index c4ace9e..47defdb 100644
--- a/views/home/about.twig
+++ b/views/home/about.twig
@@ -39,7 +39,12 @@
 
   </p>
 
-  <a name="contact"></a><h3>Contact</h3>
+  <a name="source-code"></a><h2>Source code</h2>
+
+  <p>Source code of TelcoDB is available at
+    <a href="https://gitlab.lelux.fi/TelcoDB">our GitLab</a>.</p>
+
+  <a name="contact"></a><h2>Contact</h2>
 
   <p>Our contact address is
     <a href="mailto:contact+2019@telcodb.net">contact@telcodb.net</a>.</p>
-- 
GitLab