UPD: rename dns-txt testdomain to "<string>._cacert._auth.domain.tld"

diff --git a/doc/jenkinsJob/dyn-txt.php b/doc/jenkinsJob/dyn-txt.php
index 7914b986945ed274c91066ccf8abb244c10a68fc..c7b6cfeccb387ea9d363abc2696133955d2d31ec 100644 (file)
--- 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 2da1b0e323b4378c9e17a91cb7a345d4cc331cd1..7228b52e200723253d4ead111e86b6e1478e5980 100644 (file)
--- 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 5e735e096fbcec40ca89655e58128c5c16895210..175b26b042708bdc033e6b9c128ad71fb03452f0 100644 (file)
--- 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 761694513c3f6e7783506820b47fb18d33b4d734..6cb97d7da083ae061d646147112c65265e14eeba 100644 (file)
--- 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 bc844c4870bcf1198df4c85459f03b00822b47bb..6c57d76dcd80d30173f6b00f4c2ff133e7a1e18c 100644 (file)
--- 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;