X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=69b76ad2004ec9aa24c5401b7d8f1f0f42845c12;hb=d0470c5987aaecbc444c7100319df69b6f740680;hp=91ab46cbe8b3c70aa081208ad0b75c4abe683199;hpb=9def69bd08ea69eb27786d5b34f00e154e09e9f3;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index 91ab46cb..69b76ad2 100644 --- a/src/org/cacert/gigi/dbObjects/User.java +++ b/src/org/cacert/gigi/dbObjects/User.java @@ -1,5 +1,8 @@ package org.cacert.gigi.dbObjects; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -13,6 +16,7 @@ import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.dbObjects.Assurance.AssuranceType; import org.cacert.gigi.dbObjects.CATS.CATSType; +import org.cacert.gigi.dbObjects.Country.CountryCodeType; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.DateSelector; import org.cacert.gigi.pages.PasswordResetPage; @@ -21,6 +25,7 @@ import org.cacert.gigi.util.DayDate; import org.cacert.gigi.util.Notary; import org.cacert.gigi.util.PasswordHash; import org.cacert.gigi.util.PasswordStrengthChecker; +import org.cacert.gigi.util.TimeConditions; /** * Represents an acting, assurable, user. Synchronizing on user means: no @@ -28,6 +33,8 @@ import org.cacert.gigi.util.PasswordStrengthChecker; */ public class User extends CertificateOwner { + private static final long serialVersionUID = -7915843843752264176L; + private DayDate dob; private String email; @@ -38,23 +45,29 @@ public class User extends CertificateOwner { private Locale locale; - private final Set groups = new HashSet<>(); + private Set groups = new HashSet<>(); public static final int MINIMUM_AGE = 16; + public static final int MAXIMUM_PLAUSIBLE_AGE = 120; + public static final int POJAM_AGE = 14; public static final int ADULT_AGE = 18; public static final boolean POJAM_ENABLED = false; + public static final int EXPERIENCE_POINTS = 4; + /** * Time in months a verification is considered "recent". */ - public static final int VERIFICATION_MONTHS = 39; + public static final int VERIFICATION_MONTHS = TimeConditions.getInstance().getVerificationMonths(); private Name preferredName; + private Country residenceCountry; + protected User(GigiResultSet rs) { super(rs.getInt("id")); updateName(rs); @@ -65,6 +78,14 @@ public class User extends CertificateOwner { email = rs.getString("email"); preferredName = Name.getById(rs.getInt("preferredName")); + try { + if (rs.getString("Country") != null) { + residenceCountry = Country.getCountryByCode(rs.getString("Country"), Country.CountryCodeType.CODE_2_CHARS); + } + } catch (GigiApiException e) { + throw new Error(e); + } + String localeStr = rs.getString("language"); if (localeStr == null || localeStr.equals("")) { locale = Locale.getDefault(); @@ -72,29 +93,36 @@ public class User extends CertificateOwner { locale = Language.getLocaleFromString(localeStr); } + refreshGroups(); + } + + public synchronized void refreshGroups() { + HashSet hs = new HashSet<>(); try (GigiPreparedStatement psg = new GigiPreparedStatement("SELECT `permission` FROM `user_groups` WHERE `user`=? AND `deleted` is NULL")) { - psg.setInt(1, rs.getInt("id")); + psg.setInt(1, getId()); try (GigiResultSet rs2 = psg.executeQuery()) { while (rs2.next()) { - groups.add(Group.getByString(rs2.getString(1))); + hs.add(Group.getByString(rs2.getString(1))); } } } + groups = hs; } - public User(String email, String password, DayDate dob, Locale locale, NamePart... preferred) throws GigiApiException { + public User(String email, String password, DayDate dob, Locale locale, Country residenceCountry, NamePart... preferred) throws GigiApiException { this.email = email; this.dob = dob; this.locale = locale; this.preferredName = new Name(this, preferred); - try (GigiPreparedStatement query = new GigiPreparedStatement("INSERT INTO `users` SET `email`=?, `password`=?, `dob`=?, `language`=?, id=?, `preferredName`=?")) { + try (GigiPreparedStatement query = new GigiPreparedStatement("INSERT INTO `users` SET `email`=?, `password`=?, `dob`=?, `language`=?, id=?, `preferredName`=?, `country` = ?")) { query.setString(1, email); query.setString(2, PasswordHash.hash(password)); query.setDate(3, dob.toSQLDate()); query.setString(4, locale.toString()); query.setInt(5, getId()); query.setInt(6, preferredName.getId()); + query.setString(7, residenceCountry == null ? null : residenceCountry.getCode()); query.execute(); } new EmailAddress(this, email, locale); @@ -131,7 +159,15 @@ public class User extends CertificateOwner { public void setDoB(DayDate dob) throws GigiApiException { synchronized (Notary.class) { if (getReceivedAssurances().length != 0) { - throw new GigiApiException("No change after assurance allowed."); + throw new GigiApiException("No change after verification allowed."); + } + + if ( !CalendarUtil.isOfAge(dob, User.MINIMUM_AGE)) { + throw new GigiApiException("Entered date of birth is below the restricted age requirements."); + } + + if (CalendarUtil.isOfAge(dob, User.MAXIMUM_PLAUSIBLE_AGE)) { + throw new GigiApiException("Entered date of birth exceeds the maximum age set in our policies. Please check your DoB is correct and contact support if the issue persists."); } this.dob = dob; rawUpdateUserData(); @@ -231,7 +267,7 @@ public class User extends CertificateOwner { int points = 0; if (rs.next()) { - points = rs.getInt(1) * 2; + points = rs.getInt(1) * EXPERIENCE_POINTS; } return points; @@ -244,6 +280,7 @@ public class User extends CertificateOwner { * * @return the maximal points @ */ + @SuppressWarnings("unused") public int getMaxAssurePoints() { if ( !CalendarUtil.isOfAge(dob, ADULT_AGE) && POJAM_ENABLED) { return 10; // PoJAM @@ -252,19 +289,19 @@ public class User extends CertificateOwner { int exp = getExperiencePoints(); int points = 10; - if (exp >= 10) { + if (exp >= 5 * EXPERIENCE_POINTS) { points += 5; } - if (exp >= 20) { + if (exp >= 10 * EXPERIENCE_POINTS) { points += 5; } - if (exp >= 30) { + if (exp >= 15 * EXPERIENCE_POINTS) { points += 5; } - if (exp >= 40) { + if (exp >= 20 * EXPERIENCE_POINTS) { points += 5; } - if (exp >= 50) { + if (exp >= 25 * EXPERIENCE_POINTS) { points += 5; } @@ -320,7 +357,7 @@ public class User extends CertificateOwner { public synchronized Assurance[] getReceivedAssurances() { if (receivedAssurances == null) { - try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM `notary` INNER JOIN `names` ON `names`.`id` = `notary`.`to` WHERE `names`.`uid`=? AND `notary`.`deleted` IS NULL")) { + try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM `notary` INNER JOIN `names` ON `names`.`id` = `notary`.`to` WHERE `names`.`uid`=? AND `notary`.`deleted` IS NULL ORDER BY `when` DESC")) { query.setInt(1, getId()); GigiResultSet res = query.executeQuery(); @@ -339,7 +376,7 @@ public class User extends CertificateOwner { public synchronized Assurance[] getMadeAssurances() { if (madeAssurances == null) { - try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM notary WHERE `from`=? AND deleted is NULL")) { + try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM notary WHERE `from`=? AND deleted is NULL ORDER BY `when` DESC")) { query.setInt(1, getId()); try (GigiResultSet res = query.executeQuery()) { @@ -382,7 +419,7 @@ public class User extends CertificateOwner { } - public Name getPreferredName() { + public synchronized Name getPreferredName() { return preferredName; } @@ -407,7 +444,10 @@ public class User extends CertificateOwner { return Collections.unmodifiableSet(groups); } - public void grantGroup(User granter, Group toGrant) { + public void grantGroup(User granter, Group toGrant) throws GigiApiException { + if (toGrant.isManagedBySupport() && !granter.isInGroup(Group.SUPPORTER)) { + throw new GigiApiException("Group may only be managed by supporter"); + } groups.add(toGrant); try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?")) { ps.setInt(1, getId()); @@ -576,7 +616,11 @@ public class User extends CertificateOwner { } private Assurance assuranceByRes(GigiResultSet res) { - return new Assurance(res.getInt("id"), User.getById(res.getInt("from")), Name.getById(res.getInt("to")), res.getString("location"), res.getString("method"), res.getInt("points"), res.getString("date")); + try { + return new Assurance(res.getInt("id"), User.getById(res.getInt("from")), Name.getById(res.getInt("to")), res.getString("location"), res.getString("method"), res.getInt("points"), res.getString("date"), res.getString("country") == null ? null : Country.getCountryByCode(res.getString("country"), CountryCodeType.CODE_2_CHARS)); + } catch (GigiApiException e) { + throw new Error(e); + } } public boolean isInVerificationLimit() { @@ -589,4 +633,24 @@ public class User extends CertificateOwner { } } + private void writeObject(ObjectOutputStream oos) throws IOException {} + + private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {} + + public Country getResidenceCountry() { + return residenceCountry; + } + + public void setResidenceCountry(Country residenceCountry) { + this.residenceCountry = residenceCountry; + rawUpdateCountryData(); + } + + private void rawUpdateCountryData() { + try (GigiPreparedStatement update = new GigiPreparedStatement("UPDATE users SET country=? WHERE id=?")) { + update.setString(1, residenceCountry == null ? null : residenceCountry.getCode()); + update.setInt(2, getId()); + update.executeUpdate(); + } + } }