X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FUser.java;h=0b77b97d6e53d76be0cdc2759eff6ae73ae45fe7;hb=4f60523bbf9ad5035a655c5089be79bcf9413598;hp=63dc812c5150c6ac07879ee8ecfc10435beb8d13;hpb=701ba7f582c84412cabd47aeb9d785b93a892c07;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 63dc812c..0b77b97d 100644
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -1,9 +1,11 @@
 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.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -130,7 +132,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();
@@ -247,82 +249,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 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;
-
-    }
-
-    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 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.");
-            }
-            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);
     }
@@ -487,6 +413,18 @@ public class User extends CertificateOwner {
         ps.execute();
     }
 
+    public List<Organisation> getOrganisations() {
+        List<Organisation> 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 +433,16 @@ 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 boolean canIssue(CertificateProfile p) {
         switch (p.getCAId()) {
         case 0: