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 2015/05/19 17:01:42 UTC
directory-fortress-core git commit: FC-105 - [fortress-core]
Repository: directory-fortress-core
Updated Branches:
refs/heads/master f02712d4a -> 9bebe5733
FC-105 - [fortress-core]
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/9bebe573
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/9bebe573
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/9bebe573
Branch: refs/heads/master
Commit: 9bebe57336f6d8951ecf1e77308ca0b6d75ba71d
Parents: f02712d
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue May 19 10:01:25 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue May 19 10:01:25 2015 -0500
----------------------------------------------------------------------
.../directory/fortress/core/rbac/UserDAO.java | 148 ++++++++++++++-----
.../directory/fortress/core/rbac/UserP.java | 7 +-
.../fortress/core/util/attr/VUtil.java | 2 +-
.../fortress/core/util/time/ClockTime.java | 4 +-
.../fortress/core/util/time/TUtil.java | 2 +-
.../fortress/core/util/time/Timeout.java | 2 +-
6 files changed, 118 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9bebe573/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
index 928c176..619a61b 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
@@ -1047,30 +1047,43 @@ final class UserDAO extends ApacheDsDataProvider
try
{
- String filter;
-
+ //String filter;
+ StringBuffer filterbuf = new StringBuffer();
if ( VUtil.isNotNullOrEmpty( user.getUserId() ) )
{
// place a wild card after the input userId:
String searchVal = encodeSafeText( user.getUserId(), GlobalIds.USERID_LEN );
- filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")(" + SchemaConstants.UID_AT + "=" + searchVal
- + "*))";
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( objectClassImpl );
+ filterbuf.append( ")(" );
+ filterbuf.append( SchemaConstants.UID_AT );
+ filterbuf.append( "=" );
+ filterbuf.append( searchVal );
+ filterbuf.append( "*))" );
}
else if ( VUtil.isNotNullOrEmpty( user.getInternalId() ) )
{
// internalUserId search
String searchVal = encodeSafeText( user.getInternalId(), GlobalIds.USERID_LEN );
// this is not a wildcard search. Must be exact match.
- filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")(" + GlobalIds.FT_IID + "=" + searchVal + "))";
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( objectClassImpl );
+ filterbuf.append( ")(" );
+ filterbuf.append( GlobalIds.FT_IID );
+ filterbuf.append( "=" );
+ filterbuf.append( searchVal );
+ filterbuf.append( "))" );
}
else
{
// Beware - returns ALL users!!:"
- filter = "(objectclass=" + objectClassImpl + ")";
+ filterbuf.append( "(objectclass=" );
+ filterbuf.append( objectClassImpl );
+ filterbuf.append( ")" );
}
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1113,10 +1126,17 @@ final class UserDAO extends ApacheDsDataProvider
try
{
String searchVal = encodeSafeText( user.getUserId(), GlobalIds.USERID_LEN );
- String filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")(" + SchemaConstants.UID_AT + "=" +
- searchVal + "*))";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( objectClassImpl );
+ filterbuf.append( ")(" );
+ filterbuf.append( SchemaConstants.UID_AT );
+ filterbuf.append( "=" );
+ filterbuf.append( searchVal );
+ filterbuf.append( "*))" );
+
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, USERID, false, GlobalIds
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID, false, GlobalIds
.BATCH_SIZE, limit );
while ( searchResults.next() )
@@ -1158,28 +1178,43 @@ final class UserDAO extends ApacheDsDataProvider
try
{
String roleVal = encodeSafeText( role.getName(), GlobalIds.USERID_LEN );
- String filter = GlobalIds.FILTER_PREFIX + USERS_AUX_OBJECT_CLASS_NAME + ")(";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( USERS_AUX_OBJECT_CLASS_NAME );
+ filterbuf.append( ")(" );
+
Set<String> roles = RoleUtil.getDescendants( role.getName(), role.getContextId() );
if ( VUtil.isNotNullOrEmpty( roles ) )
{
- filter += "|(" + GlobalIds.USER_ROLE_ASSIGN + "=" + roleVal + ")";
+ filterbuf.append( "|(" );
+ filterbuf.append( GlobalIds.USER_ROLE_ASSIGN );
+ filterbuf.append( "=" );
+ filterbuf.append( roleVal );
+ filterbuf.append( ")" );
for ( String uRole : roles )
{
- filter += "(" + GlobalIds.USER_ROLE_ASSIGN + "=" + uRole + ")";
+ filterbuf.append( "(" );
+ filterbuf.append( GlobalIds.USER_ROLE_ASSIGN );
+ filterbuf.append( "=" );
+ filterbuf.append( uRole );
+ filterbuf.append( ")" );
}
- filter += ")";
+ filterbuf.append( ")" );
}
else
{
- filter += GlobalIds.USER_ROLE_ASSIGN + "=" + roleVal + ")";
+ filterbuf.append( GlobalIds.USER_ROLE_ASSIGN );
+ filterbuf.append( "=" );
+ filterbuf.append( roleVal );
+ filterbuf.append( ")" );
}
- filter += ")";
+ filterbuf.append( ")" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1223,10 +1258,17 @@ final class UserDAO extends ApacheDsDataProvider
try
{
String roleVal = encodeSafeText( role.getName(), GlobalIds.USERID_LEN );
- String filter = GlobalIds.FILTER_PREFIX + USERS_AUX_OBJECT_CLASS_NAME + ")(" + GlobalIds.USER_ROLE_ASSIGN
- + "=" + roleVal + "))";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( USERS_AUX_OBJECT_CLASS_NAME );
+ filterbuf.append( ")(" );
+ filterbuf.append( GlobalIds.USER_ROLE_ASSIGN );
+ filterbuf.append( "=" );
+ filterbuf.append( roleVal );
+ filterbuf.append( "))" );
+
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1269,14 +1311,21 @@ final class UserDAO extends ApacheDsDataProvider
try
{
- String filter = GlobalIds.FILTER_PREFIX + USERS_AUX_OBJECT_CLASS_NAME + ")(|";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( USERS_AUX_OBJECT_CLASS_NAME );
+ filterbuf.append( ")(|" );
if ( VUtil.isNotNullOrEmpty( roles ) )
{
for ( String roleVal : roles )
{
String filteredVal = encodeSafeText( roleVal, GlobalIds.USERID_LEN );
- filter += "(" + GlobalIds.USER_ROLE_ASSIGN + "=" + filteredVal + ")";
+ filterbuf.append( "(" );
+ filterbuf.append( GlobalIds.USER_ROLE_ASSIGN );
+ filterbuf.append( "=" );
+ filterbuf.append( filteredVal );
+ filterbuf.append( ")" );
}
}
else
@@ -1284,9 +1333,9 @@ final class UserDAO extends ApacheDsDataProvider
return null;
}
- filter += "))";
+ filterbuf.append( "))" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, USERID_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID_ATRS, false,
GlobalIds.BATCH_SIZE );
while ( searchResults.next() )
@@ -1327,10 +1376,17 @@ final class UserDAO extends ApacheDsDataProvider
try
{
String roleVal = encodeSafeText( role.getName(), GlobalIds.USERID_LEN );
- String filter = GlobalIds.FILTER_PREFIX + USERS_AUX_OBJECT_CLASS_NAME + ")(" + GlobalIds
- .USER_ADMINROLE_ASSIGN + "=" + roleVal + "))";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( USERS_AUX_OBJECT_CLASS_NAME );
+ filterbuf.append( ")(" );
+ filterbuf.append( GlobalIds.USER_ADMINROLE_ASSIGN );
+ filterbuf.append( "=" );
+ filterbuf.append( roleVal );
+ filterbuf.append( "))" );
+
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1375,10 +1431,17 @@ final class UserDAO extends ApacheDsDataProvider
try
{
String roleVal = encodeSafeText( role.getName(), GlobalIds.USERID_LEN );
- String filter = GlobalIds.FILTER_PREFIX + USERS_AUX_OBJECT_CLASS_NAME + ")(" + GlobalIds.USER_ROLE_ASSIGN
- + "=" + roleVal + "))";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( USERS_AUX_OBJECT_CLASS_NAME );
+ filterbuf.append( ")(" );
+ filterbuf.append( GlobalIds.USER_ROLE_ASSIGN );
+ filterbuf.append( "=" );
+ filterbuf.append( roleVal );
+ filterbuf.append( "))" );
+
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, USERID, false, GlobalIds
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID, false, GlobalIds
.BATCH_SIZE, limit );
while ( searchResults.next() )
@@ -1422,10 +1485,17 @@ final class UserDAO extends ApacheDsDataProvider
try
{
searchVal = encodeSafeText( searchVal, GlobalIds.USERID_LEN );
- String filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")(" + SchemaConstants.UID_AT + "=" +
- searchVal + "*))";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( objectClassImpl );
+ filterbuf.append( ")(" );
+ filterbuf.append( SchemaConstants.UID_AT );
+ filterbuf.append( "=" );
+ filterbuf.append( searchVal );
+ filterbuf.append( "*))" );
+
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1467,8 +1537,14 @@ final class UserDAO extends ApacheDsDataProvider
try
{
String szOu = encodeSafeText( ou.getName(), GlobalIds.OU_LEN );
- String filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")(" + SchemaConstants.OU_AT + "=" + szOu +
- "))";
+ StringBuffer filterbuf = new StringBuffer();
+ filterbuf.append( GlobalIds.FILTER_PREFIX );
+ filterbuf.append( objectClassImpl );
+ filterbuf.append( ")(" );
+ filterbuf.append( SchemaConstants.OU_AT );
+ filterbuf.append( "=" );
+ filterbuf.append( szOu );
+ filterbuf.append( "))" );
int maxLimit;
if ( limitSize )
@@ -1481,7 +1557,7 @@ final class UserDAO extends ApacheDsDataProvider
}
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filter, DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE, maxLimit );
long sequence = 0;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9bebe573/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
index 29646c3..68ae294 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
@@ -373,12 +373,7 @@ public final class UserP
Session session;
session = uDao.checkPassword( user );
- if ( session == null )
- { // This should not happen, ever:
- String error = "UserP.authenticate failed - null session detected for userId [" + user.getUserId() + "]";
- throw new SecurityException( GlobalErrIds.USER_SESS_CREATE_FAILED, error );
- }
- else if ( !session.isAuthenticated() )
+ if ( !session.isAuthenticated() )
{
String info = "UserP.authenticate failed for userId [" + user.getUserId() + "] reason code ["
+ session.getErrorId() + "] msg [" + session.getMsg() + "]";
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9bebe573/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
index b0accf8..fa4f5e1 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
@@ -51,7 +51,7 @@ public class VUtil
{
if ( lengthProp != null )
{
- Integer len = new Integer( lengthProp );
+ Integer len = Integer.valueOf( lengthProp );
maximumFieldLen = len;
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9bebe573/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
index b95938b..993953f 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
@@ -61,8 +61,8 @@ public class ClockTime
}
else
{
- Integer beginTime = new Integer(constraint.getBeginTime());
- Integer endTime = new Integer(constraint.getEndTime());
+ Integer beginTime = Integer.valueOf( constraint.getBeginTime() );
+ Integer endTime = Integer.valueOf( constraint.getEndTime() );
if (beginTime == 0 && endTime == 0)
{
rc = 0;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9bebe573/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
index 8be2e35..020e892 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
@@ -66,7 +66,7 @@ public class TUtil
}
String szCurrentTime = szHour + szMinute;
- time.currentTime = new Integer(szCurrentTime);
+ time.currentTime = Integer.valueOf( szCurrentTime );
time.date = szYear + szMonth + szDay;
return time;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9bebe573/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
index a769b9b..c4dae86 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
@@ -61,7 +61,7 @@ public class Timeout
else
{
long elapsedTime = System.currentTimeMillis() - lastTime;
- timeLimit = constraint.getTimeout() * 60000;
+ timeLimit = constraint.getTimeout() * 60000L;
if (elapsedTime < timeLimit || constraint.getTimeout() == 0)
{
rc = 0;