X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=1b4b52eaf17c69f53afbb17a72e8d6d67d5569ad;hb=e4bc9b8e76ce4de0c1937c35c11578e43f2d9650;hp=f6b22909d70a729bceec72470b14fef4412d497d;hpb=3996c636f7e66f20932665e2c3c2cd9c06029a24;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index f6b22909..1b4b52ea 100644 --- a/src/org/cacert/gigi/dbObjects/User.java +++ b/src/org/cacert/gigi/dbObjects/User.java @@ -33,7 +33,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 +52,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,7 +62,24 @@ public class User extends CertificateOwner { } } - public User() {} + 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; @@ -84,23 +101,8 @@ public class User extends CertificateOwner { this.email = email; } - 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.getFname()); - query.setString(4, name.getMname()); - query.setString(5, name.getLname()); - query.setString(6, name.getSuffix()); - 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()) { @@ -111,7 +113,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()); @@ -251,9 +253,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; } @@ -263,7 +264,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()) { @@ -379,7 +380,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()); @@ -388,7 +389,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()); @@ -397,7 +398,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()) { @@ -418,7 +419,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()) { @@ -431,7 +432,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()) { @@ -441,21 +442,30 @@ 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; + } + }