X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificateOwner.java;h=a66229fe6bdefa90a8d6ef9df07d1f9341e87d11;hb=d7271af56f7c4f3381ea079f1be1a52124e1d241;hp=e9fb53fae45921804685bd44303790205944df05;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index e9fb53fa..a66229fe 100644
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -1,106 +1,96 @@
 package org.cacert.gigi.dbObjects;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
 import java.util.LinkedList;
+import java.util.List;
 
-import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 
-public abstract class CertificateOwner implements IdCachable {
+public abstract class CertificateOwner implements IdCachable, Serializable {
 
-    private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
+    private static final long serialVersionUID = -672580485730247314L;
+
+    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() {
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("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");
-            ps.setInt(1, 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);
-                }
-            }
+        CertificateOwner cached = myCache.get(id);
+        if (cached != null) {
+            return cached;
         }
-        return u;
-    }
 
-    protected int insert() {
-        synchronized (User.class) {
-            if (id != 0) {
-                throw new Error("refusing to insert");
+        try (GigiPreparedStatement psU = new GigiPreparedStatement("SELECT *, `users`.`id` AS uid FROM `certOwners` INNER JOIN `users` ON `users`.`id`=`certOwners`.`id` WHERE `certOwners`.`id`=? AND `deleted` is null")) {
+            psU.setInt(1, id);
+            GigiResultSet rsU = psU.executeQuery();
+            if (rsU.next()) {
+                return myCache.put(new User(rsU));
             }
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO certOwners() VALUES()");
-            ps.execute();
-            id = ps.lastInsertId();
-            myCache.put(this);
+        } catch (GigiApiException e) {
+            throw new Error(e);
         }
 
-        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)));
+        try (GigiPreparedStatement psO = new GigiPreparedStatement("SELECT *, `organisations`.`id` AS oid FROM `certOwners` INNER JOIN `organisations` ON `organisations`.`id`=`certOwners`.`id` WHERE `certOwners`.`id`=? AND `deleted` is null")) {
+            psO.setInt(1, id);
+            GigiResultSet rsO = psO.executeQuery();
+            if (rsO.next()) {
+                return myCache.put(new Organisation(rsO));
             }
-
-            return data.toArray(new EmailAddress[0]);
+        } catch (GigiApiException e) {
+            throw new Error(e);
         }
+
+        System.err.println("Malformed cert owner: " + id);
+        return null;
     }
 
     public Domain[] getDomains() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM domains WHERE memid=? AND deleted IS NULL");
-        ps.setInt(1, getId());
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `domains` WHERE `memid`=? AND `deleted` IS NULL")) {
+            ps.setInt(1, getId());
 
-        try (GigiResultSet rs = ps.executeQuery()) {
-            LinkedList<Domain> data = new LinkedList<Domain>();
+            try (GigiResultSet rs = ps.executeQuery()) {
+                LinkedList<Domain> data = new LinkedList<Domain>();
 
-            while (rs.next()) {
-                data.add(Domain.getById(rs.getInt(1)));
-            }
+                while (rs.next()) {
+                    data.add(Domain.getById(rs.getInt(1)));
+                }
 
-            return data.toArray(new Domain[0]);
+                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=?");
-        } else {
-            ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=? AND revoked IS NULL");
-        }
-        ps.setInt(1, getId());
+        try (GigiPreparedStatement ps = new GigiPreparedStatement(includeRevoked ? "SELECT id FROM certs WHERE memid=?" : "SELECT id FROM certs WHERE memid=? AND revoked IS NULL")) {
+            ps.setInt(1, getId());
 
-        try (GigiResultSet rs = ps.executeQuery()) {
+            GigiResultSet rs = ps.executeQuery();
             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]);
@@ -111,28 +101,71 @@ public abstract class CertificateOwner implements IdCachable {
         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;
+    public abstract boolean isValidEmail(String email);
+
+    public void delete() {
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `certOwners` SET `deleted`=NOW() WHERE `id`=?")) {
+            ps.setInt(1, getId());
+            ps.execute();
+        }
+        myCache.remove(this);
+    }
+
+    public String[] getAdminLog() {
+        try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `when`, type, information FROM `adminLog` WHERE uid=? ORDER BY `when` ASC")) {
+            prep.setInt(1, getId());
+            GigiResultSet res = prep.executeQuery();
+            List<String> entries = new LinkedList<String>();
+
+            while (res.next()) {
+                entries.add(res.getString(2) + " (" + res.getString(3) + ")");
             }
+            return entries.toArray(new String[0]);
         }
+    }
 
-        return false;
+    public static CertificateOwner getByEnabledSerial(String serial) {
+        try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `memid` FROM `certs` INNER JOIN `logincerts` ON `logincerts`.`id`=`certs`.`id` WHERE serial=? AND `revoked` is NULL")) {
+            prep.setString(1, serial);
+            GigiResultSet res = prep.executeQuery();
+            if (res.next()) {
+                return getById(res.getInt(1));
+            }
+            return null;
+        }
     }
 
-    public void delete() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE certOwners SET deleted=NOW() WHERE id=?");
-        ps.setInt(1, getId());
-        ps.execute();
-        myCache.remove(this);
+    private void writeObject(ObjectOutputStream oos) throws IOException {
+        oos.writeLong(getId());
+    }
+
+    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+        id = (int) ois.readLong();
+    }
+
+    protected Object readResolve() throws ObjectStreamException {
+        /**
+         * Returning the Object by looking up its ID in the cache.
+         *
+         * @see http://www.javalobby.org/java/forums/t17491.html
+         * @see http://www.jguru.com/faq/view.jsp?EID=44039
+         * @see http://thecodersbreakfast.net/
+         *      ?post/2011/05/12/Serialization-and-magic-methods
+         */
+        CertificateOwner co = getById(this.getId());
+
+        if (null == co) {
+            throw new Error("Unknown Certificate Owner");
+        }
+
+        return co;
     }
 
 }