Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 08:55:44 +01:00
Code Issues Packages Projects Releases Activity

implement LoginAttemptHandler for scm-manager 2

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-01-15 20:27:06 +01:00
parent cbc6dad0fe
commit df6d9dacf8
12 changed files with 494 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyRealm.java
View File

@@ -73,30 +73,28 @@ public class LegacyRealm extends AuthenticatingRealm
@VisibleForTesting
static final String REALM = "LegacyRealm";
/** Field description */
//J-
private static final CharMatcher HEX_MATCHER = CharMatcher.inRange('0', '9')
private static final CharMatcher HEX_MATCHER = CharMatcher
.inRange('0', '9')
.or(CharMatcher.inRange('a', 'f'))
.or(CharMatcher.inRange('A', 'F'));
//J+
.or(CharMatcher.inRange('A', 'F')
);
/**
* the logger for LegacyRealm
* the logger for LegacyRealm
*/
private static final Logger logger =
LoggerFactory.getLogger(LegacyRealm.class);
private static final Logger LOG = LoggerFactory.getLogger(LegacyRealm.class);
private final DAORealmHelper helper;
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
* Constructs a new instance.
*
*
* @param helperFactory
* @param helperFactory dao realm helper factory
*/
@Inject
public LegacyRealm(DAORealmHelperFactory helperFactory)
{
public LegacyRealm(DAORealmHelperFactory helperFactory) {
this.helper = helperFactory.create(REALM);
setAuthenticationTokenClass(UsernamePasswordToken.class);
@@ -105,64 +103,36 @@ public class LegacyRealm extends AuthenticatingRealm
matcher.setHashAlgorithmName(Sha1Hash.ALGORITHM_NAME);
matcher.setHashIterations(1);
matcher.setStoredCredentialsHexEncoded(true);
setCredentialsMatcher(matcher);
setCredentialsMatcher(helper.wrapCredentialsMatcher(matcher));
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param token
*
* @return
*
* @throws AuthenticationException
*/
@Override
protected AuthenticationInfo doGetAuthenticationInfo(
AuthenticationToken token)
throws AuthenticationException
{
Preconditions.checkArgument(token instanceof UsernamePasswordToken,
"unsupported token");
protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
Preconditions.checkArgument(token instanceof UsernamePasswordToken, "unsupported token");
return returnOnHexCredentials(helper.getAuthenticationInfo(token));
}
private AuthenticationInfo returnOnHexCredentials(AuthenticationInfo info)
{
private AuthenticationInfo returnOnHexCredentials(AuthenticationInfo info) {
AuthenticationInfo result = null;
if (info != null)
{
if (info != null) {
Object credentials = info.getCredentials();
if (credentials instanceof String)
{
if (credentials instanceof String) {
String password = (String) credentials;
if (HEX_MATCHER.matchesAllOf(password))
{
if (HEX_MATCHER.matchesAllOf(password)) {
result = info;
} else {
LOG.debug("hash contains non hex chars");
}
else
{
logger.debug("hash contains non hex chars");
}
}
else
{
logger.debug("non string crendentials found");
} else {
LOG.debug("non string crendentials found");
}
}
return result;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private final DAORealmHelper helper;
}

4
scm-plugins/scm-legacy-plugin/src/test/java/sonia/scm/legacy/LegacyRealmTest.java
View File

@@ -58,6 +58,7 @@ import org.junit.Before;
import static org.mockito.Mockito.*;
import sonia.scm.security.DAORealmHelperFactory;
import sonia.scm.security.LoginAttemptHandler;
/**
*
@@ -144,6 +145,9 @@ public class LegacyRealmTest
//~--- fields ---------------------------------------------------------------
@Mock
private LoginAttemptHandler loginAttemptHandler;
@Mock
private UserDAO userDAO;