}
- public Certificate[] getCertificates() {
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=? AND revoked IS NULL");
+ 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());
GigiResultSet rs = ps.executeQuery();
rs.last();
}
public void update(String o, String c, String st, String l) {
- for (Certificate cert : getCertificates()) {
+ for (Certificate cert : getCertificates(false)) {
if (cert.getStatus() == CertificateStatus.ISSUED) {
cert.revoke();
}
HashMap<String, Object> vars = new HashMap<String, Object>();
User us = LoginPage.getUser(req);
- vars.put("certs", new CertificateIterable(us.getCertificates()));
+ vars.put("certs", new CertificateIterable(us.getCertificates(false)));
certTable.output(out, getLanguage(req), vars);
}
Assurance[] ma2 = u.getMadeAssurances();
Assurance[] ra = u.getReceivedAssurances();
Assurance[] ra2 = u.getReceivedAssurances();
- assertEquals(0, u.getCertificates().length);
+ assertEquals(0, u.getCertificates(false).length);
assertEquals(0, ma.length);
assertEquals(0, ma2.length);
assertEquals(0, ra.length);