[tomcat] branch main updated: Improve hasRole code a bit

[remm]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 9beee02  Improve hasRole code a bit
9beee02 is described below

commit 9beee02a476c3316f98ee81f200ad44ce168e9c9
Author: remm <r...@apache.org>
AuthorDate: Wed Jun 2 14:43:29 2021 +0200

    Improve hasRole code a bit
---
 java/org/apache/catalina/realm/UserDatabaseRealm.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java 
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index 9d69540..714fd50 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -260,14 +260,15 @@ public class UserDatabaseRealm extends RealmBase {
 
         @Override
         public boolean hasRole(String role) {
-            if (user == null) {
-                return super.hasRole(role);
-            }
             if ("*".equals(role)) {
                 return true;
             } else if (role == null) {
                 return false;
             }
+            UserDatabase database = getUserDatabase();
+            if (user == null || database == null) {
+                return super.hasRole(role);
+            }
             Role dbrole = database.findRole(role);
             if (dbrole == null) {
                 return false;

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