X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificateOwner.java;h=132b2787bd8c44b8d9c40a58a1024320570be891;hb=166e472044f5ecbe290be26517af28ce540ac0b1;hp=d7439f2ca0b60f8323b6395f6784f8b643288c37;hpb=ceb9e3a2bb91ecff8ce49604d43fac956df7f80c;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java index d7439f2c..132b2787 100644 --- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java +++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java @@ -1,11 +1,15 @@ package org.cacert.gigi.dbObjects; +import java.util.LinkedList; + import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; public abstract class CertificateOwner implements IdCachable { + private static ObjectCache myCache = new ObjectCache<>(); + private int id; public CertificateOwner(int id) { @@ -18,101 +22,74 @@ public abstract class CertificateOwner implements IdCachable { return id; } - private static ObjectCache myCache = new ObjectCache<>(); - public static synchronized CertificateOwner getById(int id) { CertificateOwner u = myCache.get(id); if (u == null) { GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT *, users.id AS uid, organisations.id AS oid FROM certOwners LEFT JOIN users ON users.id=certOwners.id LEFT JOIN organisations ON organisations.id = certOwners.id WHERE certOwners.id=? AND deleted is null"); ps.setInt(1, id); - GigiResultSet rs = ps.executeQuery(); - if ( !rs.next()) { - return null; - } - if (rs.getString("uid") != null) { - myCache.put(u = new User(rs)); - } else if (rs.getString("oid") != null) { - myCache.put(u = new Organisation(rs)); - } else { - System.err.print("Malformed cert owner: " + id); + try (GigiResultSet rs = ps.executeQuery()) { + if ( !rs.next()) { + return null; + } + if (rs.getString("uid") != null) { + myCache.put(u = new User(rs)); + } else if (rs.getString("oid") != null) { + myCache.put(u = new Organisation(rs)); + } else { + System.err.print("Malformed cert owner: " + id); + } } } return u; } protected int insert() { - if (id != 0) { - throw new Error("refusing to insert"); - } synchronized (User.class) { + if (id != 0) { + throw new Error("refusing to insert"); + } GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO certOwners() VALUES()"); ps.execute(); id = ps.lastInsertId(); myCache.put(this); } - return id; - } - - public EmailAddress[] getEmails() { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM emails WHERE memid=? AND deleted is NULL"); - 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; + return id; } 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."); + + try (GigiResultSet rs = ps.executeQuery()) { + LinkedList data = new LinkedList(); + + while (rs.next()) { + data.add(Domain.getById(rs.getInt(1))); } - data[i] = Domain.getById(rs.getInt(1)); - } - rs.close(); - return data; + return data.toArray(new Domain[0]); + } } public Certificate[] getCertificates(boolean includeRevoked) { GigiPreparedStatement ps; if (includeRevoked) { - ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=?"); + ps = DatabaseConnection.getInstance().prepare("SELECT id FROM certs WHERE memid=?"); } else { - ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=? AND revoked IS NULL"); + ps = DatabaseConnection.getInstance().prepare("SELECT id FROM certs WHERE memid=? AND revoked IS NULL"); } 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."); + + try (GigiResultSet rs = ps.executeQuery()) { + LinkedList data = new LinkedList(); + + while (rs.next()) { + data.add(Certificate.getById(rs.getInt(1))); } - data[i] = Certificate.getBySerial(rs.getString(1)); - } - rs.close(); - return data; + return data.toArray(new Certificate[0]); + } } public boolean isValidDomain(String domainname) { @@ -122,22 +99,17 @@ public abstract class CertificateOwner implements IdCachable { return true; } } - return false; - } - public boolean isValidEmail(String email) { - for (EmailAddress em : getEmails()) { - if (em.getAddress().equals(email)) { - return true; - } - } return false; } + public abstract boolean isValidEmail(String email); + public void delete() { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE certOwners set deleted=NOW() WHERE id=?"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE certOwners SET deleted=NOW() WHERE id=?"); ps.setInt(1, getId()); ps.execute(); myCache.remove(this); } + }