X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=ad2d38675c64329da0eef5d6c2e16974c8e1c061;hp=8e9bc762b227d88844edf05c0028b41df1488224;hb=3238dff5b3beca228359b370bc104f48d6247632;hpb=952f3ddd9438cf10ba25a5d9f1e9d8a04d75e0dc diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index 8e9bc762..ad2d3867 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; @@ -11,7 +14,9 @@ import java.util.Set; 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.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; @@ -20,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 @@ -27,7 +33,7 @@ import org.cacert.gigi.util.PasswordStrengthChecker; */ public class User extends CertificateOwner { - private Name name = new Name(null, null, null, null); + private static final long serialVersionUID = -7915843843752264176L; private DayDate dob; @@ -39,30 +45,39 @@ 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; - protected User(GigiResultSet rs) { + private Country residenceCountry; + + protected User(GigiResultSet rs) throws GigiApiException { super(rs.getInt("id")); - updateName(rs); - } - private void updateName(GigiResultSet rs) { - name = new Name(rs.getString("fname"), rs.getString("lname"), rs.getString("mname"), rs.getString("suffix")); dob = new DayDate(rs.getDate("dob")); email = rs.getString("email"); + preferredName = Name.getById(rs.getInt("preferredName")); + + if (rs.getString("country") != null) { + residenceCountry = Country.getCountryByCode(rs.getString("Country"), Country.CountryCodeType.CODE_2_CHARS); + } String localeStr = rs.getString("language"); if (localeStr == null || localeStr.equals("")) { @@ -71,47 +86,95 @@ 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, Name name, DayDate dob, Locale locale) 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.name = name; this.locale = locale; - try (GigiPreparedStatement query = new GigiPreparedStatement("INSERT INTO `users` SET `email`=?, `password`=?, " + "`fname`=?, `mname`=?, `lname`=?, " + "`suffix`=?, `dob`=?, `language`=?, id=?")) { + this.preferredName = new Name(this, preferred); + 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.setString(3, name.getFname()); - query.setString(4, name.getMname()); - query.setString(5, name.getLname()); - query.setString(6, name.getSuffix()); - query.setDate(7, dob.toSQLDate()); - query.setString(8, locale.toString()); - query.setInt(9, getId()); + 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); } - public Name getName() { - return name; + public Name[] getNames() { + try (GigiPreparedStatement gps = new GigiPreparedStatement("SELECT `id` FROM `names` WHERE `uid`=? AND `deleted` IS NULL", true)) { + gps.setInt(1, getId()); + return fetchNamesToArray(gps); + } + } + + public Name[] getNonDeprecatedNames() { + try (GigiPreparedStatement gps = new GigiPreparedStatement("SELECT `id` FROM `names` WHERE `uid`=? AND `deleted` IS NULL AND `deprecated` IS NULL", true)) { + gps.setInt(1, getId()); + return fetchNamesToArray(gps); + } + } + + private Name[] fetchNamesToArray(GigiPreparedStatement gps) { + GigiResultSet rs = gps.executeQuery(); + rs.last(); + Name[] dt = new Name[rs.getRow()]; + rs.beforeFirst(); + for (int i = 0; rs.next(); i++) { + dt[i] = Name.getById(rs.getInt(1)); + } + return dt; } public DayDate getDoB() { return dob; } - public void setDoB(DayDate dob) { - this.dob = dob; + public void setDoB(DayDate dob) throws GigiApiException { + synchronized (Notary.class) { + if (getReceivedAssurances().length != 0) { + 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(); + } + + } + + protected void setDoBAsSupport(DayDate dob) throws GigiApiException { + synchronized (Notary.class) { + this.dob = dob; + rawUpdateUserData(); + } + } public String getEmail() { @@ -134,7 +197,7 @@ public class User extends CertificateOwner { } private void setPassword(String newPass) throws GigiApiException { - PasswordStrengthChecker.assertStrongPassword(newPass, getName(), getEmail()); + PasswordStrengthChecker.assertStrongPassword(newPass, getNames(), getEmail()); try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE users SET `password`=? WHERE id=?")) { ps.setString(1, PasswordHash.hash(newPass)); ps.setInt(2, getId()); @@ -142,10 +205,6 @@ public class User extends CertificateOwner { } } - public void setName(Name name) { - this.name = name; - } - public boolean canAssure() { if (POJAM_ENABLED) { if ( !CalendarUtil.isOfAge(dob, POJAM_AGE)) { // PoJAM @@ -179,7 +238,7 @@ public class User extends CertificateOwner { } public int getAssurancePoints() { - try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT sum(points) FROM `notary` where `to`=? AND `deleted` is NULL AND (`expire` IS NULL OR `expire` > CURRENT_TIMESTAMP)")) { + try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT SUM(lastpoints) FROM ( SELECT DISTINCT ON (`from`, `method`) `from`, `points` as lastpoints FROM `notary` INNER JOIN `names` ON `names`.`id`=`to` WHERE `notary`.`deleted` is NULL AND (`expire` IS NULL OR `expire` > CURRENT_TIMESTAMP) AND `names`.`uid` = ? ORDER BY `from`, `method`, `when` DESC) as p")) { query.setInt(1, getId()); GigiResultSet rs = query.executeQuery(); @@ -194,14 +253,15 @@ public class User extends CertificateOwner { } public int getExperiencePoints() { - try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT count(*) FROM `notary` where `from`=? AND `deleted` is NULL")) { + try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT count(*) FROM ( SELECT `names`.`uid` FROM `notary` INNER JOIN `names` ON `names`.`id` = `to` WHERE `from`=? AND `notary`.`deleted` IS NULL AND `method` = ? ::`notaryType` GROUP BY `names`.`uid`) as p")) { query.setInt(1, getId()); + query.setEnum(2, AssuranceType.FACE_TO_FACE); GigiResultSet rs = query.executeQuery(); int points = 0; if (rs.next()) { - points = rs.getInt(1) * 2; + points = rs.getInt(1) * EXPERIENCE_POINTS; } return points; @@ -214,6 +274,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 @@ -222,19 +283,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; } @@ -242,7 +303,12 @@ public class User extends CertificateOwner { } public boolean isValidName(String name) { - return getName().matches(name); + for (Name n : getNames()) { + if (n.matches(name) && n.getAssurancePoints() >= 50) { + return true; + } + } + return false; } public void updateDefaultEmail(EmailAddress newMail) throws GigiApiException { @@ -285,7 +351,7 @@ public class User extends CertificateOwner { public synchronized Assurance[] getReceivedAssurances() { if (receivedAssurances == null) { - try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT * FROM `notary` WHERE `to`=? AND `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(); @@ -304,7 +370,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()) { @@ -330,23 +396,10 @@ public class User extends CertificateOwner { receivedAssurances = null; } - public void updateUserData() throws GigiApiException { - synchronized (Notary.class) { - if (getReceivedAssurances().length != 0) { - throw new GigiApiException("No change after assurance allowed."); - } - rawUpdateUserData(); - } - } - - protected void rawUpdateUserData() { - try (GigiPreparedStatement update = new GigiPreparedStatement("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?")) { - update.setString(1, name.getFname()); - update.setString(2, name.getLname()); - update.setString(3, name.getMname()); - update.setString(4, name.getSuffix()); - update.setDate(5, getDoB().toSQLDate()); - update.setInt(6, getId()); + private void rawUpdateUserData() { + try (GigiPreparedStatement update = new GigiPreparedStatement("UPDATE users SET dob=? WHERE id=?")) { + update.setDate(1, getDoB().toSQLDate()); + update.setInt(2, getId()); update.executeUpdate(); } } @@ -360,38 +413,21 @@ public class User extends CertificateOwner { } - public boolean wantsDirectoryListing() { - try (GigiPreparedStatement get = new GigiPreparedStatement("SELECT listme FROM users WHERE id=?")) { - get.setInt(1, getId()); - GigiResultSet exec = get.executeQuery(); - return exec.next() && exec.getBoolean("listme"); - } + public synchronized Name getPreferredName() { + return preferredName; } - public String getContactInformation() { - try (GigiPreparedStatement get = new GigiPreparedStatement("SELECT contactinfo FROM users WHERE id=?")) { - get.setInt(1, getId()); - - GigiResultSet exec = get.executeQuery(); - exec.next(); - return exec.getString("contactinfo"); + public synchronized void setPreferredName(Name preferred) throws GigiApiException { + if (preferred.getOwner() != this) { + throw new GigiApiException("Cannot set a name as preferred one that does not belong to this account."); } - } - - public void setDirectoryListing(boolean on) { - try (GigiPreparedStatement update = new GigiPreparedStatement("UPDATE users SET listme = ? WHERE id = ?")) { - update.setBoolean(1, on); - update.setInt(2, getId()); - update.executeUpdate(); + this.preferredName = preferred; + try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `users` SET `preferredName`=? WHERE `id`=?")) { + ps.setInt(1, preferred.getId()); + ps.setInt(2, getId()); + ps.executeUpdate(); } - } - public void setContactInformation(String contactInfo) { - try (GigiPreparedStatement update = new GigiPreparedStatement("UPDATE users SET contactinfo = ? WHERE id = ?")) { - update.setString(1, contactInfo); - update.setInt(2, getId()); - update.executeUpdate(); - } } public boolean isInGroup(Group g) { @@ -402,21 +438,30 @@ 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"); + } + if (toGrant.isManagedBySupport() && granter == this) { + throw new GigiApiException("Group may only be managed by supporter that is not oneself"); + } groups.add(toGrant); try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?")) { ps.setInt(1, getId()); - ps.setString(2, toGrant.getDatabaseName()); + ps.setEnum(2, toGrant); ps.setInt(3, granter.getId()); ps.execute(); } } - public void revokeGroup(User revoker, Group toRevoke) { + public void revokeGroup(User revoker, Group toRevoke) throws GigiApiException { + if (toRevoke.isManagedBySupport() && !revoker.isInGroup(Group.SUPPORTER)) { + throw new GigiApiException("Group may only be managed by supporter"); + } groups.remove(toRevoke); try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `user_groups` SET `deleted`=CURRENT_TIMESTAMP, `revokedby`=? WHERE `deleted` IS NULL AND `permission`=?::`userGroup` AND `user`=?")) { ps.setInt(1, revoker.getId()); - ps.setString(2, toRevoke.getDatabaseName()); + ps.setEnum(2, toRevoke); ps.setInt(3, getId()); ps.execute(); } @@ -571,16 +616,41 @@ public class User extends CertificateOwner { } private Assurance assuranceByRes(GigiResultSet res) { - return new Assurance(res.getInt("id"), User.getById(res.getInt("from")), User.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), res.getTimestamp("expire")); + } catch (GigiApiException e) { + throw new Error(e); + } } - public static boolean isInVerificationLimit(int id) { - try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` WHERE `to` = ? AND `when` > (now() - (interval '1 month' * ?)) AND (`expire` IS NULL OR `expire` > now()) AND `deleted` IS NULL;")) { - ps.setInt(1, id); + public boolean isInVerificationLimit() { + try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` INNER JOIN `names` ON `names`.`id`=`to` WHERE `names`.`uid` = ? AND `when` > (now() - (interval '1 month' * ?)) AND (`expire` IS NULL OR `expire` > now()) AND `notary`.`deleted` IS NULL;")) { + ps.setInt(1, getId()); ps.setInt(2, VERIFICATION_MONTHS); GigiResultSet rs = ps.executeQuery(); return rs.next(); } } + + 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(); + } + } }