inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
40484: ALF-15370: 'New Rule' page localisation breaks after any rule was created in Japanese
   40487: Merged BRANCHES/V4.1 to BRANCHES/DEV/4.1-BUG-FIX:
      40485: ALF-15453: Incorrect manage permissions working for a file/folder
   40490: ALF-15455: Pass through windows specific environment variables (will not be set on unix) to make ImageMagick work on Windows with Bitrock layout
   40492: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX
      40491: ALF-7803 : Tomcat 7??? "Submit Items" page isn't opened
             The duplicate cellpadding attibutes were removed from jsp.
   40495: Final part of achievable fix for ALF-12803 - No user feedback: Cannot transformed content with password. (Failure of synchronous rule causes upload to fail with unhelpful message)
    - cleaned up flash error message - but see comments on ALF-12803 for full resolution
   40522: ALF-12839 Share - Inconsistency in adding a user or a group into a group
   40525: ALF-12839 Share - Inconsistency in adding a user or a group into a group
      - fix unit test by adding the * added by javascript code
   40535: ALF-15455: Another attempt
   - Properly escape global variables so bitrock doesn't try to expand them
   - Force backslash paths on windows
   40539: ALF-15455: ImageMagick still not working on Windows because env variable setting was losing the system PATH
   - Did it ever work before?
   - Now, if variables are specified, the PATH is propagated from the parent environment. If a PATH is specified, it is prepended to the parent PATH.
   40554: New Russian translations from Gloria plus Bitrock configuration to enable them
   40559: ALF-15506: When deleting a file from the actions menu a message was not shown to indicate that the folder is being deleted.
   40590: ALF-15318: It was possible for a user with a disabled / expired account to log in via NTLM/SSO
   40591: Merged V4.1 to V4.1-BUG-FIX
      40485: ALF-15453: Incorrect manage pernissions working for a file/folder
      40545: Fixes a bug in the visibility of the Cloud Sync settings page on the user profile.
   40592: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY)
      40478: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/V4.1
         40153: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
         40361: ALF-15453: Incorrect manage permissions working for a file/folder
      40481: Merge issue in r40478 fixed
   40593: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40503: Fix for ALF-14832 - Search by Tags is not working in WCMQS site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-08-19 14:12:51 +00:00
parent 6ee3bd50b4
commit 569c55eadc
5 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java
View File

@@ -18,9 +18,13 @@
*/
package org.alfresco.repo.security.authentication;
import net.sf.acegisecurity.AccountExpiredException;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.CredentialsExpiredException;
import net.sf.acegisecurity.DisabledException;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.LockedException;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
import net.sf.acegisecurity.providers.dao.User;
@@ -51,6 +55,24 @@ public class AuthenticationContextImpl implements AuthenticationContext
{
try
{
// Apply the same validation that ACEGI would have to the user details - we may be going through a 'back
// door'.
if (!ud.isEnabled())
{
throw new DisabledException("User is disabled");
}
if (!ud.isAccountNonExpired())
{
throw new AccountExpiredException("User account has expired");
}
if (!ud.isAccountNonLocked())
{
throw new LockedException("User account is locked");
}
if (!ud.isCredentialsNonExpired())
{
throw new CredentialsExpiredException("User credentials have expired");
}
UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(ud, "", ud
.getAuthorities());
auth.setDetails(ud);

60
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -31,6 +31,8 @@ import java.util.SortedSet;
import java.util.StringTokenizer;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
@@ -1578,7 +1580,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
if (nameFilter != null && nameFilter.length() != 0)
{
// found a filter - does it match Group name part?
if (authority.substring(GROUP_PREFIX_LENGTH).toLowerCase().contains(nameFilterLower))
if (matchByFilter(authority.substring(GROUP_PREFIX_LENGTH).toLowerCase(), nameFilterLower))
{
members.put(authority, permission);
}
@@ -1586,7 +1588,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
{
// Does it match on the Group Display Name part instead?
String displayName = authorityService.getAuthorityDisplayName(authority);
if(displayName != null && displayName.toLowerCase().contains(nameFilterLower))
if(displayName != null && matchByFilter(displayName.toLowerCase(), nameFilterLower))
{
members.put(authority, permission);
}
@@ -1657,21 +1659,20 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
NodeRef person = personService.getPerson(username, false);
String firstName = (String)directNodeService.getProperty(person, ContentModel.PROP_FIRSTNAME);
String lastName = (String)directNodeService.getProperty(person, ContentModel.PROP_LASTNAME);
String userName = (String)directNodeService.getProperty(person, ContentModel.PROP_USERNAME);
final String lowFirstName = (firstName != null ? firstName.toLowerCase() : "");
final String lowLastName = (lastName != null ? lastName.toLowerCase() : "");
final String lowUserName = (userName != null ? userName.toLowerCase() : "");
for (int i=0; i<nameFilters.length; i++)
{
if (lowFirstName.indexOf(nameFilters[i]) != -1)
{
addUser = true;
break;
}
else if (lowLastName.indexOf(nameFilters[i]) != -1)
{
addUser = true;
break;
}
if (matchByFilter(lowUserName, nameFilters[i]) ||
matchByFilter(lowFirstName, nameFilters[i]) ||
matchByFilter(lowLastName, nameFilters[i]))
{
addUser = true;
break;
}
}
}
catch(NoSuchPersonException e)
@@ -1682,6 +1683,39 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
return addUser;
}
private boolean matchByFilter(String compareString, String patternString)
{
if (compareString==null || compareString.isEmpty())
{
return false;
}
if (patternString==null || patternString.isEmpty())
{
return true;
}
StringBuilder paternStr=new StringBuilder();
for (char c: patternString.toCharArray())
{
if (c=='*')
{
paternStr.append(".*");
}
else if (c=='(' || c==')')
{
paternStr.append("\\"+c);
}
else if (Character.isLetterOrDigit(c) || c=='*')
{
paternStr.append(c);
}
else paternStr.append("\\"+c);
}
Pattern p=Pattern.compile(paternStr.toString(), Pattern.CASE_INSENSITIVE);
Matcher matcher=p.matcher(compareString);
return matcher.matches();
}
/**
* @see org.alfresco.service.cmr.site.SiteService#getMembersRole(java.lang.String,
* java.lang.String)

6
source/java/org/alfresco/repo/site/SiteServiceImplTest.java
View File

@@ -1322,14 +1322,14 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
assertEquals(SiteModel.SITE_CONSUMER, members.get(USER_THREE));
// - filter by name - person name
members = this.siteService.listMembers("testMembership", "UserOne", null, 0, true);
members = this.siteService.listMembers("testMembership", "UserOne*", null, 0, true);
assertNotNull(members);
assertEquals(1, members.size());
assertTrue(members.containsKey(USER_ONE));
assertEquals(SiteModel.SITE_MANAGER, members.get(USER_ONE));
// - filter by name - person name as part of group
members = this.siteService.listMembers("testMembership", "UserTwo", null, 0, true);
members = this.siteService.listMembers("testMembership", "UserTwo*", null, 0, true);
assertNotNull(members);
assertEquals(1, members.size());
assertTrue(members.containsKey(USER_TWO));
@@ -1337,7 +1337,7 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
// - filter by name - person name without group expansion
// (won't match as the group name doesn't contain the user's name)
members = this.siteService.listMembers("testMembership", "UserTwo", null, 0, false);
members = this.siteService.listMembers("testMembership", "UserTwo*", null, 0, false);
assertNotNull(members);
assertEquals(0, members.size());