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;
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;
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);
}
}
- 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;
}
@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) {
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];
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);
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) {
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);
}
}