You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/10/11 03:07:49 UTC
directory-fortress-realm git commit: FC-194 - pw2string on admin &
access mgr method sigs
Repository: directory-fortress-realm
Updated Branches:
refs/heads/master 27763f535 -> 55198c447
FC-194 - pw2string on admin & access mgr method sigs
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/55198c44
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/55198c44
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/55198c44
Branch: refs/heads/master
Commit: 55198c4470fa9a6d056c39241774f3a1dde3f153
Parents: 27763f5
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Oct 10 21:46:26 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Oct 10 21:46:26 2016 -0500
----------------------------------------------------------------------
.../directory/fortress/realm/tomcat/Tc7AccessMgrProxy.java | 4 ++--
.../org/apache/directory/fortress/realm/tomcat/TcAccessMgr.java | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/55198c44/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/Tc7AccessMgrProxy.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/Tc7AccessMgrProxy.java b/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/Tc7AccessMgrProxy.java
index 0580f6a..4c575e6 100644
--- a/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/Tc7AccessMgrProxy.java
+++ b/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/Tc7AccessMgrProxy.java
@@ -143,13 +143,13 @@ public class Tc7AccessMgrProxy extends RealmBase
throw new IllegalArgumentException( CLS_NM + "authenticate detected Fortress Tomcat7 Realm not initialized correctly. Check your Fortress Realm configuration" );
}
- return realm.authenticate( userId, password.toCharArray() );
+ return realm.authenticate( userId, password );
}
/**
* Determine if given Role is contained within User's Tomcat Principal object. This method does not need to hit
- * the ldap server as the User's activated Roles are loaded into {@link org.apache.directory.fortress.realm.tomcat.TcPrincipal#setContext(java.util.HashMap)}
+ * the ldap server as the User's activated Roles are loaded into {@link org.apache.directory.fortress.realm.TcPrincipal#setContext(java.util.HashMap)}
*
* @param principal Contains User's Tomcat RBAC Session data that includes activated Roles.
* @param role Maps to {@code org.apache.directory.fortress.core.model.Role#name}.
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/55198c44/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgr.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgr.java b/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgr.java
index 19da26e..9a6cf68 100644
--- a/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgr.java
+++ b/proxy/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgr.java
@@ -32,8 +32,7 @@ public interface TcAccessMgr
{
/**
* Determine if given Role is contained within User's Tomcat Principal object. This method does not need to hit
- * the ldap server as the User's activated Roles are loaded into {@link org.apache.directory.fortress.realm.tomcat.TcPrincipal#setContext(java.util.HashMap)}
- *
+ * the ldap server as the User's activated Roles are loaded into {@link org.apache.directory.fortress.realm.TcPrincipal#setContext(java.util.HashMap)}
* @param principal Contains User's Tomcat RBAC Session data that includes activated Roles.
* @param role Maps to {@code org.apache.directory.fortress.core.model.Role#name}.
* @return True if Role is found in TcPrincipal, false otherwise.
@@ -48,7 +47,7 @@ public interface TcAccessMgr
* @param password Contains the user's password.
* @return Principal which contains the Fortress RBAC session data.
*/
- Principal authenticate( String userId, char[] password );
+ Principal authenticate( String userId, String password );
/**
* When the 'defaultRoles' parameter is set on realm proxy config (e.g. in server.xml or context.xml) it will be used to pass into