Remove ShaPasswordEncoder from core

Issue: gh-4674

config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java

@@ -30,7 +30,6 @@ import org.springframework.security.authentication.encoding.BaseDigestPasswordEn
 import org.springframework.security.authentication.encoding.LdapShaPasswordEncoder;
 import org.springframework.security.authentication.encoding.Md4PasswordEncoder;
 import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder;
-import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 import org.springframework.security.config.Elements;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.util.StringUtils;
@@ -50,8 +49,6 @@ public class PasswordEncoderParser {
 	static final String ATT_BASE_64 = "base64";
 	static final String OPT_HASH_BCRYPT = "bcrypt";
 	static final String OPT_HASH_PLAINTEXT = "plaintext";
-	static final String OPT_HASH_SHA = "sha";
-	static final String OPT_HASH_SHA256 = "sha-256";
 	static final String OPT_HASH_MD4 = "md4";
 	static final String OPT_HASH_LDAP_SHA = "{sha}";
 	static final String OPT_HASH_LDAP_SSHA = "{ssha}";
@@ -62,8 +59,6 @@ public class PasswordEncoderParser {
 		ENCODER_CLASSES = new HashMap<String, Class<?>>();
 		ENCODER_CLASSES.put(OPT_HASH_PLAINTEXT, PlaintextPasswordEncoder.class);
 		ENCODER_CLASSES.put(OPT_HASH_BCRYPT, BCryptPasswordEncoder.class);
-		ENCODER_CLASSES.put(OPT_HASH_SHA, ShaPasswordEncoder.class);
-		ENCODER_CLASSES.put(OPT_HASH_SHA256, ShaPasswordEncoder.class);
 		ENCODER_CLASSES.put(OPT_HASH_MD4, Md4PasswordEncoder.class);
 		ENCODER_CLASSES.put(OPT_HASH_LDAP_SHA, LdapShaPasswordEncoder.class);
 		ENCODER_CLASSES.put(OPT_HASH_LDAP_SSHA, LdapShaPasswordEncoder.class);
@@ -119,10 +114,6 @@ public class PasswordEncoderParser {
 		BeanDefinitionBuilder beanBldr = BeanDefinitionBuilder
 				.rootBeanDefinition(beanClass);
 
-		if (OPT_HASH_SHA256.equals(hash)) {
-			beanBldr.addConstructorArgValue(Integer.valueOf(256));
-		}
-
 		if (useBase64) {
 			if (BaseDigestPasswordEncoder.class.isAssignableFrom(beanClass)) {
 				beanBldr.addPropertyValue("encodeHashAsBase64", "true");

config/src/main/resources/org/springframework/security/config/spring-security-5.0.rnc

@@ -7,7 +7,7 @@ start = http | ldap-server | authentication-provider | ldap-authentication-provi
 
 hash =
 	## Defines the hashing algorithm used on user passwords. Bcrypt is recommended.
-	attribute hash {"bcrypt" | "plaintext" | "sha" | "sha-256" | "md4" | "{sha}" | "{ssha}"}
+	attribute hash {"bcrypt" | "plaintext" | "md4" | "{sha}" | "{ssha}"}
 base64 =
 	## Whether a string should be base64 encoded
 	attribute base64 {xsd:boolean}

config/src/main/resources/org/springframework/security/config/spring-security-5.0.xsd

@@ -13,8 +13,6 @@
             <xs:restriction base="xs:token">
                <xs:enumeration value="bcrypt"/>
                <xs:enumeration value="plaintext"/>
-               <xs:enumeration value="sha"/>
-               <xs:enumeration value="sha-256"/>
                <xs:enumeration value="md4"/>
                <xs:enumeration value="{sha}"/>
                <xs:enumeration value="{ssha}"/>
@@ -147,8 +145,6 @@
             <xs:restriction base="xs:token">
                <xs:enumeration value="bcrypt"/>
                <xs:enumeration value="plaintext"/>
-               <xs:enumeration value="sha"/>
-               <xs:enumeration value="sha-256"/>
                <xs:enumeration value="md4"/>
                <xs:enumeration value="{sha}"/>
                <xs:enumeration value="{ssha}"/>
@@ -529,8 +525,6 @@
             <xs:restriction base="xs:token">
                <xs:enumeration value="bcrypt"/>
                <xs:enumeration value="plaintext"/>
-               <xs:enumeration value="sha"/>
-               <xs:enumeration value="sha-256"/>
                <xs:enumeration value="md4"/>
                <xs:enumeration value="{sha}"/>
                <xs:enumeration value="{ssha}"/>

config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java

@@ -15,17 +15,13 @@
  */
 package org.springframework.security.config.authentication;
 
-import static org.assertj.core.api.Assertions.*;
-
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.ReflectionSaltSource;
-import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 import org.springframework.security.config.BeanIds;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
 import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
-import org.springframework.security.util.FieldUtils;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
@@ -132,19 +128,6 @@ public class AuthenticationProviderBeanDefinitionParserTests {
 		getProvider().authenticate(bob);
 	}
 
-	@Test
-	public void providerWithSha256PasswordEncoderIsSupported() throws Exception {
-		setContext(" <authentication-provider>"
-				+ "        <password-encoder hash='sha-256'/>"
-				+ "        <user-service>"
-				+ "            <user name='bob' password='notused' authorities='ROLE_A' />"
-				+ "        </user-service>" + "    </authentication-provider>");
-
-		ShaPasswordEncoder encoder = (ShaPasswordEncoder) FieldUtils.getFieldValue(
-				getProvider(), "passwordEncoder");
-		assertThat(encoder.getAlgorithm()).isEqualTo("SHA-256");
-	}
-
 	@Test
 	public void passwordIsBase64EncodedWhenBase64IsEnabled() throws Exception {
 		appContext = new InMemoryXmlApplicationContext(