diff options
Diffstat (limited to 'base/server')
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java | 15 | ||||
| -rw-r--r-- | base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java | 11 |
2 files changed, 22 insertions, 4 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java index 83f159a83..7cf750a33 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -234,6 +234,19 @@ public class GenerateKeyPairServlet extends CMSServlet { String ivString = thisreq.getExtDataInString("iv_s"); /* + * clean up fields in request + */ + thisreq.setExtData("wrappedUserPrivate", ""); + thisreq.setExtData("public_key", ""); + thisreq.setExtData("iv_s", ""); + thisreq.setExtData(IRequest.NETKEY_ATTR_DRMTRANS_DES_KEY, ""); + String test = thisreq.getExtDataInString("wrappedUserPrivate"); + + // now that fields are cleared, we can really write to ldap + thisreq.setExtData("delayLDAPCommit", "false"); + queue.updateRequest(thisreq); + + /* if (selectedToken == null) status = "4"; */ @@ -251,7 +264,7 @@ public class GenerateKeyPairServlet extends CMSServlet { value = sb.toString(); } - CMS.debug("processServerSideKeyGen:outputString.encode " + value); + //CMS.debug("processServerSideKeyGen:outputString.encode " + value); try { resp.setContentLength(value.length()); diff --git a/base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java index 3d82f8eb5..798da3fa5 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/base/server/cmscore/src/com/netscape/cmscore/request/ARequestQueue.java @@ -540,6 +540,8 @@ public abstract class ARequestQueue } public void updateRequest(IRequest r) { + // defualt is to really update ldap + String delayLDAPCommit = r.getExtDataInString("delayLDAPCommit"); ((Request) r).mModificationTime = CMS.getCurrentDate(); String name = getUserIdentity(); @@ -547,9 +549,12 @@ public abstract class ARequestQueue if (name != null) r.setExtData(IRequest.UPDATED_BY, name); - // TODO: use a state flag to determine whether to call - // addRequest or modifyRequest (see newRequest as well) - modifyRequest(r); + // by default, write request to LDAP + if (delayLDAPCommit == null || !delayLDAPCommit.equals("true")) { + // TODO: use a state flag to determine whether to call + // addRequest or modifyRequest (see newRequest as well) + modifyRequest(r); + } // else: delay the write to ldap } // PRIVATE functions |