X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FOrganisation.java;h=7380381a50932e4efb08e4f42db59ee1cd279c7c;hp=6b5b28f44234dd006ab6f3f8d3bef29edcc542e8;hb=a1d3a796a20e7e2f11364b143ec639d5defa8b5f;hpb=a0232b6e40e7e09767f0444d24e18bf12dafc362 diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java index 6b5b28f4..7380381a 100644 --- a/src/org/cacert/gigi/dbObjects/Organisation.java +++ b/src/org/cacert/gigi/dbObjects/Organisation.java @@ -7,10 +7,12 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; +import org.cacert.gigi.dbObjects.wrappers.DataContainer; public class Organisation extends CertificateOwner { - public class Affiliation { + @DataContainer + public static class Affiliation { private final User target; @@ -18,7 +20,10 @@ public class Organisation extends CertificateOwner { private final String fixedOU; - public Affiliation(User target, boolean master, String fixedOU) { + private Organisation o; + + public Affiliation(Organisation o, User target, boolean master, String fixedOU) { + this.o = o; this.target = target; this.master = master; this.fixedOU = fixedOU; @@ -37,7 +42,7 @@ public class Organisation extends CertificateOwner { } public Organisation getOrganisation() { - return Organisation.this; + return o; } } @@ -51,24 +56,32 @@ public class Organisation extends CertificateOwner { private String email; - public Organisation(String name, String state, String province, String city, String email, User creator) throws GigiApiException { + private String optionalName; + + private String postalAddress; + + public Organisation(String name, String state, String province, String city, String email, String optionalName, String postalAddress, User creator) throws GigiApiException { if ( !creator.isInGroup(Group.ORGASSURER)) { - throw new GigiApiException("Only org-assurers may create organisations."); + throw new GigiApiException("Only Organisation RA Agents may create organisations."); } this.name = name; this.state = state; this.province = province; this.city = city; this.email = email; + this.optionalName = optionalName; + this.postalAddress = postalAddress; int id = getId(); - try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, contactEmail=?, creator=?")) { + try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, contactEmail=?, optional_name=?, postal_address=?, creator=?")) { ps.setInt(1, id); ps.setString(2, name); ps.setString(3, state); ps.setString(4, province); ps.setString(5, city); ps.setString(6, email); - ps.setInt(7, creator.getId()); + ps.setString(7, optionalName); + ps.setString(8, postalAddress); + ps.setInt(9, creator.getId()); synchronized (Organisation.class) { ps.execute(); } @@ -82,6 +95,8 @@ public class Organisation extends CertificateOwner { province = rs.getString("province"); city = rs.getString("city"); email = rs.getString("contactEmail"); + optionalName = rs.getString("optional_name"); + postalAddress = rs.getString("postal_address"); } public String getName() { @@ -104,20 +119,28 @@ public class Organisation extends CertificateOwner { return email; } + public String getOptionalName() { + return optionalName; + } + + public String getPostalAddress() { + return postalAddress; + } + public static synchronized Organisation getById(int id) { CertificateOwner co = CertificateOwner.getById(id); if (co instanceof Organisation) { return (Organisation) co; } - return null; + throw new IllegalArgumentException("Organisation not found."); } public synchronized void addAdmin(User admin, User actor, boolean master) throws GigiApiException { if ( !admin.canAssure()) { - throw new GigiApiException("Cannot add non-assurer."); + throw new GigiApiException("Cannot add person who is not RA Agent."); } if ( !actor.isInGroup(Group.ORGASSURER) && !isMaster(actor)) { - throw new GigiApiException("Only org assurer or master-admin may add admins to an organisation."); + throw new GigiApiException("Only Organisation RA Agents or Organisation Administrators may add admins to an organisation."); } try (GigiPreparedStatement ps1 = new GigiPreparedStatement("SELECT 1 FROM `org_admin` WHERE `orgid`=? AND `memid`=? AND `deleted` IS NULL")) { ps1.setInt(1, getId()); @@ -138,7 +161,7 @@ public class Organisation extends CertificateOwner { public void removeAdmin(User admin, User actor) throws GigiApiException { if ( !actor.isInGroup(Group.ORGASSURER) && !isMaster(actor)) { - throw new GigiApiException("Only org assurer or master-admin may delete admins from an organisation."); + throw new GigiApiException("Only Organisation RA Agents or Organisation Administrators may delete admins from an organisation."); } try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE org_admin SET deleter=?, deleted=NOW() WHERE orgid=? AND memid=?")) { ps.setInt(1, actor.getId()); @@ -156,7 +179,7 @@ public class Organisation extends CertificateOwner { ArrayList al = new ArrayList<>(rs.getRow()); rs.beforeFirst(); while (rs.next()) { - al.add(new Affiliation(User.getById(rs.getInt(1)), rs.getString(2).equals("y"), null)); + al.add(new Affiliation(this, User.getById(rs.getInt(1)), rs.getString(2).equals("y"), null)); } return al; } @@ -178,27 +201,39 @@ public class Organisation extends CertificateOwner { } } - public void update(String o, String c, String st, String l, String mail) { + public void updateCertData(String o, String c, String st, String l) { for (Certificate cert : getCertificates(false)) { if (cert.getStatus() == CertificateStatus.ISSUED) { cert.revoke(); } } - try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `name`=?, `state`=?, `province`=?, `city`=?, `contactEmail`=?")) { + try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `name`=?, `state`=?, `province`=?, `city`=? WHERE `id`=?")) { ps.setString(1, o); ps.setString(2, c); ps.setString(3, st); ps.setString(4, l); - ps.setString(5, mail); - ps.execute(); + ps.setInt(5, getId()); + ps.executeUpdate(); } - email = mail; name = o; state = c; province = st; city = l; } + public void updateOrgData(String mail, String o_name, String p_address) { + try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `contactEmail`=?, `optional_name`=?, `postal_address`=? WHERE `id`=?")) { + ps.setString(1, mail); + ps.setString(2, o_name); + ps.setString(3, p_address); + ps.setInt(4, getId()); + ps.executeUpdate(); + } + email = mail; + optionalName = o_name; + postalAddress = p_address; + } + public boolean isMaster(User u) { for (Affiliation i : getAllAdmins()) { if (i.isMaster() && i.getTarget() == u) { @@ -212,4 +247,10 @@ public class Organisation extends CertificateOwner { public boolean isValidEmail(String email) { return isValidDomain(email.split("@", 2)[1]); } + + public static final String SELF_ORG_NAME = "SomeCA"; + + public boolean isSelfOrganisation() { + return SELF_ORG_NAME.equals(getName()); + } }