From c574e69124bb7dffba642d4dc2618b242c599491 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Thu, 21 May 2015 18:15:55 -0300
Subject: [PATCH] DNS tests/doc: include SPF data

---
 config/dev/config.yaml      |  2 +-
 config/homologa/config.yaml |  4 ++--
 test/dns_test.sh            | 31 +++++++++++++++++++++++++++----
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/config/dev/config.yaml b/config/dev/config.yaml
index 0b90e42..d31408b 100644
--- a/config/dev/config.yaml
+++ b/config/dev/config.yaml
@@ -8,8 +8,8 @@ server_email: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.g
 email_subject_prefix: '[spb|dev]'
 lists_hostname: listas.dev.softwarepublico.gov.br
 lists_admin: paulo@softwarelivre.org
-relay_hostname: relay.dev.softwarepublico.gov.br
 from_address: noreply@dev.softwarepublico.gov.br
 relay_hostname: relay.dev.softwarepublico.gov.br
 relay_ip: 189.9.151.44
 external_outgoing_mail_relay: 189.9.150.53
+external_outgoing_mail_domain: serpro.gov.br
diff --git a/config/homologa/config.yaml b/config/homologa/config.yaml
index 437a16d..5f626ae 100644
--- a/config/homologa/config.yaml
+++ b/config/homologa/config.yaml
@@ -9,8 +9,8 @@ server_email: '"Portal do Software Publico (homologação)" <noreply@homologa.so
 email_subject_prefix: '[spb]'
 lists_hostname: listas.homologa.softwarepublico.gov.br
 lists_admin: nayanne.bonifacio@planejamento.gov.br
+from_address: noreply@homologa.softwarepublico.gov.br
 relay_hostname: relay.homologa.softwarepublico.gov.br
 relay_ip: 189.9.151.66
 external_outgoing_mail_relay: 189.9.150.53
-alt_ssh_port: 55555
-from_address: noreply@homologa.softwarepublico.gov.br
+external_outgoing_mail_domain: serpro.gov.br
diff --git a/test/dns_test.sh b/test/dns_test.sh
index 4e12eb3..ed95b1d 100644
--- a/test/dns_test.sh
+++ b/test/dns_test.sh
@@ -29,7 +29,14 @@ check_reverse_dns() {
   local hostname="$2"
   local results="$(host $ip)"
   local expected=".*in-addr.arpa domain name pointer ${hostname}."
-  assertTrue "Reverse DNS of $ip must be $hostname (found: $results)" "expr match '$results' '$expected\$'"
+  assertTrue "Reverse DNS of $ip must be $hostname (found: $results)" "expr match '$results' 'include:$expected\$'"
+}
+
+check_spf() {
+  domain="$1"
+  spf_domain="$2"
+  local results="$(host -t TXT "$domain")"
+  assertTrue "TXT entry for $domain must have include:$spf_domain (found: $results)" "expr match '$results' 'include:$spf_domain'"
 }
 
 test_dns_web() {
@@ -60,7 +67,14 @@ test_reverse_dns_relay() {
   check_reverse_dns "$config_relay_ip" "$config_relay_hostname"
 }
 
-# TODO test_spf_external_relay
+if [ -n "$config_external_outgoing_mail_domain" ]; then
+  test_spf_domain() {
+    check_spf "$config_external_hostname" "$config_external_outgoing_mail_domain"
+  }
+  test_spf_lists() {
+    check_spf "$config_lists_hostname" "$config_external_outgoing_mail_domain"
+  }
+fi
 
 if [ "$1" = '--doc' ]; then
   check_hostname() {
@@ -78,13 +92,19 @@ if [ "$1" = '--doc' ]; then
     echo "     - $1"
     echo "     - ${2}."
   }
+  check_spf() {
+    echo "   * - TXT (SPF: \"v=spf1 ...\")"
+    echo "     - $1 "
+    echo "     - include:${2} "
+  }
   header() {
+    local aponta="${2:-Aponta para}"
     echo '.. list-table::'
     echo '   :header-rows: 1'
     echo
     echo '   * - Tipo'
     echo '     - Entrada'
-    echo '     - Aponta para'
+    echo "     - $aponta"
   }
   footer() {
     echo
@@ -106,7 +126,10 @@ if [ "$1" = '--doc' ]; then
     test_reverse_dns_relay
     footer
 
-    # FIXME test_spf_external_relay
+    header 'SPF' 'Deve conter'
+    test_spf_domain
+    test_spf_lists
+    footer
 
   )
 else
--
libgit2 0.21.2