Added token status UNFORMATTED.

A new token status UNFORMATTED has been added for new tokens added
via UI/CLI and for TERMINATED tokens that are to be reused.

https://fedorahosted.org/pki/ticket/2287

2 files changed, 17 insertions, 5 deletions

diff --git a/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
index 52eadd35f..2e46b037c 100644
--- a/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
+++ b/base/tps/src/org/dogtagpki/server/tps/TPSTokendb.java
@@ -38,6 +38,7 @@ import org.dogtagpki.tps.msg.EndOpMsg.TPSStatus;
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.dbs.EDBRecordNotFoundException;
 import com.netscape.certsrv.tps.token.TokenStatus;
 
 import netscape.security.x509.RevocationReason;
@@ -183,8 +184,9 @@ public class TPSTokendb {
         TokenRecord existingTokenRecord;
         try {
             existingTokenRecord = tps.tokenDatabase.getRecord(id);
-        } catch (Exception e) {
-            CMS.debug("TPSTokendb.tdbUpdateTokenEntry: token entry not found; Adding");
+        } catch (EDBRecordNotFoundException e) {
+            CMS.debug("TPSTokendb.tdbUpdateTokenEntry: " + e);
+            CMS.debug("TPSTokendb.tdbUpdateTokenEntry: Adding token " + id);
             // add and exit
             tdbAddTokenEntry(tokenRecord, TokenStatus.FORMATTED);
             return;
diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java
index 7d78b7166..2104f292b 100644
--- a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java
@@ -91,6 +91,16 @@ public class TokenService extends PKIService implements TokenResource {
         auditModParams.put("UserID", tokenRecord.getUserID());
 
         switch (tokenState.getValue()) {
+        case TokenStatus.TOKEN_UNFORMATTED:
+            tokenRecord.setUserID(null);
+            tokenRecord.setType(null);
+            tokenRecord.setAppletID(null);
+            tokenRecord.setKeyInfo(null);
+            tokenRecord.setPolicy(null);
+            tokenRecord.setTokenStatus(tokenState);
+            tokenRecord.setReason(null);
+            break;
+
         case TokenStatus.TOKEN_FORMATTED:
             tokenRecord.setTokenStatus(tokenState);
             tokenRecord.setReason(null);
@@ -368,9 +378,9 @@ public class TokenService extends PKIService implements TokenResource {
                 auditModParams.put("Policy", policy);
             }
 
-            // new tokens are FORMATTED when added via UI/CLI
-            tokenRecord.setTokenStatus(TokenStatus.FORMATTED);
-            auditModParams.put("Status", TokenStatus.FORMATTED.toString());
+            // new tokens are UNFORMATTED when added via UI/CLI
+            tokenRecord.setTokenStatus(TokenStatus.UNFORMATTED);
+            auditModParams.put("Status", TokenStatus.UNFORMATTED.toString());
 
             database.addRecord(tokenID, tokenRecord);
             subsystem.tdb.tdbActivity(ActivityDatabase.OP_ADD, tokenRecord,