X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=f67e81928a6dfc92b1bef81f71b8dc6ad8d65fe1;hb=e9625bad15becfac8c9e0a616986c85f32b31dd9;hp=e1425fecf05fb9e1b8d0c0094b165dc117c153a5;hpb=391ea9c432a89edbf2ecb10a4251d08eba1b5aaa;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index e1425fec..f67e8192 100644 --- a/src/org/cacert/gigi/dbObjects/User.java +++ b/src/org/cacert/gigi/dbObjects/User.java @@ -15,6 +15,7 @@ import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.localisation.Language; +import org.cacert.gigi.output.DateSelector; import org.cacert.gigi.util.Notary; import org.cacert.gigi.util.PasswordHash; import org.cacert.gigi.util.PasswordStrengthChecker; @@ -33,7 +34,7 @@ public class User extends CertificateOwner { private Locale locale; - private Set groups = new HashSet<>(); + private final Set groups = new HashSet<>(); protected User(GigiResultSet rs) { super(rs.getInt("id")); @@ -52,7 +53,7 @@ public class User extends CertificateOwner { locale = Language.getLocaleFromString(localeStr); } - GigiPreparedStatement psg = DatabaseConnection.getInstance().prepare("SELECT permission FROM user_groups WHERE user=? AND deleted is NULL"); + GigiPreparedStatement psg = DatabaseConnection.getInstance().prepare("SELECT `permission` FROM `user_groups` WHERE `user`=? AND `deleted` is NULL"); psg.setInt(1, rs.getInt("id")); try (GigiResultSet rs2 = psg.executeQuery()) { @@ -62,36 +63,29 @@ public class User extends CertificateOwner { } } - public User() {} - - public String getFName() { - return name.fname; - } - - public String getLName() { - return name.lname; - } - - public String getMName() { - return name.mname; + public User(String email, String password, Name name, Date dob, Locale locale) throws GigiApiException { + this.email = email; + this.dob = dob; + this.name = name; + this.locale = locale; + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("INSERT INTO `users` SET `email`=?, `password`=?, " + "`fname`=?, `mname`=?, `lname`=?, " + "`suffix`=?, `dob`=?, `language`=?, id=?"); + 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); + query.setString(8, locale.toString()); + query.setInt(9, getId()); + query.execute(); + new EmailAddress(this, email, locale); } public Name getName() { return name; } - public void setMName(String mname) { - this.name.mname = mname; - } - - public String getSuffix() { - return name.suffix; - } - - public void setSuffix(String suffix) { - this.name.suffix = suffix; - } - public Date getDoB() { return dob; } @@ -104,35 +98,8 @@ public class User extends CertificateOwner { return email; } - public void setEmail(String email) { - this.email = email; - } - - public void setFName(String fname) { - this.name.fname = fname; - } - - public void setLName(String lname) { - this.name.lname = lname; - } - - public void insert(String password) { - int id = super.insert(); - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("insert into `users` set `email`=?, `password`=?, " + "`fname`=?, `mname`=?, `lname`=?, " + "`suffix`=?, `dob`=?, `language`=?, id=?"); - query.setString(1, email); - query.setString(2, PasswordHash.hash(password)); - query.setString(3, name.fname); - query.setString(4, name.mname); - query.setString(5, name.lname); - query.setString(6, name.suffix); - query.setDate(7, new java.sql.Date(dob.getTime())); - query.setString(8, locale.toString()); - query.setInt(9, id); - query.execute(); - } - public void changePassword(String oldPass, String newPass) throws GigiApiException { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `password` FROM users WHERE id=?"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `password` FROM `users` WHERE `id`=?"); ps.setInt(1, getId()); try (GigiResultSet rs = ps.executeQuery()) { if ( !rs.next()) { @@ -143,7 +110,7 @@ public class User extends CertificateOwner { } } - PasswordStrengthChecker.assertStrongPassword(newPass, this); + PasswordStrengthChecker.assertStrongPassword(newPass, getName(), getEmail()); ps = DatabaseConnection.getInstance().prepare("UPDATE users SET `password`=? WHERE id=?"); ps.setString(1, PasswordHash.hash(newPass)); ps.setInt(2, getId()); @@ -167,7 +134,7 @@ public class User extends CertificateOwner { } public boolean hasPassedCATS() { - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `cats_passed` where `user_id`=?"); + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `cats_passed` where `user_id`=? AND `variant_id`=1"); query.setInt(1, getId()); try (GigiResultSet rs = query.executeQuery()) { if (rs.next()) { @@ -283,9 +250,8 @@ public class User extends CertificateOwner { for (EmailAddress email : getEmails()) { if (email.getId() == delMail.getId()) { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE emails SET deleted=? WHERE id=?"); - ps.setDate(1, new Date(System.currentTimeMillis())); - ps.setInt(2, delMail.getId()); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `emails` SET `deleted`=CURRENT_TIMESTAMP WHERE `id`=?"); + ps.setInt(1, delMail.getId()); ps.execute(); return; } @@ -295,7 +261,7 @@ public class User extends CertificateOwner { public synchronized Assurance[] getReceivedAssurances() { if (receivedAssurances == null) { - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `to`=? AND deleted IS NULL"); + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM `notary` WHERE `to`=? AND `deleted` IS NULL"); query.setInt(1, getId()); try (GigiResultSet res = query.executeQuery()) { @@ -312,7 +278,7 @@ public class User extends CertificateOwner { return receivedAssurances; } - public Assurance[] getMadeAssurances() { + public synchronized Assurance[] getMadeAssurances() { if (madeAssurances == null) { GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `from`=? AND deleted is NULL"); query.setInt(1, getId()); @@ -331,11 +297,11 @@ public class User extends CertificateOwner { return madeAssurances; } - public void invalidateMadeAssurances() { + public synchronized void invalidateMadeAssurances() { madeAssurances = null; } - public void invalidateReceivedAssurances() { + public synchronized void invalidateReceivedAssurances() { receivedAssurances = null; } @@ -345,18 +311,21 @@ public class User extends CertificateOwner { if (getAssurancePoints() != 0) { throw new GigiApiException("No change after assurance allowed."); } - - GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?"); - update.setString(1, getFName()); - update.setString(2, getLName()); - update.setString(3, getMName()); - update.setString(4, getSuffix()); - update.setDate(5, getDoB()); - update.setInt(6, getId()); - update.executeUpdate(); + rawUpdateUserData(); } } + protected void rawUpdateUserData() { + GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("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()); + update.setInt(6, getId()); + update.executeUpdate(); + } + public Locale getPreferredLocale() { return locale; } @@ -408,7 +377,7 @@ public class User extends CertificateOwner { public void grantGroup(User granter, Group toGrant) { groups.add(toGrant); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO user_groups SET user=?, permission=?, grantedby=?"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?"); ps.setInt(1, getId()); ps.setString(2, toGrant.getDatabaseName()); ps.setInt(3, granter.getId()); @@ -417,7 +386,7 @@ public class User extends CertificateOwner { public void revokeGroup(User revoker, Group toRevoke) { groups.remove(toRevoke); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE user_groups SET deleted=CURRENT_TIMESTAMP, revokedby=? WHERE deleted is NULL AND permission=? AND user=?"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("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.setInt(3, getId()); @@ -426,7 +395,7 @@ public class User extends CertificateOwner { public List getOrganisations() { List orgas = new ArrayList<>(); - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT orgid FROM org_admin WHERE `memid`=? AND deleted is NULL"); + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT `orgid` FROM `org_admin` WHERE `memid`=? AND `deleted` IS NULL"); query.setInt(1, getId()); try (GigiResultSet res = query.executeQuery()) { while (res.next()) { @@ -447,7 +416,7 @@ public class User extends CertificateOwner { } public static User getByEmail(String mail) { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT users.id FROM users INNER JOIN certOwners ON certOwners.id = users.id WHERE email=? AND deleted IS NULL"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `users`.`id` FROM `users` INNER JOIN `certOwners` ON `certOwners`.`id` = `users`.`id` WHERE `email`=? AND `deleted` IS NULL"); ps.setString(1, mail); try (GigiResultSet rs = ps.executeQuery()) { if ( !rs.next()) { @@ -460,7 +429,7 @@ public class User extends CertificateOwner { public static User[] findByEmail(String mail) { LinkedList results = new LinkedList(); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT users.id FROM users INNER JOIN certOwners ON certOwners.id = users.id WHERE users.email LIKE ? AND deleted IS NULL GROUP BY users.id ASC LIMIT 100"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `users`.`id` FROM `users` INNER JOIN `certOwners` ON `certOwners`.`id` = `users`.`id` WHERE `users`.`email` LIKE ? AND `deleted` IS NULL GROUP BY `users`.`id` LIMIT 100"); ps.setString(1, mail); try (GigiResultSet rs = ps.executeQuery()) { while (rs.next()) { @@ -470,21 +439,43 @@ public class User extends CertificateOwner { } } - public boolean canIssue(CertificateProfile p) { - // FIXME: Use descriptive constants - switch (p.getCAId()) { - case 0: - return true; - case 1: - return getAssurancePoints() > 50; - case 2: - return getAssurancePoints() > 50 && isInGroup(Group.getByString("codesigning")); - case 3: - case 4: - return getOrganisations().size() > 0; - default: - return false; + public EmailAddress[] getEmails() { + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `emails` WHERE `memid`=? AND `deleted` IS NULL"); + ps.setInt(1, getId()); + + try (GigiResultSet rs = ps.executeQuery()) { + LinkedList data = new LinkedList(); + + while (rs.next()) { + data.add(EmailAddress.getById(rs.getInt(1))); + } + + return data.toArray(new EmailAddress[0]); } } + @Override + public boolean isValidEmail(String email) { + for (EmailAddress em : getEmails()) { + if (em.getAddress().equals(email)) { + return em.isVerified(); + } + } + + return false; + } + + public String[] getTrainings() { + GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT `pass_date`, `type_text` FROM `cats_passed` LEFT JOIN `cats_type` ON `cats_type`.`id`=`cats_passed`.`variant_id` WHERE `user_id`=? ORDER BY `pass_date` ASC"); + prep.setInt(1, getId()); + GigiResultSet res = prep.executeQuery(); + List entries = new LinkedList(); + + while (res.next()) { + + entries.add(DateSelector.getDateFormat().format(res.getTimestamp(1)) + " (" + res.getString(2) + ")"); + } + + return entries.toArray(new String[0]); + } }