X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FDNSPinger.java;h=f9a4e7103ad0248cd33c4ed712ae7a15ca5e0962;hb=67bdb3b1fd3ff821d00715bf2a7ed90ca7a7a664;hp=ece3d1b9b36389de762885a364be998444e87e1a;hpb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16;p=gigi.git

diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/org/cacert/gigi/ping/DNSPinger.java
index ece3d1b9..f9a4e710 100644
--- a/src/org/cacert/gigi/ping/DNSPinger.java
+++ b/src/org/cacert/gigi/ping/DNSPinger.java
@@ -1,69 +1,59 @@
 package org.cacert.gigi.ping;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.Arrays;
-import java.util.LinkedList;
+import java.util.List;
+
+import javax.naming.NamingException;
+
+import org.cacert.gigi.dbObjects.CertificateOwner;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.util.DNSUtil;
+import org.cacert.gigi.util.SystemKeywords;
 
 public class DNSPinger extends DomainPinger {
 
     @Override
-    public void ping(String domain, String configuration, String expToken) {
+    public void ping(Domain domain, String expToken, CertificateOwner u, int confId) {
+        String[] tokenParts = expToken.split(":", 2);
+        List<String> nameservers;
         try {
-            Process p = Runtime.getRuntime().exec(new String[] {
-                    "dig", "+short", "NS", domain
-            });
-            BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
-            String line;
-            LinkedList<String> nameservers = new LinkedList<String>();
-            while ((line = br.readLine()) != null) {
-                nameservers.add(line);
-            }
-            p.destroy();
-            StringBuffer result = new StringBuffer();
-            result.append("failed: ");
-            boolean failed = nameservers.isEmpty();
-            nameservers:
-            for (String NS : nameservers) {
-                String[] call = new String[] {
-                        "dig", "+short", "TXT", "cacert." + domain, NS
-                };
-                System.out.println(Arrays.toString(call));
-                p = Runtime.getRuntime().exec(call);
-                br = new BufferedReader(new InputStreamReader(p.getInputStream()));
-                String token = null;
-                boolean found = false;
-                while ((line = br.readLine()) != null) {
-                    if (line.isEmpty()) {
+            nameservers = Arrays.asList(DNSUtil.getNSNames(domain.getSuffix()));
+        } catch (NamingException e) {
+            enterPingResult(confId, "error", "No authorative nameserver found.", null);
+            return;
+        }
+        StringBuffer result = new StringBuffer();
+        result.append("failed: ");
+        boolean failed = nameservers.isEmpty();
+        nameservers:
+        for (String NS : nameservers) {
+            boolean found = false;
+            try {
+                for (String token : DNSUtil.getTXTEntries(tokenParts[0] + "." + SystemKeywords.DNS_PREFIX + "._auth." + domain.getSuffix(), NS)) {
+                    if (token.isEmpty()) {
                         continue;
                     }
                     found = true;
-                    token = line.substring(1, line.length() - 1);
-                    if (token.equals(expToken)) {
+                    if (token.equals(tokenParts[1])) {
                         continue nameservers;
                     }
                 }
-                p.destroy();
-                result.append(NS);
-                if (found) {
-                    result.append(" DIFFER;");
-                } else {
-                    result.append(" EMPTY;");
-                }
-                failed = true;
-
+            } catch (NamingException e) {
+                found = false;
             }
-            if ( !failed) {
-                // Success
-                return;
+            result.append(NS);
+            if (found) {
+                result.append(" DIFFER;");
+            } else {
+                result.append(" EMPTY;");
             }
-            System.out.println(result.toString());
-        } catch (IOException e) {
-            e.printStackTrace();
-            // FAIL
+            failed = true;
+
+        }
+        if ( !failed) {
+            enterPingResult(confId, PING_SUCCEDED, "", null);
+        } else {
+            enterPingResult(confId, "error", result.toString(), null);
         }
-        // FAIL
     }
-
 }