import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.Signature;
-import java.sql.Date;
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 java.util.Map;
import java.util.Properties;
import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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;
import org.cacert.gigi.ping.DomainPinger;
import org.cacert.gigi.ping.PingerDaemon;
import org.cacert.gigi.util.AuthorizationContext;
+import org.cacert.gigi.util.DayDate;
import org.cacert.gigi.util.Notary;
import sun.security.x509.X509Key;
public static final String PATH = "/manager";
- Field f;
-
private static HashMap<DomainPingType, DomainPinger> dps;
private Manager() {
super("Test Manager");
- try {
- f = EmailAddress.class.getDeclaredField("hash");
- f.setAccessible(true);
- } catch (ReflectiveOperationException e) {
- // TODO
- 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");
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;
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 Date(gc.getTime().getTime()), Locale.ENGLISH);
+ 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];
- if (f == null) {
- System.out.println("verification failed");
- return;
- }
- String hash = (String) f.get(ea);
+ verify(email, ea);
+ }
- ea.verify(hash);
+ private void verify(String email, EmailAddress ea) throws GigiApiException {
+ LinkedList<String> i = emails.get(email);
+ while (i.size() > 0 && !ea.isVerified()) {
+ String lst = i.getLast();
+ Pattern p = Pattern.compile("hash=([a-zA-Z0-9]+)");
+ Matcher m = p.matcher(lst);
+ if (m.find()) {
+ ea.verify(m.group(1));
+ }
+ i.removeLast();
+ }
+ // ea.verify(hash);
}
User[] assurers = new User[25];
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);
User u = User.getByEmail(req.getParameter("addEmailEmail"));
try {
EmailAddress ea = new EmailAddress(u, req.getParameter("addEmailNew"), Locale.ENGLISH);
- if (f != null) {
- String hash = (String) f.get(ea);
- ea.verify(hash);
- resp.getWriter().println("Email added and verified");
- } else {
- resp.getWriter().println("Email added but verificatio failed.");
- }
+ verify(ea.getAddress(), ea);
} catch (IllegalArgumentException e) {
e.printStackTrace();
resp.getWriter().println("An internal error occured.");
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- resp.getWriter().println("An internal error occured.");
} catch (GigiApiException e) {
e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH));
}
fetchMails(req, resp, mail);
return;
}
+ HashMap<String, Object> vars = new HashMap<>();
+ vars.put("cats_types", new IterableDataset() {
+
+ CATSType[] type = CATSType.values();
+
+ int i = 0;
- form.output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+ @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);
}
}