summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-04-22 02:42:24 +0200
committerEndi S. Dewata <edewata@redhat.com>2016-04-26 01:03:39 +0200
commit33d02d644a1f61bce25698ec28a8ce9890ee3067 (patch)
treee0b3f1473473185ca19cb89dedbfc6971c1b0fab
parent929094c92be6ad5d8314aa2b9dbeac5ddcf4229b (diff)
downloadpki-33d02d644a1f61bce25698ec28a8ce9890ee3067.zip
pki-33d02d644a1f61bce25698ec28a8ce9890ee3067.tar.gz
pki-33d02d644a1f61bce25698ec28a8ce9890ee3067.tar.xz
Fixed activity logs for certificate revocations.
The TPSTokendb.shouldRevoke() has been modified such that it throws an exception instead of returning boolean. The method has also been renamed to checkShouldRevoke(). The revokeCert() and unrevokeCert() have been modified to catch the exception and log the failed operation.
-rw-r--r--base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java60
-rw-r--r--base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java3
2 files changed, 25 insertions, 38 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
index 0d05453..e69ce93 100644
--- a/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
@@ -397,13 +397,8 @@ public class TPSTokendb {
logMsg = "called to revoke";
CMS.debug(method + ": " + logMsg);
- boolean revokeCert = shouldRevoke(tokenRecord, cert, tokenReason, ipAddress, remoteUser);
- if (!revokeCert) {
- logMsg = "certificate not to be revoked:" + cert.getSerialNumber();
- CMS.debug(method + ":" + logMsg);
- return;
- }
+ checkShouldRevoke(tokenRecord, cert, tokenReason, ipAddress, remoteUser);
logMsg = "certificate to be revoked:" + cert.getSerialNumber();
CMS.debug(method + ": " + logMsg);
@@ -434,13 +429,15 @@ public class TPSTokendb {
logMsg = "certificate revoked: " + cert.getSerialNumber();
CMS.debug(method + ": " + logMsg);
- //TODO: tdbActivity
+ tdbActivity(ActivityDatabase.OP_CERT_REVOCATION, tokenRecord,
+ ipAddress, logMsg, "success", remoteUser);
} catch (Exception e) {
logMsg = "certificate not revoked: " + cert.getSerialNumber() + ": " + e;
CMS.debug(method + ": " + logMsg);
- //TODO: tdbActivity
+ tdbActivity(ActivityDatabase.OP_CERT_REVOCATION, tokenRecord,
+ ipAddress, e.getMessage(), "failure", remoteUser);
// continue revoking the next certificate
}
@@ -486,26 +483,27 @@ public class TPSTokendb {
logMsg = "certificate unrevoked: " + cert.getSerialNumber();
CMS.debug(method + ": " + logMsg);
- //TODO: tdbActivity
+ tdbActivity(ActivityDatabase.OP_CERT_UNREVOCATION, tokenRecord,
+ ipAddress, logMsg, "success", remoteUser);
} catch (Exception e) {
logMsg = "certificate not unrevoked: " + cert.getSerialNumber() + " : " + e;
CMS.debug(method + ": " + logMsg);
- //TODO: tdbActivity
+ tdbActivity(ActivityDatabase.OP_CERT_UNREVOCATION, tokenRecord,
+ ipAddress, e.getMessage(), "failure", remoteUser);
// continue unrevoking the next certificate
}
}
- private boolean shouldRevoke(TokenRecord tokenRecord, TPSCertRecord cert, String tokenReason,
+ private void checkShouldRevoke(TokenRecord tokenRecord, TPSCertRecord cert, String tokenReason,
String ipAddress, String remoteUser) throws Exception {
+
IConfigStore configStore = CMS.getConfigStore();
- String method = "TPStokendb.shouldRevoke";
- String activityMsg;
if (cert == null) {
- throw new TPSException(method + ": cert null");
+ throw new TPSException("Missing token certificate");
}
String tokenType = cert.getType();
@@ -516,15 +514,11 @@ public class TPSTokendb {
".recovery." + tokenReason + ".revokeCert";
boolean revokeCerts = configStore.getBoolean(config, true);
if (!revokeCerts) {
- activityMsg = "certificate revocation (serial " + cert.getSerialNumber() +
+ throw new TPSException(
+ "certificate revocation (serial " + cert.getSerialNumber() +
") not enabled for tokenType: " + tokenType +
", keyType: " + keyType +
- ", state: " + tokenReason;
-
- tdbActivity(ActivityDatabase.OP_TOKEN_MODIFY, tokenRecord,
- ipAddress, activityMsg, "success", remoteUser);
-
- return false;
+ ", state: " + tokenReason);
}
// check if expired certificates should be revoked.
@@ -536,16 +530,12 @@ public class TPSTokendb {
Date notAfter = cert.getValidNotAfter();
Date now = new Date();
if (now.after(notAfter)) {
- activityMsg = "revocation not enabled for expired cert: " + cert.getSerialNumber();
- tdbActivity(ActivityDatabase.OP_TOKEN_MODIFY, tokenRecord,
- ipAddress, activityMsg, "success", remoteUser);
- return false;
+ throw new TPSException(
+ "revocation not enabled for expired cert: " + cert.getSerialNumber());
}
if (now.before(notBefore)) {
- activityMsg = "revocation not enabled for cert that is not yet valid: " + cert.getSerialNumber();
- tdbActivity(ActivityDatabase.OP_TOKEN_MODIFY, tokenRecord,
- ipAddress, activityMsg, "success", remoteUser);
- return false;
+ throw new TPSException(
+ "revocation not enabled for cert that is not yet valid: " + cert.getSerialNumber());
}
}
@@ -555,17 +545,11 @@ public class TPSTokendb {
boolean holdRevocation = configStore.getBoolean(config, false);
if (holdRevocation) {
if (!isLastActiveSharedCert(cert.getSerialNumber(), cert.getIssuedBy(), tokenRecord.getId())) {
- activityMsg = "revocation not permitted as certificate " + cert.getSerialNumber() +
- " is shared by anothr active token";
-
- tdbActivity(ActivityDatabase.OP_TOKEN_MODIFY, tokenRecord,
- ipAddress, activityMsg, "success", remoteUser);
-
- return false;
+ throw new TPSException(
+ "revocation not permitted as certificate " + cert.getSerialNumber() +
+ " is shared by another active token");
}
}
-
- return true;
}
/*
diff --git a/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java
index 3382836..fdcd4ea 100644
--- a/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java
+++ b/base/tps/src/org/dogtagpki/server/tps/dbs/ActivityDatabase.java
@@ -49,6 +49,9 @@ public class ActivityDatabase extends LDAPDatabase<ActivityRecord> {
public final static String OP_TOKEN_MODIFY = "token_modify";
public final static String OP_TOKEN_STATUS_CHANGE = "token_status_change";
+ public final static String OP_CERT_REVOCATION = "cert_revocation";
+ public final static String OP_CERT_UNREVOCATION = "cert_unrevocation";
+
public ActivityDatabase(IDBSubsystem dbSubsystem, String baseDN) throws EBaseException {
super("Activity", dbSubsystem, baseDN, ActivityRecord.class);
}