X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=ad2d38675c64329da0eef5d6c2e16974c8e1c061;hb=3238dff5b3beca228359b370bc104f48d6247632;hp=61f347a4e90b380e70802d9871641da1ead0161f;hpb=dff3996afcd54cde9dfed259a9a24ceecaa78e7a;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index 61f347a4..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; @@ -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; @@ -29,6 +33,8 @@ import org.cacert.gigi.util.TimeConditions; */ public class User extends CertificateOwner { + private static final long serialVersionUID = -7915843843752264176L; + private DayDate dob; private String email; @@ -39,7 +45,7 @@ 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; @@ -60,16 +66,19 @@ public class User extends CertificateOwner { 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) { 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("")) { locale = Locale.getDefault(); @@ -77,29 +86,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); @@ -107,18 +123,19 @@ public class User extends CertificateOwner { 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) { - gps.setInt(1, getId()); GigiResultSet rs = gps.executeQuery(); rs.last(); Name[] dt = new Name[rs.getRow()]; @@ -136,7 +153,7 @@ 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)) { @@ -221,7 +238,7 @@ public class User extends CertificateOwner { } public int getAssurancePoints() { - try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT SUM(lastpoints) FROM ( SELECT DISTINCT ON (`from`) `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`, `when` DESC) as p")) { + 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(); @@ -238,7 +255,7 @@ public class User extends CertificateOwner { public int getExperiencePoints() { 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.setString(2, AssuranceType.FACE_TO_FACE.getDescription()); + query.setEnum(2, AssuranceType.FACE_TO_FACE); GigiResultSet rs = query.executeQuery(); int points = 0; @@ -421,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(); } @@ -590,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), res.getTimestamp("expire")); + } catch (GigiApiException e) { + throw new Error(e); + } } public boolean isInVerificationLimit() { @@ -603,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(); + } + } }