Blame SOURCES/pki-core-rhel-7-9-rhcs-9-7-bu-15.patch

7e2434
From 1423cf8b1e7a79ed42632e6fc462b7671833a18b Mon Sep 17 00:00:00 2001
7e2434
From: Christina Fu <cfu@redhat.com>
7e2434
Date: Tue, 12 Apr 2022 15:17:06 -0700
7e2434
Subject: [PATCH] Bug2074722-p12 password
7e2434
7e2434
This patch comments out lines where auditContext is printed in debug
7e2434
log.
7e2434
7e2434
fixes https://bugzilla.redhat.com/show_bug.cgi?id=2074722
7e2434
---
7e2434
 base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java     | 4 ++--
7e2434
 .../cms/src/com/netscape/cms/servlet/processors/CAProcessor.java      | 4 ++--
7e2434
 2 files changed, 4 insertions(+), 4 deletions(-)
7e2434
7e2434
diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
7e2434
index 854d656..77296d9 100644
7e2434
--- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
7e2434
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
7e2434
@@ -2031,7 +2031,7 @@ public abstract class CMSServlet extends HttpServlet {
7e2434
         // Initialize subjectID
7e2434
         SessionContext auditContext = SessionContext.getExistingContext();
7e2434
 
7e2434
-        CMS.debug("CMSServlet: auditSubjectID auditContext " + auditContext);
7e2434
+        //CMS.debug("CMSServlet: auditSubjectID auditContext " + auditContext);
7e2434
         if (auditContext != null) {
7e2434
             subjectID = (String)
7e2434
                     auditContext.get(SessionContext.USER_ID);
7e2434
@@ -2067,7 +2067,7 @@ public abstract class CMSServlet extends HttpServlet {
7e2434
         // Initialize groupID
7e2434
         SessionContext auditContext = SessionContext.getExistingContext();
7e2434
 
7e2434
-        CMS.debug("CMSServlet: auditGroupID auditContext " + auditContext);
7e2434
+        //CMS.debug("CMSServlet: auditGroupID auditContext " + auditContext);
7e2434
         if (auditContext != null) {
7e2434
             groupID = (String)
7e2434
                     auditContext.get(SessionContext.GROUP_ID);
7e2434
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
7e2434
index f732c4d..ebbc7ab 100644
7e2434
--- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
7e2434
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
7e2434
@@ -892,7 +892,7 @@ public class CAProcessor extends Processor {
7e2434
         // Initialize subjectID
7e2434
         SessionContext auditContext = SessionContext.getExistingContext();
7e2434
 
7e2434
-        CMS.debug("CMSServlet: auditSubjectID auditContext " + auditContext);
7e2434
+        //CMS.debug("CMSServlet: auditSubjectID auditContext " + auditContext);
7e2434
         if (auditContext != null) {
7e2434
             subjectID = (String)
7e2434
                     auditContext.get(SessionContext.USER_ID);
7e2434
@@ -918,7 +918,7 @@ public class CAProcessor extends Processor {
7e2434
         // Initialize groupID
7e2434
         SessionContext auditContext = SessionContext.getExistingContext();
7e2434
 
7e2434
-        CMS.debug("CMSServlet: auditGroupID auditContext " + auditContext);
7e2434
+        //CMS.debug("CMSServlet: auditGroupID auditContext " + auditContext);
7e2434
         if (auditContext != null) {
7e2434
             groupID = (String)
7e2434
                     auditContext.get(SessionContext.GROUP_ID);
7e2434
-- 
7e2434
1.8.3.1
7e2434
7e2434
From cb9c57d143680d142a3d1671fc8d6fff15b5773c Mon Sep 17 00:00:00 2001
7e2434
From: Christina Fu <cfu@redhat.com>
7e2434
Date: Tue, 3 May 2022 15:33:44 -0700
7e2434
Subject: [PATCH 1/2] Bug2074740-p12-passwd-http-GET-params
7e2434
7e2434
This patch handles the p12 passwd missed in GET
7e2434
7e2434
fixes https://bugzilla.redhat.com/show_bug.cgi?id=2074740
7e2434
---
7e2434
 base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java | 4 ++--
7e2434
 1 file changed, 2 insertions(+), 2 deletions(-)
7e2434
7e2434
diff --git a/base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java b/base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java
7e2434
index 46e021a..5913c94 100644
7e2434
--- a/base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java
7e2434
+++ b/base/server/cmscore/src/com/netscape/cmscore/base/ArgBlock.java
7e2434
@@ -145,7 +145,7 @@ public class ArgBlock implements IArgBlock {
7e2434
      */
7e2434
     public String getValueAsString(String n) throws EBaseException {
7e2434
         String t = (String) mArgs.get(n);
7e2434
-        CMS.traceHashKey(mType, n, t);
7e2434
+        CMS.traceHashKey(mType, n, CMS.isSensitive(n)?": (sensitive)":t);
7e2434
 
7e2434
         if (t != null) {
7e2434
             return t;
7e2434
@@ -163,7 +163,7 @@ public class ArgBlock implements IArgBlock {
7e2434
      */
7e2434
     public String getValueAsString(String n, String def) {
7e2434
         String val = (String) mArgs.get(n);
7e2434
-        CMS.traceHashKey(mType, n, val, def);
7e2434
+        CMS.traceHashKey(mType, n, CMS.isSensitive(n)?": (sensitive)":val, def);
7e2434
 
7e2434
         if (val != null) {
7e2434
             return val;
7e2434
-- 
7e2434
1.8.3.1
7e2434
7e2434
7e2434
From 39b291486876fda8049709f6e8018961b553a36b Mon Sep 17 00:00:00 2001
7e2434
From: Christina Fu <cfu@redhat.com>
7e2434
Date: Fri, 6 May 2022 14:28:25 -0700
7e2434
Subject: [PATCH 2/2] Bug2082717 - SCEP manual approval failure
7e2434
7e2434
This patch fixes the set id not found null pointer exception.
7e2434
7e2434
fixes https://bugzilla.redhat.com/show_bug.cgi?id=2082717
7e2434
---
7e2434
 .../cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java      | 3 +++
7e2434
 1 file changed, 3 insertions(+)
7e2434
7e2434
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
7e2434
index 690543c..ab7abb3 100644
7e2434
--- a/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
7e2434
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
7e2434
@@ -1633,6 +1633,9 @@ public class CRSEnrollment extends HttpServlet {
7e2434
             reqs[0].setExtData("profileRemoteAddr", httpReq.getRemoteAddr());
7e2434
             reqs[0].setExtData("profileApprovedBy", profile.getApprovedBy());
7e2434
 
7e2434
+	    String setId = profile.getPolicySetId(reqs[0]);
7e2434
+	    reqs[0].setExtData("profileSetId" /*CAProcessor.ARG_PROFILE_SET_ID*/, setId);
7e2434
+
7e2434
             CMS.debug("CRSEnrollment: Populating inputs");
7e2434
             profile.populateInput(ctx, reqs[0]);
7e2434
             CMS.debug("CRSEnrollment: Populating requests");
7e2434
-- 
7e2434
1.8.3.1
7e2434