mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,74 +1,74 @@
|
||||
package org.alfresco.repo.security.person;
|
||||
|
||||
import org.alfresco.util.Pair;
|
||||
|
||||
public class UserNameMatcherImpl implements UserNameMatcher
|
||||
{
|
||||
private boolean userNamesAreCaseSensitive = false;
|
||||
|
||||
private boolean domainNamesAreCaseSensitive = false;
|
||||
|
||||
private String domainSeparator = "";
|
||||
|
||||
public boolean getUserNamesAreCaseSensitive()
|
||||
{
|
||||
return userNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public void setUserNamesAreCaseSensitive(boolean userNamesAreCaseSensitive)
|
||||
{
|
||||
this.userNamesAreCaseSensitive = userNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public boolean getDomainNamesAreCaseSensitive()
|
||||
{
|
||||
return domainNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public void setDomainNamesAreCaseSensitive(boolean domainNamesAreCaseSensitive)
|
||||
{
|
||||
this.domainNamesAreCaseSensitive = domainNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public String getDomainSeparator()
|
||||
{
|
||||
return domainSeparator;
|
||||
}
|
||||
|
||||
public void setDomainSeparator(String domainSeparator)
|
||||
{
|
||||
this.domainSeparator = domainSeparator;
|
||||
}
|
||||
|
||||
public boolean matches(String realUserName, String searchUserName)
|
||||
{
|
||||
// note: domain string may be empty
|
||||
Pair<String, String> real = splitByDomain(realUserName, domainSeparator);
|
||||
Pair<String, String> search = splitByDomain(searchUserName, domainSeparator);
|
||||
|
||||
return (((userNamesAreCaseSensitive && (real.getFirst().equals(search.getFirst()))) || (!userNamesAreCaseSensitive && (real.getFirst().equalsIgnoreCase(search
|
||||
.getFirst())))) &&
|
||||
|
||||
((domainNamesAreCaseSensitive && (real.getSecond().equals(search.getSecond()))) || (!domainNamesAreCaseSensitive && (real.getSecond().equalsIgnoreCase(search
|
||||
.getSecond())))));
|
||||
}
|
||||
|
||||
// Trailing domain only
|
||||
private Pair<String, String> splitByDomain(String name, String domainSeparator)
|
||||
{
|
||||
int idx = name.lastIndexOf(domainSeparator);
|
||||
if (idx != -1)
|
||||
{
|
||||
if ((idx + 1) > name.length())
|
||||
{
|
||||
return new Pair<String, String>(name.substring(0, idx), "");
|
||||
}
|
||||
else
|
||||
{
|
||||
return new Pair<String, String>(name.substring(0, idx), name.substring(idx + 1));
|
||||
}
|
||||
}
|
||||
|
||||
return new Pair<String, String>(name, "");
|
||||
}
|
||||
package org.alfresco.repo.security.person;
|
||||
|
||||
import org.alfresco.util.Pair;
|
||||
|
||||
public class UserNameMatcherImpl implements UserNameMatcher
|
||||
{
|
||||
private boolean userNamesAreCaseSensitive = false;
|
||||
|
||||
private boolean domainNamesAreCaseSensitive = false;
|
||||
|
||||
private String domainSeparator = "";
|
||||
|
||||
public boolean getUserNamesAreCaseSensitive()
|
||||
{
|
||||
return userNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public void setUserNamesAreCaseSensitive(boolean userNamesAreCaseSensitive)
|
||||
{
|
||||
this.userNamesAreCaseSensitive = userNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public boolean getDomainNamesAreCaseSensitive()
|
||||
{
|
||||
return domainNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public void setDomainNamesAreCaseSensitive(boolean domainNamesAreCaseSensitive)
|
||||
{
|
||||
this.domainNamesAreCaseSensitive = domainNamesAreCaseSensitive;
|
||||
}
|
||||
|
||||
public String getDomainSeparator()
|
||||
{
|
||||
return domainSeparator;
|
||||
}
|
||||
|
||||
public void setDomainSeparator(String domainSeparator)
|
||||
{
|
||||
this.domainSeparator = domainSeparator;
|
||||
}
|
||||
|
||||
public boolean matches(String realUserName, String searchUserName)
|
||||
{
|
||||
// note: domain string may be empty
|
||||
Pair<String, String> real = splitByDomain(realUserName, domainSeparator);
|
||||
Pair<String, String> search = splitByDomain(searchUserName, domainSeparator);
|
||||
|
||||
return (((userNamesAreCaseSensitive && (real.getFirst().equals(search.getFirst()))) || (!userNamesAreCaseSensitive && (real.getFirst().equalsIgnoreCase(search
|
||||
.getFirst())))) &&
|
||||
|
||||
((domainNamesAreCaseSensitive && (real.getSecond().equals(search.getSecond()))) || (!domainNamesAreCaseSensitive && (real.getSecond().equalsIgnoreCase(search
|
||||
.getSecond())))));
|
||||
}
|
||||
|
||||
// Trailing domain only
|
||||
private Pair<String, String> splitByDomain(String name, String domainSeparator)
|
||||
{
|
||||
int idx = name.lastIndexOf(domainSeparator);
|
||||
if (idx != -1)
|
||||
{
|
||||
if ((idx + 1) > name.length())
|
||||
{
|
||||
return new Pair<String, String>(name.substring(0, idx), "");
|
||||
}
|
||||
else
|
||||
{
|
||||
return new Pair<String, String>(name.substring(0, idx), name.substring(idx + 1));
|
||||
}
|
||||
}
|
||||
|
||||
return new Pair<String, String>(name, "");
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user