X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FPingerDaemon.java;h=806f7c7615d4499d761a1eb4b3067002279f1d1e;hb=76e3ad5851967bea57005ec9858625d4a7071d7c;hp=595b6a6f1b7e86439f7fb770fe465db66324c930;hpb=50c8c66dc1d3245e8eaedf17e273f8c0522f1435;p=gigi.git

diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java
index 595b6a6f..806f7c76 100644
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -1,58 +1,77 @@
 package org.cacert.gigi.ping;
 
-import java.io.FileReader;
-import java.io.IOException;
+import java.security.KeyStore;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
-import java.util.Properties;
-
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.DomainPingConfiguration;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.util.RandomToken;
 
-public class PingerDaemon implements Runnable {
+public class PingerDaemon extends Thread {
 
     HashMap<String, DomainPinger> pingers = new HashMap<>();
 
-    public PingerDaemon() {
-        // pingers.put("email",);
-        pingers.put("ssl", new SSLPinger());
-        pingers.put("http", new HTTPFetch());
-        pingers.put("dns", new DNSPinger());
+    private PreparedStatement searchNeededPings;
+
+    private PreparedStatement enterPingResult;
+
+    private KeyStore truststore;
 
+    public PingerDaemon(KeyStore truststore) {
+        this.truststore = truststore;
     }
 
     @Override
     public void run() {
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT pingconfig.*, domains.domain FROM pingconfig LEFT JOIN domainPinglog ON domainPinglog.configId=pingconfig.id INNER JOIN domains ON domains.id=pingconfig.domainid WHERE domainPinglog.configId IS NULL ");
-            PreparedStatement result = DatabaseConnection.getInstance().prepare("INSERT INTO domainPinglog SET configId=?, state=?, result=?");
-
-            ResultSet rs = ps.executeQuery();
-            while (rs.next()) {
-                String type = rs.getString("type");
-                String config = rs.getString("info");
-                System.out.println(type);
-                System.out.println(config);
-                DomainPinger dp = pingers.get(type);
-                if (dp != null) {
-                    result.setInt(1, rs.getInt("id"));
-                    String resp = dp.ping(rs.getString("domain"), config);
-                    result.setString(2, resp == DomainPinger.PING_STILL_PENDING ? "open" : resp == DomainPinger.PING_SUCCEDED ? "success" : "failed");
-                    result.setString(3, resp);
-                    result.execute();
-                }
-            }
+            searchNeededPings = DatabaseConnection.getInstance().prepare("SELECT pingconfig.*, domains.domain, domains.memid FROM pingconfig LEFT JOIN domainPinglog ON domainPinglog.configId=pingconfig.id INNER JOIN domains ON domains.id=pingconfig.domainid WHERE domainPinglog.configId IS NULL AND domains.deleted IS NULL ");
+            enterPingResult = DatabaseConnection.getInstance().prepare("INSERT INTO domainPinglog SET configId=?, state=?, result=?, challenge=?");
+            pingers.put("email", new EmailPinger());
+            pingers.put("ssl", new SSLPinger(truststore));
+            pingers.put("http", new HTTPFetch());
+            pingers.put("dns", new DNSPinger());
         } catch (SQLException e) {
             e.printStackTrace();
         }
+        while (true) {
+            try {
+                execute();
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+            }
+        }
     }
 
-    public static void main(String[] args) throws IOException {
-        Properties conf = new Properties();
-        conf.load(new FileReader("config/gigi.properties"));
-        DatabaseConnection.init(conf);
-        new PingerDaemon().run();
+    private void execute() throws SQLException {
 
+        ResultSet rs = searchNeededPings.executeQuery();
+        while (rs.next()) {
+            String type = rs.getString("type");
+            String config = rs.getString("info");
+            DomainPinger dp = pingers.get(type);
+            if (dp != null) {
+                String token = null;
+                if (dp instanceof EmailPinger) {
+                    token = RandomToken.generateToken(16);
+                    config = config + ":" + token;
+                }
+                enterPingResult.setInt(1, rs.getInt("id"));
+                String resp = dp.ping(Domain.getById(rs.getInt("domainid")), config, User.getById(rs.getInt("memid")));
+                enterPingResult.setString(2, DomainPinger.PING_STILL_PENDING == resp ? "open" : DomainPinger.PING_SUCCEDED.equals(resp) ? "success" : "failed");
+                enterPingResult.setString(3, resp);
+                enterPingResult.setString(4, token);
+                enterPingResult.execute();
+            }
+        }
     }
+
+    public void requestReping(DomainPingConfiguration dpc) {}
 }