X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=412f02ca601f42b6e29b2a0fbcc0425a4548d041;hb=8af6231b22da4fef795bcb54913faad6592b1a02;hp=31ce4421277a98bf9657fa96bae3aa853643e02d;hpb=123b7724f9b8ab944a7aa6ab2df9499f34b02a4b;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java index 31ce4421..412f02ca 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; @@ -130,7 +133,7 @@ public class User extends CertificateOwner { if ( !rs.next()) { throw new GigiApiException("User not found... very bad."); } - if ( !PasswordHash.verifyHash(oldPass, rs.getString(1))) { + if (PasswordHash.verifyHash(oldPass, rs.getString(1)) == null) { throw new GigiApiException("Old password does not match."); } rs.close(); @@ -138,9 +141,11 @@ public class User extends CertificateOwner { 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() { @@ -167,7 +172,7 @@ public class User extends CertificateOwner { } 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; @@ -179,7 +184,7 @@ public class User extends CertificateOwner { } 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; @@ -247,82 +252,6 @@ 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); } @@ -364,7 +293,7 @@ public class User extends CertificateOwner { public 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(); @@ -382,7 +311,7 @@ public class User extends CertificateOwner { 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(); @@ -487,6 +416,18 @@ 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()); + 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) { @@ -495,6 +436,28 @@ public class User extends CertificateOwner { 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); + 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); + GigiResultSet rs = ps.executeQuery(); + while (rs.next()) { + results.add(User.getById(rs.getInt(1))); + System.out.println("Found user"); + } + return results.toArray(new User[results.size()]); + } + public boolean canIssue(CertificateProfile p) { switch (p.getCAId()) { case 0: @@ -505,9 +468,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; } } + }