X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FHTTPFetch.java;h=f6b5c3e56f279cc9d1d1300fe93fdea6cfe551fe;hp=3bb2d095d3dd598c4f6c86f5fd594983fcbf48c9;hb=d309ba7485e0c84a33a806ffdcbc14ce36662703;hpb=50c8c66dc1d3245e8eaedf17e273f8c0522f1435

diff --git a/src/org/cacert/gigi/ping/HTTPFetch.java b/src/org/cacert/gigi/ping/HTTPFetch.java
index 3bb2d095..f6b5c3e5 100644
--- a/src/org/cacert/gigi/ping/HTTPFetch.java
+++ b/src/org/cacert/gigi/ping/HTTPFetch.java
@@ -6,30 +6,37 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+import org.cacert.gigi.dbObjects.CertificateOwner;
+import org.cacert.gigi.dbObjects.Domain;
+
 public class HTTPFetch extends DomainPinger {
 
     @Override
-    public String ping(String domain, String expToken) {
+    public void ping(Domain domain, String expToken, CertificateOwner user, int confId) {
         try {
             String[] tokenParts = expToken.split(":", 2);
-            URL u = new URL("http://" + domain + "/cacert_" + tokenParts[0] + ".txt");
-            System.out.println(u.toString());
+            URL u = new URL("http://" + domain.getSuffix() + "/cacert-" + tokenParts[0] + ".txt");
             HttpURLConnection huc = (HttpURLConnection) u.openConnection();
             if (huc.getResponseCode() != 200) {
-                return "Invalid status code.";
+                enterPingResult(confId, "error", "Invalid status code " + huc.getResponseCode() + ".", null);
+                return;
             }
             BufferedReader br = new BufferedReader(new InputStreamReader(huc.getInputStream(), "UTF-8"));
             String line = br.readLine();
             if (line == null) {
-                return "No response from your server.";
+                enterPingResult(confId, "error", "Empty document.", null);
+                return;
             }
             if (line.trim().equals(tokenParts[1])) {
-                return PING_SUCCEDED;
+                enterPingResult(confId, PING_SUCCEDED, "", null);
+                return;
             }
-            return "Challange tokens differed.";
+            enterPingResult(confId, "error", "Challenge tokens differed.", null);
+            return;
         } catch (IOException e) {
             e.printStackTrace();
-            return "Connection closed.";
+            enterPingResult(confId, "error", "Exception: connection closed.", null);
+            return;
         }
     }
 }