Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48589

Make JNDIRealm easier to extend by making the User class protected
Based on a patch by Candid Dauth

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@910485 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
index 0392c56..3070ba2 100644 (file)
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -24,6 +24,7 @@ import java.security.Principal;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -2214,26 +2215,41 @@ public class JNDIRealm extends RealmBase {
     }
 
 
+     // ------------------------------------------------------ Private Classes
+    
+     /**
+      * A private class representing a User
+      */
+     protected static class User {
+         
+         private String username = null;
+         private String dn = null;
+         private String password = null;
+         private ArrayList<String> roles = null;
+
+         User(String username, String dn, String password,
+                 ArrayList<String> roles) {
+             this.username = username;
+             this.dn = dn;
+             this.password = password;
+             this.roles = roles;
+         }
+    
+         public String getUserName() {
+             return username;
+         }
+         
+         public String getDN() {
+             return dn;
+         }
+         
+         public String getPassword() {
+             return password;
+         }
+         
+         public List<String> getRoles() {
+             return Collections.unmodifiableList(roles);
+         }
+     }
 }
 
-// ------------------------------------------------------ Private Classes
-
-/**
- * A private class representing a User
- */
-class User {
-    String username = null;
-    String dn = null;
-    String password = null;
-    ArrayList<String> roles = null;
-
-
-    User(String username, String dn, String password,
-            ArrayList<String> roles) {
-        this.username = username;
-        this.dn = dn;
-        this.password = password;
-        this.roles = roles;
-    }
-
-}