diff options
| author | Christina Fu <cfu@redhat.com> | 2016-04-05 15:57:38 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@redhat.com> | 2016-04-06 15:35:18 -0700 |
| commit | ca8febca42bdb278d5fbfc641333c4bd1fe7a9be (patch) | |
| tree | 6832186d445702620ec6a5b5059eaa201e603522 | |
| parent | 6448bfea3282f2f3a81520b3381d2a833babd491 (diff) | |
| download | pki-ca8febca42bdb278d5fbfc641333c4bd1fe7a9be.tar.gz pki-ca8febca42bdb278d5fbfc641333c4bd1fe7a9be.tar.xz pki-ca8febca42bdb278d5fbfc641333c4bd1fe7a9be.zip | |
Ticket #1519 token format should delete certs from token record
This patch removes certs from token record when it is formatted.
| -rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java | 4 | ||||
| -rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java index 51f496652..7a12466b8 100644 --- a/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java +++ b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java @@ -325,6 +325,7 @@ public class TPSTokendb { if (cuid == null) throw new Exception(method + ": cuid null"); + CMS.debug(method + ":" + " begins for cuid=" + cuid); String filter = cuid; Iterator<TPSCertRecord> records; try { @@ -340,8 +341,11 @@ public class TPSTokendb { if (certRecord.getTokenID().equalsIgnoreCase(cuid)) { tps.certDatabase.removeRecord(certRecord.getId()); CMS.debug(method + ":" + "cert removed:" + certRecord.getId()); + } else { + CMS.debug(method + ":" + " next record not matched:" + certRecord.getTokenID()); } } + CMS.debug(method + ":" + " done"); } public void revokeCertsByCUID(String cuid, String tokenReason, String ipAddress, String remoteUser) diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java index 53af08a05..01cde7608 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -2141,6 +2141,15 @@ public class TPSProcessor { } } + try { + // clean up the cert records used to belong to this token in tokendb + tps.tdb.tdbRemoveCertificatesByCUID(tokenRecord.getId()); + } catch (Exception e) { + logMsg = "Attempt to clean up record with tdbRemoveCertificatesByCUID failed; token probably clean; continue anyway:" + + e; + CMS.debug("TPSProcessor.format: " + logMsg); + } + // Update Token DB tokenRecord.setStatus("uninitialized"); try { |