X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=e1425fecf05fb9e1b8d0c0094b165dc117c153a5;hp=31ce4421277a98bf9657fa96bae3aa853643e02d;hb=391ea9c432a89edbf2ecb10a4251d08eba1b5aaa;hpb=123b7724f9b8ab944a7aa6ab2df9499f34b02a4b diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index 31ce4421..e1425fec 100644 --- a/src/org/cacert/gigi/dbObjects/User.java +++ b/src/org/cacert/gigi/dbObjects/User.java @@ -1,9 +1,12 @@ package org.cacert.gigi.dbObjects; import java.sql.Date; +import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; import java.util.Locale; import java.util.Set; @@ -24,7 +27,9 @@ public class User extends CertificateOwner { private String email; - private Assurance[] receivedAssurances, madeAssurances; + private Assurance[] receivedAssurances; + + private Assurance[] madeAssurances; private Locale locale; @@ -39,32 +44,35 @@ public class User extends CertificateOwner { name = new Name(rs.getString("fname"), rs.getString("lname"), rs.getString("mname"), rs.getString("suffix")); dob = rs.getDate("dob"); email = rs.getString("email"); + String localeStr = rs.getString("language"); if (localeStr == null || localeStr.equals("")) { locale = Locale.getDefault(); } else { locale = Language.getLocaleFromString(localeStr); } + GigiPreparedStatement psg = DatabaseConnection.getInstance().prepare("SELECT permission FROM user_groups WHERE user=? AND deleted is NULL"); psg.setInt(1, rs.getInt("id")); - GigiResultSet rs2 = psg.executeQuery(); - while (rs2.next()) { - groups.add(Group.getByString(rs2.getString(1))); + + try (GigiResultSet rs2 = psg.executeQuery()) { + while (rs2.next()) { + groups.add(Group.getByString(rs2.getString(1))); + } } - rs2.close(); } public User() {} - public String getFname() { + public String getFName() { return name.fname; } - public String getLname() { + public String getLName() { return name.lname; } - public String getMname() { + public String getMName() { return name.mname; } @@ -72,7 +80,7 @@ public class User extends CertificateOwner { return name; } - public void setMname(String mname) { + public void setMName(String mname) { this.name.mname = mname; } @@ -84,11 +92,11 @@ public class User extends CertificateOwner { this.name.suffix = suffix; } - public Date getDob() { + public Date getDoB() { return dob; } - public void setDob(Date dob) { + public void setDoB(Date dob) { this.dob = dob; } @@ -100,11 +108,11 @@ public class User extends CertificateOwner { this.email = email; } - public void setFname(String fname) { + public void setFName(String fname) { this.name.fname = fname; } - public void setLname(String lname) { + public void setLName(String lname) { this.name.lname = lname; } @@ -126,21 +134,24 @@ public class User extends CertificateOwner { public void changePassword(String oldPass, String newPass) throws GigiApiException { GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `password` FROM users WHERE id=?"); ps.setInt(1, getId()); - GigiResultSet rs = ps.executeQuery(); - if ( !rs.next()) { - throw new GigiApiException("User not found... very bad."); - } - if ( !PasswordHash.verifyHash(oldPass, rs.getString(1))) { - throw new GigiApiException("Old password does not match."); + try (GigiResultSet rs = ps.executeQuery()) { + if ( !rs.next()) { + throw new GigiApiException("User not found... very bad."); + } + if (PasswordHash.verifyHash(oldPass, rs.getString(1)) == null) { + throw new GigiApiException("Old password does not match."); + } } - rs.close(); + PasswordStrengthChecker.assertStrongPassword(newPass, this); ps = DatabaseConnection.getInstance().prepare("UPDATE users SET `password`=? WHERE id=?"); ps.setString(1, PasswordHash.hash(newPass)); ps.setInt(2, getId()); - if (ps.executeUpdate() != 1) { - throw new GigiApiException("Password update failed."); - } + ps.executeUpdate(); + } + + public void setName(Name name) { + this.name = name; } public boolean canAssure() { @@ -158,50 +169,43 @@ public class User extends CertificateOwner { public boolean hasPassedCATS() { GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `cats_passed` where `user_id`=?"); query.setInt(1, getId()); - GigiResultSet rs = query.executeQuery(); - if (rs.next()) { - return true; - } else { - return false; + try (GigiResultSet rs = query.executeQuery()) { + if (rs.next()) { + return true; + } else { + return false; + } } } public int getAssurancePoints() { - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT sum(points) FROM `notary` where `to`=? AND `deleted`=0"); + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT sum(points) FROM `notary` where `to`=? AND `deleted` is NULL"); query.setInt(1, getId()); - GigiResultSet rs = query.executeQuery(); - int points = 0; - if (rs.next()) { - points = rs.getInt(1); + + try (GigiResultSet rs = query.executeQuery()) { + int points = 0; + + if (rs.next()) { + points = rs.getInt(1); + } + + return points; } - rs.close(); - return points; } public int getExperiencePoints() { - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT count(*) FROM `notary` where `from`=? AND `deleted`=0"); + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT count(*) FROM `notary` where `from`=? AND `deleted` is NULL"); query.setInt(1, getId()); - GigiResultSet rs = query.executeQuery(); - int points = 0; - if (rs.next()) { - points = rs.getInt(1) * 2; - } - rs.close(); - return points; - } - @Override - public boolean equals(Object obj) { - if ( !(obj instanceof User)) { - return false; + try (GigiResultSet rs = query.executeQuery()) { + int points = 0; + + if (rs.next()) { + points = rs.getInt(1) * 2; + } + + return points; } - User s = (User) obj; - return name.equals(s.name) && email.equals(s.email) && dob.toString().equals(s.dob.toString()); // This - // is - // due - // to - // day - // cutoff } /** @@ -233,6 +237,7 @@ public class User extends CertificateOwner { if (exp >= 50) { points += 5; } + return points; } @@ -247,114 +252,40 @@ public class User extends CertificateOwner { return System.currentTimeMillis() >= c.getTime().getTime(); } - public EmailAddress[] getEmails() { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM emails WHERE memid=? AND deleted=0"); - ps.setInt(1, getId()); - GigiResultSet rs = ps.executeQuery(); - rs.last(); - int count = rs.getRow(); - EmailAddress[] data = new EmailAddress[count]; - rs.beforeFirst(); - for (int i = 0; i < data.length; i++) { - if ( !rs.next()) { - throw new Error("Internal sql api violation."); - } - data[i] = EmailAddress.getById(rs.getInt(1)); - } - rs.close(); - return data; - - } - - public Domain[] getDomains() { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM domains WHERE memid=? AND deleted IS NULL"); - ps.setInt(1, getId()); - GigiResultSet rs = ps.executeQuery(); - rs.last(); - int count = rs.getRow(); - Domain[] data = new Domain[count]; - rs.beforeFirst(); - for (int i = 0; i < data.length; i++) { - if ( !rs.next()) { - throw new Error("Internal sql api violation."); - } - data[i] = Domain.getById(rs.getInt(1)); - } - rs.close(); - return data; - - } - - public Certificate[] getCertificates() { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=? AND revoked=0"); - ps.setInt(1, getId()); - GigiResultSet rs = ps.executeQuery(); - rs.last(); - int count = rs.getRow(); - Certificate[] data = new Certificate[count]; - rs.beforeFirst(); - for (int i = 0; i < data.length; i++) { - if ( !rs.next()) { - throw new Error("Internal sql api violation."); - } - data[i] = Certificate.getBySerial(rs.getString(1)); - } - rs.close(); - return data; - - } - - public boolean isValidDomain(String domainname) { - for (Domain d : getDomains()) { - String sfx = d.getSuffix(); - if (domainname.equals(sfx) || domainname.endsWith("." + sfx)) { - return true; - } - } - return false; - } - - public boolean isValidEmail(String email) { - for (EmailAddress em : getEmails()) { - if (em.getAddress().equals(email)) { - return true; - } - } - return false; - } - public boolean isValidName(String name) { return getName().matches(name); } public void updateDefaultEmail(EmailAddress newMail) throws GigiApiException { - EmailAddress[] adrs = getEmails(); - for (int i = 0; i < adrs.length; i++) { - if (adrs[i].getAddress().equals(newMail.getAddress())) { - if ( !adrs[i].isVerified()) { + for (EmailAddress email : getEmails()) { + if (email.getAddress().equals(newMail.getAddress())) { + if ( !email.isVerified()) { throw new GigiApiException("Email not verified."); } + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE users SET email=? WHERE id=?"); ps.setString(1, newMail.getAddress()); ps.setInt(2, getId()); ps.execute(); - email = newMail.getAddress(); + + this.email = newMail.getAddress(); return; } } + throw new GigiApiException("Given address not an address of the user."); } - public void deleteEmail(EmailAddress mail) throws GigiApiException { - if (getEmail().equals(mail.getAddress())) { + public void deleteEmail(EmailAddress delMail) throws GigiApiException { + if (getEmail().equals(delMail.getAddress())) { throw new GigiApiException("Can't delete user's default e-mail."); } - EmailAddress[] emails = getEmails(); - for (int i = 0; i < emails.length; i++) { - if (emails[i].getId() == mail.getId()) { + + 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, mail.getId()); + ps.setInt(2, delMail.getId()); ps.execute(); return; } @@ -362,39 +293,41 @@ public class User extends CertificateOwner { throw new GigiApiException("Email not one of user's email addresses."); } - public Assurance[] getReceivedAssurances() { + public synchronized Assurance[] getReceivedAssurances() { if (receivedAssurances == null) { - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `to`=? AND deleted=0"); + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `to`=? AND deleted IS NULL"); query.setInt(1, getId()); - GigiResultSet res = query.executeQuery(); - res.last(); - Assurance[] assurances = new Assurance[res.getRow()]; - res.beforeFirst(); - for (int i = 0; i < assurances.length; i++) { - res.next(); - assurances[i] = new Assurance(res); + + try (GigiResultSet res = query.executeQuery()) { + List assurances = new LinkedList(); + + while (res.next()) { + assurances.add(new Assurance(res)); + } + + this.receivedAssurances = assurances.toArray(new Assurance[0]); } - this.receivedAssurances = assurances; - return assurances; } + return receivedAssurances; } public Assurance[] getMadeAssurances() { if (madeAssurances == null) { - GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `from`=? AND deleted=0"); + GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `from`=? AND deleted is NULL"); query.setInt(1, getId()); - GigiResultSet res = query.executeQuery(); - res.last(); - Assurance[] assurances = new Assurance[res.getRow()]; - res.beforeFirst(); - for (int i = 0; i < assurances.length; i++) { - res.next(); - assurances[i] = new Assurance(res); + + try (GigiResultSet res = query.executeQuery()) { + List assurances = new LinkedList(); + + while (res.next()) { + assurances.add(new Assurance(res)); + } + + this.madeAssurances = assurances.toArray(new Assurance[0]); } - this.madeAssurances = assurances; - return assurances; } + return madeAssurances; } @@ -408,15 +341,17 @@ public class User extends CertificateOwner { public void updateUserData() throws GigiApiException { synchronized (Notary.class) { + // FIXME: No assurance, not no points. 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(1, getFName()); + update.setString(2, getLName()); + update.setString(3, getMName()); update.setString(4, getSuffix()); - update.setDate(5, getDob()); + update.setDate(5, getDoB()); update.setInt(6, getId()); update.executeUpdate(); } @@ -434,17 +369,19 @@ public class User extends CertificateOwner { public boolean wantsDirectoryListing() { GigiPreparedStatement get = DatabaseConnection.getInstance().prepare("SELECT listme FROM users WHERE id=?"); get.setInt(1, getId()); - GigiResultSet exec = get.executeQuery(); - exec.next(); - return exec.getBoolean("listme"); + try (GigiResultSet exec = get.executeQuery()) { + return exec.next() && exec.getBoolean("listme"); + } } public String getContactInformation() { GigiPreparedStatement get = DatabaseConnection.getInstance().prepare("SELECT contactinfo FROM users WHERE id=?"); get.setInt(1, getId()); - GigiResultSet exec = get.executeQuery(); - exec.next(); - return exec.getString("contactinfo"); + + try (GigiResultSet exec = get.executeQuery()) { + exec.next(); + return exec.getString("contactinfo"); + } } public void setDirectoryListing(boolean on) { @@ -487,15 +424,54 @@ public class User extends CertificateOwner { ps.execute(); } + public List getOrganisations() { + List orgas = new ArrayList<>(); + 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()) { + orgas.add(Organisation.getById(res.getInt(1))); + } + + return orgas; + } + } + public static synchronized User getById(int id) { CertificateOwner co = CertificateOwner.getById(id); if (co instanceof User) { return (User) co; } + return null; } + 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"); + ps.setString(1, mail); + try (GigiResultSet rs = ps.executeQuery()) { + if ( !rs.next()) { + return null; + } + + return User.getById(rs.getInt(1)); + } + } + + 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"); + ps.setString(1, mail); + try (GigiResultSet rs = ps.executeQuery()) { + while (rs.next()) { + results.add(User.getById(rs.getInt(1))); + } + return results.toArray(new User[results.size()]); + } + } + public boolean canIssue(CertificateProfile p) { + // FIXME: Use descriptive constants switch (p.getCAId()) { case 0: return true; @@ -505,9 +481,10 @@ public class User extends CertificateOwner { return getAssurancePoints() > 50 && isInGroup(Group.getByString("codesigning")); case 3: case 4: - return false; // has an orga + return getOrganisations().size() > 0; default: return false; } } + }