Remove PlainTextPasswordEncoder from core
Issue: gh-4674
This commit is contained in:
Rob Winch
+2
-2
@@ -21,11 +21,11 @@ import org.springframework.security.authentication.BadCredentialsException;
|
||||
import org.springframework.security.authentication.InternalAuthenticationServiceException;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
import org.springframework.security.authentication.encoding.PasswordEncoder;
|
||||
import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder;
|
||||
import org.springframework.security.core.AuthenticationException;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
||||
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
@@ -65,7 +65,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
|
||||
private UserDetailsService userDetailsService;
|
||||
|
||||
public DaoAuthenticationProvider() {
|
||||
setPasswordEncoder(new PlaintextPasswordEncoder());
|
||||
setPasswordEncoder(NoOpPasswordEncoder.getInstance());
|
||||
}
|
||||
|
||||
// ~ Methods
|
||||
|
||||
-97
@@ -1,97 +0,0 @@
|
||||
/*
|
||||
* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.security.authentication.encoding;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Plaintext implementation of PasswordEncoder.
|
||||
* </p>
|
||||
* <P>
|
||||
* As callers may wish to extract the password and salts separately from the encoded
|
||||
* password, the salt must not contain reserved characters (specifically '{' and '}').
|
||||
* </p>
|
||||
*
|
||||
* @author colin sampaleanu
|
||||
* @author Ben Alex
|
||||
*/
|
||||
public class PlaintextPasswordEncoder extends BasePasswordEncoder {
|
||||
// ~ Instance fields
|
||||
// ================================================================================================
|
||||
|
||||
private boolean ignorePasswordCase = false;
|
||||
|
||||
// ~ Methods
|
||||
// ========================================================================================================
|
||||
|
||||
public String encodePassword(String rawPass, Object salt) {
|
||||
return mergePasswordAndSalt(rawPass, salt, true);
|
||||
}
|
||||
|
||||
public boolean isIgnorePasswordCase() {
|
||||
return ignorePasswordCase;
|
||||
}
|
||||
|
||||
public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
|
||||
String pass1 = encPass + "";
|
||||
|
||||
// Strict delimiters is false because pass2 never persisted anywhere
|
||||
// and we want to avoid unnecessary exceptions as a result (the
|
||||
// authentication will fail as the encodePassword never allows them)
|
||||
String pass2 = mergePasswordAndSalt(rawPass, salt, false);
|
||||
|
||||
if (ignorePasswordCase) {
|
||||
// Note: per String javadoc to get correct results for Locale insensitive, use
|
||||
// English
|
||||
pass1 = pass1.toLowerCase(Locale.ENGLISH);
|
||||
pass2 = pass2.toLowerCase(Locale.ENGLISH);
|
||||
}
|
||||
return PasswordEncoderUtils.equals(pass1, pass2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Demerges the previously {@link #encodePassword(String, Object)}<code>String</code>.
|
||||
* <P>
|
||||
* The resulting array is guaranteed to always contain two elements. The first is the
|
||||
* password, and the second is the salt.
|
||||
* </p>
|
||||
* <P>
|
||||
* Throws an exception if <code>null</code> or an empty <code>String</code> is passed
|
||||
* to the method.
|
||||
* </p>
|
||||
*
|
||||
* @param password from {@link #encodePassword(String, Object)}
|
||||
*
|
||||
* @return an array containing the password and salt
|
||||
*/
|
||||
public String[] obtainPasswordAndSalt(String password) {
|
||||
return demergePasswordAndSalt(password);
|
||||
}
|
||||
|
||||
/**
|
||||
* Indicates whether the password comparison is case sensitive.
|
||||
* <P>
|
||||
* Defaults to <code>false</code>, meaning an exact case match is required.
|
||||
* </p>
|
||||
*
|
||||
* @param ignorePasswordCase set to <code>true</code> for less stringent comparison
|
||||
*/
|
||||
public void setIgnorePasswordCase(boolean ignorePasswordCase) {
|
||||
this.ignorePasswordCase = ignorePasswordCase;
|
||||
}
|
||||
}
|
||||
-73
@@ -1,73 +0,0 @@
|
||||
/*
|
||||
* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.security.authentication.encoding;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* TestCase for PlaintextPasswordEncoder.
|
||||
* </p>
|
||||
*
|
||||
* @author colin sampaleanu
|
||||
* @author Ben Alex
|
||||
*/
|
||||
public class PlaintextPasswordEncoderTests {
|
||||
|
||||
// ~ Methods
|
||||
// ========================================================================================================
|
||||
@Test
|
||||
public void testBasicFunctionality() {
|
||||
PlaintextPasswordEncoder pe = new PlaintextPasswordEncoder();
|
||||
|
||||
String raw = "abc123";
|
||||
String rawDiffCase = "AbC123";
|
||||
String badRaw = "abc321";
|
||||
String salt = "THIS_IS_A_SALT";
|
||||
|
||||
String encoded = pe.encodePassword(raw, salt);
|
||||
assertThat(encoded).isEqualTo("abc123{THIS_IS_A_SALT}");
|
||||
assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue();
|
||||
assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse();
|
||||
|
||||
// make sure default is not to ignore password case
|
||||
assertThat(pe.isIgnorePasswordCase()).isFalse();
|
||||
encoded = pe.encodePassword(rawDiffCase, salt);
|
||||
assertThat(pe.isPasswordValid(encoded, raw, salt)).isFalse();
|
||||
|
||||
// now check for ignore password case
|
||||
pe = new PlaintextPasswordEncoder();
|
||||
pe.setIgnorePasswordCase(true);
|
||||
|
||||
// should be able to validate even without encoding
|
||||
encoded = pe.encodePassword(rawDiffCase, salt);
|
||||
assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue();
|
||||
assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMergeDemerge() {
|
||||
PlaintextPasswordEncoder pwd = new PlaintextPasswordEncoder();
|
||||
|
||||
String merged = pwd.encodePassword("password", "foo");
|
||||
String[] demerged = pwd.obtainPasswordAndSalt(merged);
|
||||
assertThat(demerged[0]).isEqualTo("password");
|
||||
assertThat(demerged[1]).isEqualTo("foo");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user