add: cert-rules closer to reality

[gigi.git] / src / org / cacert / gigi / dbObjects / User.java

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index c346ab531f3bdcb5a12b813705fe9d32023ddf28..42457db543a625540be62b5deff109321fd72778 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -313,18 +313,21 @@ public class User extends CertificateOwner {
             if (getAssurancePoints() != 0) {
                 throw new GigiApiException("No change after assurance allowed.");
             }
-
-            GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?");
-            update.setString(1, name.getFname());
-            update.setString(2, name.getLname());
-            update.setString(3, name.getMname());
-            update.setString(4, name.getSuffix());
-            update.setDate(5, getDoB());
-            update.setInt(6, getId());
-            update.executeUpdate();
+            rawUpdateUserData();
         }
     }
 
+    protected void rawUpdateUserData() {
+        GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?");
+        update.setString(1, name.getFname());
+        update.setString(2, name.getLname());
+        update.setString(3, name.getMname());
+        update.setString(4, name.getSuffix());
+        update.setDate(5, getDoB());
+        update.setInt(6, getId());
+        update.executeUpdate();
+    }
+
     public Locale getPreferredLocale() {
         return locale;
     }
@@ -438,21 +441,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<EmailAddress> data = new LinkedList<EmailAddress>();
+
+            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 true;
+            }
+        }
+
+        return false;
+    }
+
 }