import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.Signature;
+import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
+import java.util.Random;
import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.cacert.gigi.dbObjects.Certificate;
import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
import org.cacert.gigi.dbObjects.CertificateOwner;
+import org.cacert.gigi.dbObjects.Country;
import org.cacert.gigi.dbObjects.Digest;
import org.cacert.gigi.dbObjects.Domain;
import org.cacert.gigi.dbObjects.DomainPingType;
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;
public class Manager extends Page {
+ public static String validVerificationDateString() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar c = Calendar.getInstance();
+ c.setTimeInMillis(System.currentTimeMillis());
+ c.add(Calendar.MONTH, -Notary.LIMIT_MAX_MONTHS_VERIFICATION + 1);
+ return sdf.format(new Date(c.getTimeInMillis()));
+ }
+
+ public static Country getRandomCountry() {
+ List<Country> cc = Country.getCountries();
+ int rnd = new Random().nextInt(cc.size());
+ return cc.get(rnd);
+ }
+
public static final String PATH = "/manager";
private static HashMap<DomainPingType, DomainPinger> dps;
}
}
+ public User getSupporter() {
+ if (supporter != null) {
+ return supporter;
+ }
+ try {
+ User u = createAssurer( -1);
+ if ( !u.isInGroup(Group.SUPPORTER)) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?")) {
+ ps.setInt(1, u.getId());
+ ps.setString(2, Group.SUPPORTER.getDBName());
+ ps.setInt(3, u.getId());
+ ps.execute();
+ }
+ u.refreshGroups();
+ }
+ supporter = u;
+ } catch (ReflectiveOperationException | GigiApiException e) {
+ e.printStackTrace();
+ }
+ return supporter;
+ }
+
public User getAssurer(int i) {
if (assurers[i] != null) {
return assurers[i];
}
private User createAssurer(int i) throws GigiApiException, IllegalAccessException {
- try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `country`=?")) {
String mail = "test-assurer" + i + "@example.com";
User u = User.getByEmail(mail);
if (u == null) {
ps.setInt(3, 100);
ps.setString(4, "Manager init code");
ps.setString(5, "1990-01-01");
+ ps.setString(6, getRandomCountry().getCode());
ps.execute();
}
return u;
return instance;
}
- public static class MailFetcher extends EmailProvider {
+ public static class MailFetcher extends DelegateMailProvider {
+
+ Pattern[] toForward;
- public MailFetcher(Properties p) {}
+ 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 {
}
@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 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) {
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, replyto, toname, fromname, errorsto, extra);
+ return;
+ }
+ }
}
}
Calendar gc = GregorianCalendar.getInstance();
gc.setTimeInMillis(0);
gc.set(1990, 0, 1);
- User u = new User(email, "xvXV12°§", new DayDate(gc.getTime().getTime()), Locale.ENGLISH, //
- new NamePart(NamePartType.FIRST_NAME, "Först"), new NamePart(NamePartType.FIRST_NAME, "Müddle"),//
+
+ Country country = getRandomCountry();
+
+ User u = new User(email, "xvXV12°§", new DayDate(gc.getTime().getTime()), Locale.ENGLISH, country, //
+ new NamePart(NamePartType.FIRST_NAME, "Först"), new NamePart(NamePartType.FIRST_NAME, "Müddle"), //
new NamePart(NamePartType.LAST_NAME, "Läst"), new NamePart(NamePartType.SUFFIX, "Süffix"));
EmailAddress ea = u.getEmails()[0];
verify(email, ea);
User[] assurers = new User[25];
+ User supporter;
+
@Override
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
if (req.getParameter("create") != null) {
resp.getWriter().println("User not found.");
return;
}
- if (req.getParameter("addpriv") != null) {
- u.grantGroup(u, Group.getByString(req.getParameter("priv")));
- resp.getWriter().println("Privilege granted");
- } else {
- u.revokeGroup(u, Group.getByString(req.getParameter("priv")));
- resp.getWriter().println("Privilege revoked");
+ try {
+ if (req.getParameter("addpriv") != null) {
+ u.grantGroup(getSupporter(), Group.getByString(req.getParameter("priv")));
+ resp.getWriter().println("Privilege granted");
+ } else {
+ u.revokeGroup(getSupporter(), Group.getByString(req.getParameter("priv")));
+ resp.getWriter().println("Privilege revoked");
+ }
+ } catch (GigiApiException e) {
+ throw new Error(e);
}
} else if (req.getParameter("fetch") != null) {
String mail = req.getParameter("femail");
if (vp < 10) {
currentVP = vp;
}
- Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
+ Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", validVerificationDateString(), AssuranceType.FACE_TO_FACE, getRandomCountry());
agentNumber += 1;
vp -= currentVP;
}
try {
for (int i = 0; i < 25; i++) {
User a = getAssurer(i);
- Notary.assure(byEmail, a, a.getNames()[0], a.getDoB(), 10, "Testmanager exp up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
+ Notary.assure(byEmail, a, a.getNames()[0], a.getDoB(), 10, "Testmanager exp up code", validVerificationDateString(), AssuranceType.FACE_TO_FACE, getRandomCountry());
}
} catch (GigiApiException e) {
throw new Error(e);
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) {
vars.put("reverificationDays", TimeConditions.getInstance().getVerificationLimitDays());
vars.put("verificationFreshMonths", TimeConditions.getInstance().getVerificationMonths());
vars.put("verificationMaxAgeMonths", TimeConditions.getInstance().getVerificationMaxAgeMonths());
+ vars.put("emailPingMonths", TimeConditions.getInstance().getEmailPingMonths());
form.output(resp.getWriter(), getLanguage(req), vars);
}
projects / gigi.git / blobdiff