X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util-testing%2Forg%2Fcacert%2Fgigi%2Fpages%2FManager.java;h=ebfd73b9d605a15d1d72402d2840a8b52c440a54;hp=8f77afbd63ea8bbdb61732e51dc36a5ad72aec2d;hb=d1080ab12183cad2bab5d1f94bafe67960fbf4c8;hpb=a0cae0454cb03690ce318fa0fc8b4ca6d6cca4f1

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 8f77afbd..ebfd73b9 100644
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -17,17 +17,22 @@ import java.util.LinkedList;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
+import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.Gigi;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.crypto.SPKAC;
-import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
+import org.cacert.gigi.dbObjects.Assurance.AssuranceType;
 import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
+import org.cacert.gigi.dbObjects.CertificateOwner;
 import org.cacert.gigi.dbObjects.Digest;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.DomainPingType;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.Name;
@@ -37,6 +42,8 @@ import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.account.certs.CertificateRequest;
+import org.cacert.gigi.ping.DomainPinger;
+import org.cacert.gigi.ping.PingerDaemon;
 import org.cacert.gigi.util.AuthorizationContext;
 import org.cacert.gigi.util.Notary;
 
@@ -48,6 +55,8 @@ public class Manager extends Page {
 
     Field f;
 
+    private static HashMap<DomainPingType, DomainPinger> dps;
+
     private Manager() {
         super("Test Manager");
         try {
@@ -58,6 +67,27 @@ public class Manager extends Page {
             System.out.println("I don't have 'hash', we are working probably in layered mode. Test Manager may not work.");
             // throw new Error(e);
         }
+
+        try {
+            Field gigiInstance = Gigi.class.getDeclaredField("instance");
+            gigiInstance.setAccessible(true);
+            Gigi g = (Gigi) gigiInstance.get(null);
+
+            Field gigiPinger = Gigi.class.getDeclaredField("pinger");
+            gigiPinger.setAccessible(true);
+            PingerDaemon pd = (PingerDaemon) gigiPinger.get(g);
+
+            Field f = PingerDaemon.class.getDeclaredField("pingers");
+            f.setAccessible(true);
+            dps = (HashMap<DomainPingType, DomainPinger>) f.get(pd);
+            HashMap<DomainPingType, DomainPinger> pingers = new HashMap<>();
+            for (DomainPingType dpt : DomainPingType.values()) {
+                pingers.put(dpt, new PingerFetcher(dpt));
+            }
+            f.set(pd, pingers);
+        } catch (ReflectiveOperationException e) {
+            e.printStackTrace();
+        }
     }
 
     public User[] getAssurers() {
@@ -66,24 +96,25 @@ public class Manager extends Page {
         }
         assurers = new User[10];
         try {
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?");
-            for (int i = 0; i < assurers.length; i++) {
-                String mail = "test-assurer" + i + "@example.com";
-                User u = User.getByEmail(mail);
-                if (u == null) {
-                    System.out.println("Creating assurer");
-                    createUser(mail);
-                    u = User.getByEmail(mail);
-                    passCATS(u);
-                    ps.setInt(1, u.getId());
-                    ps.setInt(2, u.getId());
-                    ps.setInt(3, 100);
-                    ps.setString(4, "Manager init code");
-                    ps.setString(5, "1990-01-01");
-                    ps.execute();
-                }
-                assurers[i] = u;
+            try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?")) {
+                for (int i = 0; i < assurers.length; i++) {
+                    String mail = "test-assurer" + i + "@example.com";
+                    User u = User.getByEmail(mail);
+                    if (u == null) {
+                        System.out.println("Creating assurer");
+                        createUser(mail);
+                        u = User.getByEmail(mail);
+                        passCATS(u);
+                        ps.setInt(1, u.getId());
+                        ps.setInt(2, u.getId());
+                        ps.setInt(3, 100);
+                        ps.setString(4, "Manager init code");
+                        ps.setString(5, "1990-01-01");
+                        ps.execute();
+                    }
+                    assurers[i] = u;
 
+                }
             }
         } catch (ReflectiveOperationException | GigiApiException e) {
             e.printStackTrace();
@@ -92,9 +123,10 @@ public class Manager extends Page {
     }
 
     private void passCATS(User u) {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO cats_passed SET user_id=?, variant_id=1");
-        ps.setInt(1, u.getId());
-        ps.execute();
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO cats_passed SET user_id=?, variant_id=1")) {
+            ps.setInt(1, u.getId());
+            ps.execute();
+        }
     }
 
     private static Manager instance;
@@ -103,6 +135,8 @@ public class Manager extends Page {
 
     HashMap<String, LinkedList<String>> emails = new HashMap<>();
 
+    private static TreeSet<String> pingExempt = new TreeSet<>();
+
     public static Manager getInstance() {
         if (instance == null) {
             instance = new Manager();
@@ -131,6 +165,26 @@ public class Manager extends Page {
 
     }
 
+    public class PingerFetcher extends DomainPinger {
+
+        private DomainPingType dpt;
+
+        public PingerFetcher(DomainPingType dpt) {
+            this.dpt = dpt;
+        }
+
+        @Override
+        public void ping(Domain domain, String configuration, CertificateOwner target, int confId) {
+            System.out.println("Test: " + domain);
+            if (pingExempt.contains(domain.getSuffix())) {
+                enterPingResult(confId, DomainPinger.PING_SUCCEDED, "Succeeded by TestManager pass-by", null);
+            } else {
+                dps.get(dpt).ping(domain, configuration, target, confId);
+            }
+        }
+
+    }
+
     public void batchCreateUsers(String mailPrefix, String domain, int amount, PrintWriter out) {
 
         try {
@@ -206,7 +260,7 @@ public class Manager extends Page {
             }
             try {
                 for (int i = 0; i < getAssurers().length; i++) {
-                    Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDoB(), 10, "Testmanager Assure up code", "2014-11-06");
+                    Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDoB(), 10, "Testmanager Assure up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
                 }
             } catch (GigiApiException e) {
                 throw new Error(e);
@@ -263,6 +317,16 @@ public class Manager extends Page {
                 resp.getWriter().println("interrupted");
             }
 
+        } else if (req.getParameter("addExDom") != null) {
+            String dom = req.getParameter("exemtDom");
+            pingExempt.add(dom);
+            resp.getWriter().println("Updated domains exempt from pings. Current set: <br/>");
+            resp.getWriter().println(pingExempt);
+        } else if (req.getParameter("delExDom") != null) {
+            String dom = req.getParameter("exemtDom");
+            pingExempt.remove(dom);
+            resp.getWriter().println("Updated domains exempt from pings. Current set: <br/>");
+            resp.getWriter().println(pingExempt);
         }
     }