public abstract class CertificateOwner implements IdCachable {
- private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
+ private static final ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
private int id;
- public CertificateOwner(int id) {
+ protected CertificateOwner(int id) {
this.id = id;
}
- public CertificateOwner() {}
+ protected CertificateOwner() {
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `certOwners` DEFAULT VALUES");
+ ps.execute();
+ id = ps.lastInsertId();
+ myCache.put(this);
+ }
public int getId() {
return id;
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");
+ 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);
try (GigiResultSet rs = ps.executeQuery()) {
if ( !rs.next()) {
return u;
}
- protected int 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());
-
- try (GigiResultSet rs = ps.executeQuery()) {
- LinkedList<EmailAddress> data = new LinkedList<EmailAddress>();
-
- while (rs.next()) {
- data.add(EmailAddress.getById(rs.getInt(1)));
- }
-
- return data.toArray(new EmailAddress[0]);
- }
- }
-
public Domain[] getDomains() {
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM domains WHERE memid=? AND deleted IS NULL");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `domains` WHERE `memid`=? AND `deleted` IS NULL");
ps.setInt(1, getId());
try (GigiResultSet rs = ps.executeQuery()) {
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());
LinkedList<Certificate> data = new LinkedList<Certificate>();
while (rs.next()) {
- data.add(Certificate.getBySerial(rs.getString(1)));
+ data.add(Certificate.getById(rs.getInt(1)));
}
return data.toArray(new Certificate[0]);
for (Domain d : getDomains()) {
String sfx = d.getSuffix();
if (domainname.equals(sfx) || domainname.endsWith("." + sfx)) {
- return true;
+ return d.isVerified();
}
}
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);