46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
From 700d26b69df3f1003ce8443d5569911c36b113de Mon Sep 17 00:00:00 2001
|
|
From: Mark Thomas <markt@apache.org>
|
|
Date: Tue, 5 Mar 2019 19:19:32 +0000
|
|
Subject: [PATCH] Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63213
|
|
|
|
Ensure the correct escaping of group names when searching for nested
|
|
groups when the JNDIRealm is configured with roleNested set to true.
|
|
---
|
|
java/org/apache/catalina/realm/JNDIRealm.java | 3 ++-
|
|
webapps/docs/changelog.xml | 5 +++++
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
|
|
index e980bdf..034c0f0 100644
|
|
--- a/java/org/apache/catalina/realm/JNDIRealm.java
|
|
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
|
|
@@ -2010,7 +2010,8 @@ public class JNDIRealm extends RealmBase {
|
|
Map<String, String> newThisRound = new HashMap<>(); // Stores the groups we find in this iteration
|
|
|
|
for (Entry<String, String> group : newGroups.entrySet()) {
|
|
- filter = roleFormat.format(new String[] { group.getKey(), group.getValue(), group.getValue() });
|
|
+ filter = roleFormat.format(new String[] { doRFC2254Encoding(group.getKey()),
|
|
+ group.getValue(), group.getValue() });
|
|
|
|
if (containerLog.isTraceEnabled()) {
|
|
containerLog.trace("Perform a nested group search with base "+ roleBase + " and filter " + filter);
|
|
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
|
|
index 35b8eab..f088e0d 100644
|
|
--- a/webapps/docs/changelog.xml
|
|
+++ b/webapps/docs/changelog.xml
|
|
@@ -55,6 +55,11 @@
|
|
<fix>
|
|
Encode the output of the SSI <code>printenv</code> command. (markt)
|
|
</fix>
|
|
+ <fix>
|
|
+ <bug>63213</bug>: Ensure the correct escaping of group names when
|
|
+ searching for nested groups when the JNDIRealm is configured with
|
|
+ <code>roleNested</code> set to <code>true</code>. (markt)
|
|
+ </fix>
|
|
</changelog>
|
|
</subsection>
|
|
</section>
|
|
--
|
|
2.23.0
|
|
|