X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=util-testing%2Forg%2Fcacert%2Fgigi%2Fpages%2FManager.java;h=da506a6ae08d1d717689e2947a32ddfdaea7503f;hb=c0d431282363b3304dbade7d209b0e5c05a5d8fc;hp=3701fb980c63cd8eb4ebdaf97d21532183d4b640;hpb=dc10b875c132eb7840a6b9827ec93916076d34f7;p=gigi.git diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java index 3701fb98..da506a6a 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.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 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) f.get(pd); + HashMap 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() { @@ -92,7 +122,7 @@ public class Manager extends Page { } private void passCATS(User u) { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO cats_passed SET user_id=?, variant_id=3"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO cats_passed SET user_id=?, variant_id=1"); ps.setInt(1, u.getId()); ps.execute(); } @@ -103,6 +133,8 @@ public class Manager extends Page { HashMap> emails = new HashMap<>(); + private static TreeSet pingExempt = new TreeSet<>(); + public static Manager getInstance() { if (instance == null) { instance = new Manager(); @@ -131,6 +163,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 { @@ -263,6 +315,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:
"); + 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:
"); + resp.getWriter().println(pingExempt); } }