Re: [Pki-devel] [PATCH] 0144..0146 Move IRequest extdata-related constants
Acked by alee:
-
https://github.com/frasertweedale/pki/commit/9826013dfcab72481f3ad6462e1d2c4692367a02
-
https://github.com/frasertweedale/pki/commit/59071b422637e6e99dd956eed12c5c26e19c3ffc
-
https://github.com/frasertweedale/pki/commit/7f1f4a2504280a5b8504b4db5df40eac122c280f
Pushed to master:
- 9c23b02b00b13a834b636e9266ee1ae80506f228 Define "req_authority_id" IRequest
extdata key in IRequest
- a1b56be53d37561c6e80c2aa7daf1e7ab07518c5 Define "profileId" IRequest extdata
key in one place
- d699d27c7d7a59cf613380ec2214333ecc96ec23 Define "auth_token" IRequest extdata
key prefix in one place
Thanks,
Fraser
On Wed, Dec 07, 2016 at 02:39:22PM +1000, Fraser Tweedale wrote:
> The attached patches relocate / redefine some constants that are
> used as keys when setting or getting IRequest extdata attributes.
>
> In some cases this removes duplicate constants or string literals.
> In other cases it actually defines a new constant.
> In all cases the key now uses a constant defined in IRequest, which
> is the appropriate place.
>
> This is refactoring work undertaken as part of GSSAPI support.
>
> Thanks,
> Fraser
> From 31d9026f2be5204dd4742ce00542bc80b614d9b9 Mon Sep 17 00:00:00 2001
> From: Fraser Tweedale
> Date: Wed, 7 Dec 2016 12:25:01 +1000
> Subject: [PATCH 144/146] Define "auth_token" IRequest extdata key prefix in
> one place
>
> Part of: https://fedorahosted.org/pki/ticket/1359
> ---
> base/common/src/com/netscape/certsrv/request/IRequest.java | 4
> .../cms/src/com/netscape/cms/servlet/cert/CertProcessor.java | 9 +++--
> .../src/com/netscape/cms/servlet/processors/CAProcessor.java | 1 -
> .../cms/servlet/profile/ProfileSubmitCMCServlet.java | 12
> +++-
> 4 files changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/base/common/src/com/netscape/certsrv/request/IRequest.java
> b/base/common/src/com/netscape/certsrv/request/IRequest.java
> index
> c892dbb1dc5d75d4b44e4e26b584f94717b2457c..f17f560de75e54cb7650ee06d870f3d1491e52ac
> 100644
> --- a/base/common/src/com/netscape/certsrv/request/IRequest.java
> +++ b/base/common/src/com/netscape/certsrv/request/IRequest.java
> @@ -85,6 +85,10 @@ public interface IRequest extends Serializable {
> // server attributes: attributes generated by server modules.
> public static final String SERVER_ATTRS = "SERVER_ATTRS";
>
> +// Sometimes individual IAuthToken fields get set in request
> +// extdata, with key ("auth_token." + field_name).
> +public static final String AUTH_TOKEN_PREFIX = "auth_token";
> +
> 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/servlet/cert/CertProcessor.java
> b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
> index
> 17b453ab5d82bd7c18612263f01e297a4e9df3da..cb5efa0b0e14274e0c4a9393522ab18071f60fd8
> 100644
> --- a/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
> +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
> @@ -310,12 +310,17 @@ public class CertProcessor extends CAProcessor {
> String[] tokenVals =
> authToken.getInStringArray(tokenName);
> if (tokenVals != null) {
> for (int i = 0; i < tokenVals.length; i++) {
> -req.setExtData(ARG_AUTH_TOKEN + "." + tokenName
> + "[" + i + "]", tokenVals[i]);
> +req.setExtData(
> +IRequest.AUTH_TOKEN_PREFIX
> ++ "." + tokenName + "[" + i + "]"
> +, tokenVals[i]);
> }
> } else {
> String tokenVal = authToken.getInString(tokenName);
> if (tokenVal != null) {
> -req.setExtData(ARG_AUTH_TOKEN + "." + tokenName,
> tokenVal);
> +req.setExtData(
> +IRequest.AUTH_TOKEN_PREFIX + "." + tokenName,
> +tokenVal);
> // if RA agent, auto assign the request
> if (tokenName.equals("uid"))
> uid = tokenVal;
> diff --git
> a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
> b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
> index
> bb3cfa84a423fe452ef55fb20e23c03911831690..ae91f649541db5ce77679844ad7a4fec680e99e9
> 100644
> --- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
> +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
> @@ -72,7 +72,6 @@ import netscape.security.x509.X509Ce
[Pki-devel] [PATCH] 0144..0146 Move IRequest extdata-related constants
The attached patches relocate / redefine some constants that are
used as keys when setting or getting IRequest extdata attributes.
In some cases this removes duplicate constants or string literals.
In other cases it actually defines a new constant.
In all cases the key now uses a constant defined in IRequest, which
is the appropriate place.
This is refactoring work undertaken as part of GSSAPI support.
Thanks,
Fraser
From 31d9026f2be5204dd4742ce00542bc80b614d9b9 Mon Sep 17 00:00:00 2001
From: Fraser Tweedale
Date: Wed, 7 Dec 2016 12:25:01 +1000
Subject: [PATCH 144/146] Define "auth_token" IRequest extdata key prefix in
one place
Part of: https://fedorahosted.org/pki/ticket/1359
---
base/common/src/com/netscape/certsrv/request/IRequest.java | 4
.../cms/src/com/netscape/cms/servlet/cert/CertProcessor.java | 9 +++--
.../src/com/netscape/cms/servlet/processors/CAProcessor.java | 1 -
.../cms/servlet/profile/ProfileSubmitCMCServlet.java | 12 +++-
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/base/common/src/com/netscape/certsrv/request/IRequest.java
b/base/common/src/com/netscape/certsrv/request/IRequest.java
index
c892dbb1dc5d75d4b44e4e26b584f94717b2457c..f17f560de75e54cb7650ee06d870f3d1491e52ac
100644
--- a/base/common/src/com/netscape/certsrv/request/IRequest.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequest.java
@@ -85,6 +85,10 @@ public interface IRequest extends Serializable {
// server attributes: attributes generated by server modules.
public static final String SERVER_ATTRS = "SERVER_ATTRS";
+// Sometimes individual IAuthToken fields get set in request
+// extdata, with key ("auth_token." + field_name).
+public static final String AUTH_TOKEN_PREFIX = "auth_token";
+
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/servlet/cert/CertProcessor.java
b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
index
17b453ab5d82bd7c18612263f01e297a4e9df3da..cb5efa0b0e14274e0c4a9393522ab18071f60fd8
100644
--- a/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
@@ -310,12 +310,17 @@ public class CertProcessor extends CAProcessor {
String[] tokenVals = authToken.getInStringArray(tokenName);
if (tokenVals != null) {
for (int i = 0; i < tokenVals.length; i++) {
-req.setExtData(ARG_AUTH_TOKEN + "." + tokenName +
"[" + i + "]", tokenVals[i]);
+req.setExtData(
+IRequest.AUTH_TOKEN_PREFIX
++ "." + tokenName + "[" + i + "]"
+, tokenVals[i]);
}
} else {
String tokenVal = authToken.getInString(tokenName);
if (tokenVal != null) {
-req.setExtData(ARG_AUTH_TOKEN + "." + tokenName,
tokenVal);
+req.setExtData(
+IRequest.AUTH_TOKEN_PREFIX + "." + tokenName,
+tokenVal);
// if RA agent, auto assign the request
if (tokenName.equals("uid"))
uid = tokenVal;
diff --git
a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
index
bb3cfa84a423fe452ef55fb20e23c03911831690..ae91f649541db5ce77679844ad7a4fec680e99e9
100644
--- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
@@ -72,7 +72,6 @@ import netscape.security.x509.X509CertImpl;
public class CAProcessor extends Processor {
-public final static String ARG_AUTH_TOKEN = "auth_token";
public final static String ARG_REQUEST_OWNER = "requestOwner";
public final static String HDR_LANG = "accept-language";
public final static String ARG_PROFILE = "profile";
diff --git
a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
index
f3adc5e85e58e3fb2dbf47984cfeca6797cd569b..6191031905626cc7acb6ccbdc41ff84942baf86f
100644
---
a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
+++
b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
@@ -76,7 +76,6 @@ public class ProfileSubmitCMCServlet extends ProfileServlet {
*
*/
