|
 |
abd338 |
From f5ffc69f79e4e0f4989094561ab0fd5ff5536d14 Mon Sep 17 00:00:00 2001
|
|
|
abd338 |
From: Christina Fu <cfu@redhat.com>
|
|
|
abd338 |
Date: Thu, 12 Jul 2018 10:24:33 -0700
|
|
|
abd338 |
Subject: [PATCH 1/2] Bugzilla 1548203 LDAP password from console update in
|
|
|
abd338 |
audit
|
|
|
abd338 |
|
|
|
abd338 |
This patch replace ldap passwords with "(sensitive)" in audit log.
|
|
|
abd338 |
|
|
|
abd338 |
fixes https://bugzilla.redhat.com/show_bug.cgi?id=1548203
|
|
|
abd338 |
|
|
|
abd338 |
Change-Id: I6271ec1da4164f731dd3a61534b0e511097a845a
|
|
|
abd338 |
(cherry picked from commit cf9c23a842000755d872202777b0a280bda7f1a1)
|
|
|
abd338 |
---
|
|
|
abd338 |
.../server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java | 6 +++++-
|
|
|
abd338 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
abd338 |
|
|
|
abd338 |
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
|
|
|
abd338 |
index 769e8e4..2b8cec7 100644
|
|
|
abd338 |
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
|
|
|
abd338 |
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
|
|
|
abd338 |
@@ -991,7 +991,11 @@ public class AdminServlet extends HttpServlet {
|
|
|
abd338 |
if (name.equals(Constants.OP_TYPE)) continue;
|
|
|
abd338 |
if (name.equals(Constants.RS_ID)) continue;
|
|
|
abd338 |
|
|
|
abd338 |
- String value = req.getParameter(name);
|
|
|
abd338 |
+ String value = null;
|
|
|
abd338 |
+ if (name.equalsIgnoreCase("PASSWORD_CACHE_ADD"))
|
|
|
abd338 |
+ value = "(sensitive)";
|
|
|
abd338 |
+ else
|
|
|
abd338 |
+ value = req.getParameter(name);
|
|
|
abd338 |
params.put(name, value);
|
|
|
abd338 |
}
|
|
|
abd338 |
|
|
|
abd338 |
--
|
|
|
abd338 |
1.8.3.1
|
|
|
abd338 |
|
|
|
abd338 |
|
|
|
abd338 |
From 46e808e86bb393848cca6434cc06c79a14611fa9 Mon Sep 17 00:00:00 2001
|
|
|
abd338 |
From: Jack Magne <jmagne@redhat.com>
|
|
|
abd338 |
Date: Mon, 15 Jan 2018 13:59:33 -0800
|
|
|
abd338 |
Subject: [PATCH 2/2] Test fix for TPS server side key gen for only identity
|
|
|
abd338 |
cert problem.
|
|
|
abd338 |
|
|
|
abd338 |
Change-Id: I15fc1b8a3fa92568aca853f0e89b9e87bbad463d
|
|
|
abd338 |
(cherry picked from commit c87d7820f7b1af97134197a23543e9fc4be1aa39)
|
|
|
abd338 |
(cherry picked from commit c1314749b7b3a2a6647aadd6945186833e539da8)
|
|
|
abd338 |
---
|
|
|
abd338 |
.../server/tps/cms/TKSRemoteRequestHandler.java | 26 +++++++++++++++++-----
|
|
|
abd338 |
1 file changed, 21 insertions(+), 5 deletions(-)
|
|
|
abd338 |
|
|
|
abd338 |
diff --git a/base/tps/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java b/base/tps/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java
|
|
|
abd338 |
index 65d0ed0..8155f90 100644
|
|
|
abd338 |
--- a/base/tps/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java
|
|
|
abd338 |
+++ b/base/tps/src/org/dogtagpki/server/tps/cms/TKSRemoteRequestHandler.java
|
|
|
abd338 |
@@ -103,7 +103,8 @@ public class TKSRemoteRequestHandler extends RemoteRequestHandler
|
|
|
abd338 |
String tokenType)
|
|
|
abd338 |
throws EBaseException {
|
|
|
abd338 |
|
|
|
abd338 |
- CMS.debug("TKSRemoteRequestHandler: computeSessionKey(): begins.");
|
|
|
abd338 |
+ String method = "TKSRemoteRequestHandler: computeSessionKey(): ";
|
|
|
abd338 |
+ CMS.debug(method + " begins.");
|
|
|
abd338 |
if (cuid == null || kdd == null || keyInfo == null || card_challenge == null
|
|
|
abd338 |
|| card_cryptogram == null || host_challenge == null) {
|
|
|
abd338 |
throw new EBaseException("TKSRemoteRequestHandler: computeSessionKey(): input parameter null.");
|
|
|
abd338 |
@@ -111,10 +112,25 @@ public class TKSRemoteRequestHandler extends RemoteRequestHandler
|
|
|
abd338 |
|
|
|
abd338 |
IConfigStore conf = CMS.getConfigStore();
|
|
|
abd338 |
|
|
|
abd338 |
- boolean serverKeygen =
|
|
|
abd338 |
- conf.getBoolean("op.enroll." +
|
|
|
abd338 |
- tokenType + ".keyGen.encryption.serverKeygen.enable",
|
|
|
abd338 |
- false);
|
|
|
abd338 |
+ boolean serverKeygen = false;
|
|
|
abd338 |
+
|
|
|
abd338 |
+ //Try out all the currently supported cert types to see if we are doing server side keygen here
|
|
|
abd338 |
+ String[] keygenStrings = { "identity", "signing", "encryption", "authentication", "auth"};
|
|
|
abd338 |
+ for (String keygenString : keygenStrings) {
|
|
|
abd338 |
+ boolean enabled = conf.getBoolean("op.enroll." +
|
|
|
abd338 |
+ tokenType + ".keyGen." +
|
|
|
abd338 |
+ keygenString + ".serverKeygen.enable", false);
|
|
|
abd338 |
+
|
|
|
abd338 |
+ CMS.debug(method + " serverkegGen enabled for " + keygenString + " : " + enabled);
|
|
|
abd338 |
+ if (enabled) {
|
|
|
abd338 |
+ serverKeygen = true;
|
|
|
abd338 |
+ break;
|
|
|
abd338 |
+ }
|
|
|
abd338 |
+ }
|
|
|
abd338 |
+
|
|
|
abd338 |
+
|
|
|
abd338 |
+
|
|
|
abd338 |
+
|
|
|
abd338 |
if (keySet == null)
|
|
|
abd338 |
keySet = conf.getString("tps.connector." + connid + ".keySet", "defKeySet");
|
|
|
abd338 |
|
|
|
abd338 |
--
|
|
|
abd338 |
1.8.3.1
|
|
|
abd338 |
|