diff options
| author | Ade Lee <alee@redhat.com> | 2014-02-03 13:19:46 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-02-04 13:37:57 -0500 |
| commit | cf425dfa25bccb467c63b9a966adf3a7eec791df (patch) | |
| tree | 469ec668473730d9dc23e327ce444ee61373e702 /base/kra/src | |
| parent | d33998c72a34dc9f04e29ce0248fc2b7b88e0fc5 (diff) | |
Address review comments
1. Remove Link attribute from ResourceMessage,
2. Rename KeyDataInfo and KeyDataInfoCollection.
3. Move KEYGEN_ALGORITHMS
4. Fix missing space in PKIException
5. Move properties to attributes in ResourceMessage
6. Add missing code to update the request and set IRequest.RESULT
Diffstat (limited to 'base/kra/src')
3 files changed, 11 insertions, 2 deletions
diff --git a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java index 0ec4ed335..50f163dfa 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java @@ -264,7 +264,10 @@ public class SecurityDataRecoveryService implements IService { params.put(IRequest.SECURITY_DATA_IV_STRING_OUT, ivStr); } - auditRecoveryRequestProcessed(subjectID, ILogger.SUCCESS, requestID, serialno.toString(), "None"); + auditRecoveryRequestProcessed(subjectID, ILogger.SUCCESS, requestID, serialno.toString(), + "None"); + request.setExtData(IRequest.RESULT, IRequest.RES_SUCCESS); + mKRA.getRequestQueue().updateRequest(request); return false; //return true ? TODO } diff --git a/base/kra/src/com/netscape/kra/SecurityDataService.java b/base/kra/src/com/netscape/kra/SecurityDataService.java index 9fc737529..428dd660b 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataService.java @@ -183,6 +183,8 @@ public class SecurityDataService implements IService { auditArchivalRequestProcessed(subjectID, ILogger.SUCCESS, request.getRequestId(), clientId, serialNo.toString(), "None"); + request.setExtData(IRequest.RESULT, IRequest.RES_SUCCESS); + mKRA.getRequestQueue().updateRequest(request); return true; diff --git a/base/kra/src/com/netscape/kra/SymKeyGenService.java b/base/kra/src/com/netscape/kra/SymKeyGenService.java index 877d2ed06..3ebf1bed0 100644 --- a/base/kra/src/com/netscape/kra/SymKeyGenService.java +++ b/base/kra/src/com/netscape/kra/SymKeyGenService.java @@ -44,6 +44,7 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IService; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.cms.servlet.request.KeyRequestService; import com.netscape.cmscore.dbs.KeyRecord; /** @@ -110,7 +111,7 @@ public class SymKeyGenService implements IService { } CryptoToken token = mStorageUnit.getToken(); - KeyGenAlgorithm kgAlg = SymKeyGenerationRequest.KEYGEN_ALGORITHMS.get(algorithm); + KeyGenAlgorithm kgAlg = KeyRequestService.KEYGEN_ALGORITHMS.get(algorithm); if (kgAlg == null) { throw new EBaseException("Invalid algorithm"); } @@ -216,6 +217,9 @@ public class SymKeyGenService implements IService { auditSymKeyGenRequestProcessed(subjectID, ILogger.SUCCESS, request.getRequestId(), clientId, serialNo.toString(), "None"); + request.setExtData(IRequest.RESULT, IRequest.RES_SUCCESS); + mKRA.getRequestQueue().updateRequest(request); + return true; } |