X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util-testing%2Forg%2Fcacert%2Fgigi%2Fpages%2FManager.java;h=dfa4b5a4ee85a7902264e98c0d7170862fa641a9;hp=649b7944ef99cf64f455bd0b03743de10ec65efe;hb=533294134fb42a02b2557c68eda45f47d77e73cc;hpb=bc51ef4b743b32a7cd3f917a65a2884155b589bb

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 649b7944..dfa4b5a4 100644
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -9,6 +9,7 @@ import java.security.KeyPairGenerator;
 import java.security.Signature;
 import java.util.Base64;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28,6 +29,8 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.crypto.SPKAC;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.dbObjects.Assurance.AssuranceType;
+import org.cacert.gigi.dbObjects.CATS;
+import org.cacert.gigi.dbObjects.CATS.CATSType;
 import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
 import org.cacert.gigi.dbObjects.CertificateOwner;
@@ -104,7 +107,7 @@ public class Manager extends Page {
                 System.out.println("Creating assurer");
                 createUser(mail);
                 u = User.getByEmail(mail);
-                passCATS(u);
+                passCATS(u, CATSType.ASSURER_CHALLENGE);
                 ps.setInt(1, u.getId());
                 ps.setInt(2, u.getId());
                 ps.setInt(3, 100);
@@ -116,11 +119,8 @@ public class Manager extends Page {
         }
     }
 
-    private void passCATS(User u) {
-        try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO cats_passed SET user_id=?, variant_id=1")) {
-            ps.setInt(1, u.getId());
-            ps.execute();
-        }
+    private void passCATS(User u, CATSType t) {
+        CATS.enterResult(u, t, new Date(System.currentTimeMillis()), "en_EN", "1");
     }
 
     private static Manager instance;
@@ -148,7 +148,7 @@ public class Manager extends Page {
         }
 
         @Override
-        public synchronized void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+        public synchronized void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
             HashMap<String, LinkedList<String>> mails = Manager.getInstance().emails;
             LinkedList<String> hismails = mails.get(to);
             if (hismails == null) {
@@ -201,6 +201,7 @@ public class Manager extends Page {
 
     private void createUser(String email) throws GigiApiException, IllegalAccessException {
         Calendar gc = GregorianCalendar.getInstance();
+        gc.setTimeInMillis(0);
         gc.set(1990, 0, 1);
         User u = new User(email, "xvXV12°§", new Name("Först", "Läst", "Müddle", "Süffix"), new DayDate(gc.getTime().getTime()), Locale.ENGLISH);
         EmailAddress ea = u.getEmails()[0];
@@ -246,13 +247,19 @@ public class Manager extends Page {
             fetchMails(req, resp, mail);
         } else if (req.getParameter("cats") != null) {
             String mail = req.getParameter("catsEmail");
+            String testId = req.getParameter("catsType");
             User byEmail = User.getByEmail(mail);
             if (byEmail == null) {
                 resp.getWriter().println("User not found.");
                 return;
             }
-            passCATS(byEmail);
-            resp.getWriter().println("User has been passed CATS");
+            if (testId == null) {
+                resp.getWriter().println("No test given.");
+                return;
+            }
+            CATSType test = CATSType.values()[Integer.parseInt(testId)];
+            passCATS(byEmail, test);
+            resp.getWriter().println("Test '" + test.getDisplayName() + "' was added to user account.");
         } else if (req.getParameter("assure") != null) {
             String mail = req.getParameter("assureEmail");
             User byEmail = User.getByEmail(mail);
@@ -303,7 +310,7 @@ public class Manager extends Page {
                 byte[] res = s.getEncoded(sign);
 
                 CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u), Base64.getEncoder().encodeToString(res), "challange");
-                cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + u.getEmail(), resp.getWriter(), req);
+                cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + u.getEmail());
                 Certificate draft = cr.draft();
                 draft.issue(null, "2y", u).waitFor(10000);
                 if (draft.getStatus() == CertificateStatus.ISSUED) {
@@ -375,7 +382,24 @@ public class Manager extends Page {
             fetchMails(req, resp, mail);
             return;
         }
+        HashMap<String, Object> vars = new HashMap<>();
+        vars.put("cats_types", new IterableDataset() {
 
-        form.output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+            CATSType[] type = CATSType.values();
+
+            int i = 0;
+
+            @Override
+            public boolean next(Language l, Map<String, Object> vars) {
+                if (i >= type.length) {
+                    return false;
+                }
+                CATSType t = type[i++];
+                vars.put("id", i - 1);
+                vars.put("name", t.getDisplayName());
+                return true;
+            }
+        });
+        form.output(resp.getWriter(), getLanguage(req), vars);
     }
 }