upd: move external keywords to own class

[gigi.git] / src / org / cacert / gigi / ping / HTTPFetch.java

diff --git a/src/org/cacert/gigi/ping/HTTPFetch.java b/src/org/cacert/gigi/ping/HTTPFetch.java
index 5450f265181520b169f7e8dc8e00f5e8ae064d5c..1f31ccd633d19f0e00b91140852448b4e024230e 100644 (file)
--- a/src/org/cacert/gigi/ping/HTTPFetch.java
+++ b/src/org/cacert/gigi/ping/HTTPFetch.java
@@ -6,32 +6,38 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.CertificateOwner;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.util.SystemKeywords;
 
 public class HTTPFetch extends DomainPinger {
 
     @Override
-    public String ping(Domain domain, String expToken, User user) {
+    public void ping(Domain domain, String expToken, CertificateOwner user, int confId) {
         try {
             String[] tokenParts = expToken.split(":", 2);
-            URL u = new URL("http://" + domain.getSuffix() + "/cacert-" + tokenParts[0] + ".txt");
+            URL u = new URL("http://" + domain.getSuffix() + "/" + SystemKeywords.HTTP_CHALLENGE_PREFIX + 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;
         }
     }
 }