X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Futil%2FNotary.java;h=33bf674e5317ababfa9acc7a9fc9627d8d11e05a;hb=c3feb67ae28e66765dfcd2e7d50ddbceb64d92db;hp=f43e3195038ea89b56ae2c7925efd4a857c66f48;hpb=b59c37e88149d0463ab4b802cacb6f0ea883acfb;p=gigi.git diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java index f43e3195..33bf674e 100644 --- a/src/org/cacert/gigi/util/Notary.java +++ b/src/org/cacert/gigi/util/Notary.java @@ -12,7 +12,7 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.dbObjects.Assurance.AssuranceType; -import org.cacert.gigi.dbObjects.CountryCode; +import org.cacert.gigi.dbObjects.Country; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.Name; import org.cacert.gigi.dbObjects.User; @@ -48,16 +48,18 @@ public class Notary { try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` where `to`=? and `from`=? and `method` = ? ::`notaryType` AND `deleted` IS NULL AND `when` > (now() - interval '1 days' * ?)")) { ps.setInt(1, target.getId()); ps.setInt(2, assurer.getId()); - ps.setString(3, AssuranceType.FACE_TO_FACE.getDescription()); + ps.setEnum(3, AssuranceType.FACE_TO_FACE); ps.setInt(4, LIMIT_DAYS_VERIFICATION); GigiResultSet rs = ps.executeQuery(); return !rs.next(); } } - public static final Group ASSURER_BLOCKED = Group.getByString("blockedassurer"); + public static final Group ASSURER_BLOCKED = Group.BLOCKEDASSURER; - public static final Group ASSUREE_BLOCKED = Group.getByString("blockedassuree"); + public static final Group ASSUREE_BLOCKED = Group.BLOCKEDASSUREE; + + public static final Group VERIFY_NOTIFICATION = Group.VERIFY_NOTIFICATION; /** * This method assures another user. @@ -81,7 +83,7 @@ public class Notary { * @throws GigiApiException * if the assurance fails (for various reasons) */ - public synchronized static void assure(User assurer, User assuree, Name assureeName, DayDate dob, int awarded, String location, String date, AssuranceType type, CountryCode country) throws GigiApiException { + public synchronized static void assure(User assurer, User assuree, Name assureeName, DayDate dob, int awarded, String location, String date, AssuranceType type, Country country) throws GigiApiException { may(assurer, assuree, AssuranceType.FACE_TO_FACE); GigiApiException gae = new GigiApiException(); if ( !gae.isEmpty()) { @@ -169,7 +171,7 @@ public class Notary { } } - private static void assureF2F(User assurer, User assuree, Name name, int awarded, String location, String date, CountryCode country) throws GigiApiException { + private static void assureF2F(User assurer, User assuree, Name name, int awarded, String location, String date, Country country) throws GigiApiException { may(assurer, assuree, AssuranceType.FACE_TO_FACE); try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `country`=?")) { ps.setInt(1, assurer.getId()); @@ -177,12 +179,12 @@ public class Notary { ps.setInt(3, awarded); ps.setString(4, location); ps.setString(5, date); - ps.setString(6, country.getCountryCode()); + ps.setString(6, country.getCode()); ps.execute(); } } - private static void assureTTP(User assurer, User assuree, Name name, int awarded, String location, String date, CountryCode country) throws GigiApiException { + private static void assureTTP(User assurer, User assuree, Name name, int awarded, String location, String date, Country country) throws GigiApiException { may(assurer, assuree, AssuranceType.TTP_ASSISTED); try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `country`=?, `method`='TTP-Assisted'")) { ps.setInt(1, assurer.getId()); @@ -190,7 +192,7 @@ public class Notary { ps.setInt(3, awarded); ps.setString(4, location); ps.setString(5, date); - ps.setString(6, country.getCountryCode()); + ps.setString(6, country.getCode()); ps.execute(); assuree.revokeGroup(assurer, Group.TTP_APPLICANT); } @@ -223,7 +225,7 @@ public class Notary { throw new GigiApiException("Verification type not possible."); } - private static void assureNucleus(User assurer, User assuree, Name name, int awarded, String location, String date, CountryCode country) throws GigiApiException { + private static void assureNucleus(User assurer, User assuree, Name name, int awarded, String location, String date, Country country) throws GigiApiException { may(assurer, assuree, AssuranceType.NUCLEUS); // Do up to 35 points as f2f int f2fPoints = Math.min(assurer.getMaxAssurePoints(), awarded); @@ -242,12 +244,12 @@ public class Notary { ps.setInt(3, awarded); ps.setString(4, location); ps.setString(5, date); - ps.setString(6, country.getCountryCode()); + ps.setString(6, country.getCode()); ps.execute(); } } - public synchronized static void assureAll(User assurer, User assuree, DayDate dob, int awarded, String location, String date, AssuranceType type, Name[] toAssure, CountryCode country) throws GigiApiException { + public synchronized static void assureAll(User assurer, User assuree, DayDate dob, int awarded, String location, String date, AssuranceType type, Name[] toAssure, Country country) throws GigiApiException { if (toAssure.length == 0) { throw new GigiApiException("You must confirm at least one name to verify an account."); } @@ -259,10 +261,15 @@ public class Notary { assure(assurer, assuree, toAssure[i], dob, awarded, location, date, type, country); } sendVerificationNotificationApplicant(assurer, assuree, toAssure, awarded, hadLessThan50Points, hadTotalLessThan100); + if (assurer.isInGroup(VERIFY_NOTIFICATION)) { + sendVerificationNotificationAgent(assurer, assuree, toAssure, awarded, location, date, country); + } } private static final MailTemplate verificationEntered = new MailTemplate(Notary.class.getResource("VerificationEntered.templ")); + private static final MailTemplate verificationAgentEntered = new MailTemplate(Notary.class.getResource("VerificationAgentEntered.templ")); + private static void sendVerificationNotificationApplicant(User assurer, User assuree, Name[] toAssure, final int awarded, final boolean[] hadLessThan50Points, boolean hadTotalLessThan100) { HashMap mailVars = new HashMap<>(); mailVars.put("agent", assurer.getPreferredName().toString()); @@ -299,4 +306,27 @@ public class Notary { e.printStackTrace(); } } + + private static void sendVerificationNotificationAgent(User agent, User applicant, Name[] toVerify, final int awarded, String location, String date, Country country) { + HashMap mailVars = new HashMap<>(); + mailVars.put("email", applicant.getEmail()); + mailVars.put("location", location); + mailVars.put("date", date); + mailVars.put("country", country.getName()); + mailVars.put("points", Integer.toString(awarded)); + mailVars.put("names", new ArrayIterable(toVerify) { + + @Override + public void apply(Name t, Language l, Map vars) { + vars.put("name", t.toString()); + } + + }); + + try { + verificationAgentEntered.sendMail(Language.getInstance(applicant.getPreferredLocale()), mailVars, agent.getEmail()); + } catch (IOException e) { + e.printStackTrace(); + } + } }