import org.cacert.gigi.dbObjects.NamePart;
import org.cacert.gigi.dbObjects.NamePart.NamePartType;
import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.email.EmailProvider;
+import org.cacert.gigi.email.DelegateMailProvider;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.template.IterableDataset;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.util.AuthorizationContext;
import org.cacert.gigi.util.DayDate;
import org.cacert.gigi.util.Notary;
+import org.cacert.gigi.util.TimeConditions;
import sun.security.x509.X509Key;
String mail = "test-assurer" + i + "@example.com";
User u = User.getByEmail(mail);
if (u == null) {
- System.out.println("Creating assurer");
+ System.out.println("Creating RA-Agent");
createUser(mail);
u = User.getByEmail(mail);
passCATS(u, CATSType.ASSURER_CHALLENGE);
return instance;
}
- public static class MailFetcher extends EmailProvider {
+ public static class MailFetcher extends DelegateMailProvider {
- public MailFetcher(Properties p) {}
+ Pattern[] toForward;
+
+ public MailFetcher(Properties props) {
+ super(props, props.getProperty("emailProvider.manager.target"));
+ String str = props.getProperty("emailProvider.manager.filter");
+ if (str == null) {
+ toForward = new Pattern[0];
+ } else {
+ String[] parts = str.split(" ");
+ toForward = new Pattern[parts.length];
+ for (int i = 0; i < parts.length; i++) {
+ toForward[i] = Pattern.compile(parts[i]);
+ }
+ }
+ }
@Override
public String checkEmailServer(int forUid, String address) throws IOException {
mails.put(to, hismails = new LinkedList<>());
}
hismails.addFirst(subject + "\n" + message);
+ for (int i = 0; i < toForward.length; i++) {
+ if (toForward[i].matcher(to).matches()) {
+ super.sendMail(to, subject, message, from, replyto, toname, fromname, errorsto, extra);
+ return;
+ }
+ }
}
}
if (vp < 10) {
currentVP = vp;
}
- Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Assure up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
+ Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
agentNumber += 1;
vp -= currentVP;
}
resp.getWriter().println("error");
} catch (GigiApiException e) {
e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH));
- } catch (InterruptedException e) {
- e.printStackTrace();
- resp.getWriter().println("interrupted");
}
} else if (req.getParameter("addExDom") != null) {
return true;
}
});
+
+ vars.put("testValidMonths", TimeConditions.getInstance().getTestMonths());
+ vars.put("reverificationDays", TimeConditions.getInstance().getVerificationLimitDays());
+ vars.put("verificationFreshMonths", TimeConditions.getInstance().getVerificationMonths());
+ vars.put("verificationMaxAgeMonths", TimeConditions.getInstance().getVerificationMaxAgeMonths());
+
form.output(resp.getWriter(), getLanguage(req), vars);
}
}