X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FDNSPinger.java;h=35e17148908988dcd342a41c3cfb6b6675ad3128;hb=446d3aa82c177eb844f6f19c8f85d4a6e631efe7;hp=e4373c58b8fa9a79e65436c114133cd556bb8d62;hpb=f09e6d3da3f51938c76eac7fa354206acb00406a;p=gigi.git

diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/org/cacert/gigi/ping/DNSPinger.java
index e4373c58..35e17148 100644
--- a/src/org/cacert/gigi/ping/DNSPinger.java
+++ b/src/org/cacert/gigi/ping/DNSPinger.java
@@ -3,69 +3,68 @@ 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 org.cacert.gigi.Domain;
+import org.cacert.gigi.User;
+
 public class DNSPinger extends DomainPinger {
 
-	@Override
-	public void ping(String domain, String configuration, String expToken) {
-		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()) {
-						continue;
-					}
-					found = true;
-					token = line.substring(1, line.length() - 1);
-					if (token.equals(expToken)) {
-						continue nameservers;
-					}
-				}
-				p.destroy();
-				result.append(NS);
-				if (found) {
-					result.append(" DIFFER;");
-				} else {
-					result.append(" EMPTY;");
-				}
-				failed = true;
+    @Override
+    public String ping(Domain domain, String expToken, User u) {
+        try {
+            String[] tokenParts = expToken.split(":", 2);
+
+            Process p = Runtime.getRuntime().exec(new String[] {
+                    "dig", "+short", "NS", domain.getSuffix()
+            });
+            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", "@" + NS, "+short", "TXT", "cacert-" + tokenParts[0] + "." + domain
+                };
+                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()) {
+                        continue;
+                    }
+                    found = true;
+                    token = line.substring(1, line.length() - 1);
+                    if (token.equals(tokenParts[1])) {
+                        continue nameservers;
+                    }
+                }
+                p.destroy();
+                result.append(NS);
+                if (found) {
+                    result.append(" DIFFER;");
+                } else {
+                    result.append(" EMPTY;");
+                }
+                failed = true;
 
-			}
-			if (!failed) {
-				// Success
-				return;
-			}
-			System.out.println(result.toString());
-		} catch (IOException e) {
-			e.printStackTrace();
-			// FAIL
-		}
-		// FAIL
-	}
-	public static void main(String[] args) {
-		new DNSPinger().ping("dyn.dogcraft.de", "", "salat");
-	}
+            }
+            if ( !failed) {
+                return PING_SUCCEDED;
+            }
+            return result.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "Connection closed";
+        }
+    }
 
 }