From 3855099e396bedf67445a555cef313f70dfedee1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 28 Aug 2014 21:32:29 +0200
Subject: [PATCH] UPD: rename dns-txt testdomain to
 "<string>._cacert._auth.domain.tld"

---
 doc/jenkinsJob/dyn-txt.php                            | 6 +++---
 src/org/cacert/gigi/pages/account/DomainAddForm.templ | 2 +-
 src/org/cacert/gigi/ping/DNSPinger.java               | 2 +-
 tests/org/cacert/gigi/ping/TestDNS.java               | 2 +-
 tests/org/cacert/gigi/testUtils/PingTest.java         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/jenkinsJob/dyn-txt.php b/doc/jenkinsJob/dyn-txt.php
index 7914b986..c7b6cfec 100644
--- a/doc/jenkinsJob/dyn-txt.php
+++ b/doc/jenkinsJob/dyn-txt.php
@@ -33,8 +33,8 @@ if($_GET['action'] == "http"){
   file_put_contents("cacert-$t1.txt", $t2);
 } else if($_GET['action'] == "dns") {
   $todelete[$time][] = array("dns", $t1);
-  $dnscalls .= "update delete cacert-{$t1}." . ZONENAME . " TXT\n"
-    ."update add cacert-{$t1}." . ZONENAME . " 60 TXT {$t2}\n";
+  $dnscalls .= "update delete {$t1}._cacert._auth." . ZONENAME . " TXT\n"
+    ."update add {$t1}._cacert._auth." . ZONENAME . " 60 TXT {$t2}\n";
 }
 $copy = $todelete;
 foreach($copy as $nt => $ar){
@@ -44,7 +44,7 @@ foreach($copy as $nt => $ar){
       if($act[0] == "http"){
         unlink("cacert-{$act[1]}.txt");
       } else if($act[0] == "dns") {
-        $dnscalls .= "update delete cacert-{$act[1]}." . ZONENAME . " TXT\n";
+        $dnscalls .= "update delete {$act[1]}._cacert._auth." . ZONENAME . " TXT\n";
       }
     }
   }
diff --git a/src/org/cacert/gigi/pages/account/DomainAddForm.templ b/src/org/cacert/gigi/pages/account/DomainAddForm.templ
index 2da1b0e3..7228b52e 100644
--- a/src/org/cacert/gigi/pages/account/DomainAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/DomainAddForm.templ
@@ -35,7 +35,7 @@
     <td>
         Please insert the following DNS TXT entry into the SOA-file of your domain:<br/>
         <pre>
-        cacert-<?=$tokenName?> IN TXT <?=$tokenValue?>
+        <?=$tokenName?>._cacert._auth IN TXT <?=$tokenValue?>
         </pre>
     </td>
   </tr>
diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/org/cacert/gigi/ping/DNSPinger.java
index 5e735e09..175b26b0 100644
--- a/src/org/cacert/gigi/ping/DNSPinger.java
+++ b/src/org/cacert/gigi/ping/DNSPinger.java
@@ -27,7 +27,7 @@ public class DNSPinger extends DomainPinger {
         for (String NS : nameservers) {
             boolean found = false;
             try {
-                for (String token : DNSUtil.getTXTEntries("cacert-" + tokenParts[0] + "." + domain.getSuffix(), NS)) {
+                for (String token : DNSUtil.getTXTEntries(tokenParts[0] + "._cacert._auth." + domain.getSuffix(), NS)) {
                     if (token.isEmpty()) {
                         continue;
                     }
diff --git a/tests/org/cacert/gigi/ping/TestDNS.java b/tests/org/cacert/gigi/ping/TestDNS.java
index 76169451..6cb97d7d 100644
--- a/tests/org/cacert/gigi/ping/TestDNS.java
+++ b/tests/org/cacert/gigi/ping/TestDNS.java
@@ -91,7 +91,7 @@ public class TestDNS extends PingTest {
 
     private String readDNS(String token) throws NamingException {
         String test = getTestProps().getProperty("domain.dnstest");
-        String targetDomain = "cacert-" + token + "." + test;
+        String targetDomain = token + "._cacert._auth." + test;
         String[] data = DNSUtil.getTXTEntries(targetDomain, getTestProps().getProperty("domain.testns"));
         assertEquals(1, data.length);
         return data[0];
diff --git a/tests/org/cacert/gigi/testUtils/PingTest.java b/tests/org/cacert/gigi/testUtils/PingTest.java
index bc844c48..6c57d76d 100644
--- a/tests/org/cacert/gigi/testUtils/PingTest.java
+++ b/tests/org/cacert/gigi/testUtils/PingTest.java
@@ -58,7 +58,7 @@ public abstract class PingTest extends ClientTest {
         String content1 = IOUtils.readURL(openConnection);
         csrf = getCSRF(1, content1);
 
-        Pattern p = Pattern.compile("cacert-([A-Za-z0-9]+) IN TXT ([A-Za-z0-9]+)");
+        Pattern p = Pattern.compile("([A-Za-z0-9]+)._cacert._auth IN TXT ([A-Za-z0-9]+)");
         Matcher m = p.matcher(content1);
         m.find();
         return m;
-- 
2.39.2