From e417e593facf6ebe819627599df4bd3351a8ced1 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Wed, 7 Dec 2016 14:22:30 +1000 Subject: [PATCH 146/146] Define "req_authority_id" IRequest extdata key in IRequest Part of: https://fedorahosted.org/pki/ticket/1359 --- base/common/src/com/netscape/certsrv/request/IRequest.java | 5 +++++ .../cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java | 2 +- .../cms/src/com/netscape/cms/profile/common/EnrollProfile.java | 2 +- .../netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java | 3 +-- .../cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java | 2 +- .../cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/base/common/src/com/netscape/certsrv/request/IRequest.java b/base/common/src/com/netscape/certsrv/request/IRequest.java index b83d5309e0b2aaf271cf4fba3c1ee7d13b347a58..29b1bbb879220a485388cb38af8a8c5508578752 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -91,6 +91,11 @@ public interface IRequest extends Serializable { public static final String PROFILE_ID = "profileId"; + /** + * ID of requested certificate authority (absense implies host authority) + */ + public static final String AUTHORITY_ID = "req_authority_id"; + public static final String RESULT = "Result"; // service result. public static final Integer RES_SUCCESS = Integer.valueOf(1); // result value public static final Integer RES_ERROR = Integer.valueOf(2); // result value diff --git a/base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java index 53edca3a93c28a4fdd6c476bbdd2dc3d83869505..8c14e91767f6cc765413821da71b2c26d86f77d3 100644 --- a/base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java +++ b/base/server/cms/src/com/netscape/cms/profile/common/CAEnrollProfile.java @@ -192,7 +192,7 @@ public class CAEnrollProfile extends EnrollProfile { sc.put("profileSetId", setId); } AuthorityID aid = null; - String aidString = request.getExtDataInString(REQUEST_AUTHORITY_ID); + String aidString = request.getExtDataInString(IRequest.AUTHORITY_ID); if (aidString != null) aid = new AuthorityID(aidString); try { diff --git a/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java index e828b82f203edfc6e6fb8797c5909c7cdd6a32d9..fbb98262929f1c5e12ab54a7514c15297364e971 100644 --- a/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java +++ b/base/server/cms/src/com/netscape/cms/profile/common/EnrollProfile.java @@ -192,7 +192,7 @@ public abstract class EnrollProfile extends BasicProfile } // set requested CA - result[i].setExtData(REQUEST_AUTHORITY_ID, ctx.get(REQUEST_AUTHORITY_ID)); + result[i].setExtData(IRequest.AUTHORITY_ID, ctx.get(REQUEST_AUTHORITY_ID)); } return result; } diff --git a/base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java index 9aaa29d7a417739c62c9c46968933253dbcddd89..42931de2644e602089fc40d331f73964ad35390f 100644 --- a/base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java +++ b/base/server/cms/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java @@ -26,7 +26,6 @@ import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.ca.AuthorityID; import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.profile.EProfileException; -import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.property.Descriptor; import com.netscape.certsrv.property.EPropertyException; @@ -172,7 +171,7 @@ public class AuthorityKeyIdentifierExtDefault extends CAEnrollDefault { ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_CA); String aidString = request.getExtDataInString( - IEnrollProfile.REQUEST_AUTHORITY_ID); + IRequest.AUTHORITY_ID); if (aidString != null) ca = ca.getCA(new AuthorityID(aidString)); if (ca == null) diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java index 01ffc8be43a90c428fa61e97a70cfe3d87b8710f..1c9f0d6acad00025884a33a22461c7d61b4a5676 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RenewalProcessor.java @@ -217,7 +217,7 @@ public class RenewalProcessor extends CertProcessor { CMS.debug("RenewalSubmitter: renewal original profileId=" + profileId); String aidString = origReq.getExtDataInString( - IEnrollProfile.REQUEST_AUTHORITY_ID); + IRequest.AUTHORITY_ID); Integer origSeqNum = origReq.getExtDataInInteger(IEnrollProfile.REQUEST_SEQ_NUM); IProfile profile = ps.getProfile(profileId); diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java index 7f0c89ce5fad8c334dd204188c3e9ce103c207bd..436e7a99a78e7bf4a46f626f628652f5d3d1301c 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java @@ -378,7 +378,7 @@ public class RequestProcessor extends CertProcessor { String auditRequesterID = auditRequesterID(req); // ensure target CA is enabled - String aidString = req.getExtDataInString(IEnrollProfile.REQUEST_AUTHORITY_ID); + String aidString = req.getExtDataInString(IRequest.AUTHORITY_ID); if (aidString != null) ensureCAEnabled(aidString); -- 2.7.4