[tomcat] branch master updated: BZ 63982: CombinedRealm makes assumptions about principal implementation

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 15c72df  BZ 63982: CombinedRealm makes assumptions about principal 
implementation
15c72df is described below

commit 15c72df0ca36a0b05a3dded50971c216125704f8
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Fri Dec 6 13:49:35 2019 +0100

    BZ 63982: CombinedRealm makes assumptions about principal implementation
---
 java/org/apache/catalina/realm/CombinedRealm.java | 14 ++++++++++++++
 webapps/docs/changelog.xml                        |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/java/org/apache/catalina/realm/CombinedRealm.java 
b/java/org/apache/catalina/realm/CombinedRealm.java
index b3b79de..865120c 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -29,6 +29,7 @@ import org.apache.catalina.Container;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Realm;
+import org.apache.catalina.Wrapper;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.ietf.jgss.GSSContext;
@@ -414,6 +415,19 @@ public class CombinedRealm extends RealmBase {
         return authenticatedUser;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasRole(Wrapper wrapper, Principal principal, String role) {
+        for (Realm realm : realms) {
+            if (realm.hasRole(wrapper, principal, role)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     protected String getPassword(String username) {
         // This method should never be called
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d221bc5..238f90f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -82,6 +82,10 @@
         by Andy Wilkinson. (markt)
       </fix>
       <fix>
+        <bug>63982</bug>: CombinedRealm makes assumptions about principal 
implementation
+        (michaelo)
+      </fix>
+      <fix>
         <bug>63983</bug>: Correct a regression in the static resource caching
         changes introduced in 9.0.28. A large number of file descriptors were
         opened that could reach the OS limit before being released by GC.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org