Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove SaltSource

Browse Source 
Fixes gh-4681
This commit is contained in:
Rob Winch
2017-10-22 20:55:56 -05:00
parent d832213c6c
commit cdc992b132
16 changed files with 2 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,20 +54,10 @@ debug =
password-encoder =
## element which defines a password encoding strategy. Used by an authentication provider to convert submitted passwords to hashed versions, for example.
element password-encoder {password-encoder.attlist, salt-source?}
element password-encoder {password-encoder.attlist}
password-encoder.attlist &=
ref | (hash)
salt-source =
## Password salting strategy. A system-wide constant or a property from the UserDetails object can be used.
element salt-source {user-property | system-wide | ref}
user-property =
## A property of the UserDetails object which will be used as salt by a password encoder. Typically something like "username" might be used.
attribute user-property {xsd:token}
system-wide =
## A single value that will be used as the salt for a password encoder.
attribute system-wide {xsd:token}
role-prefix =
## A non-empty string prefix that will be added to role strings loaded from persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases where the default is non-empty.
attribute role-prefix {xsd:token}

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

@@ -144,24 +144,6 @@
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>
<xs:attributeGroup name="user-property">
<xs:attribute name="user-property" use="required" type="xs:token">
<xs:annotation>
<xs:documentation>A property of the UserDetails object which will be used as salt by a password encoder.
Typically something like "username" might be used.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
<xs:attributeGroup name="system-wide">
<xs:attribute name="system-wide" use="required" type="xs:token">
<xs:annotation>
<xs:documentation>A single value that will be used as the salt for a password encoder.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
<xs:attributeGroup name="role-prefix">
<xs:attribute name="role-prefix" use="required" type="xs:token">
<xs:annotation>
@@ -2007,36 +1989,6 @@
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="salt-source">
<xs:annotation>
<xs:documentation>Password salting strategy. A system-wide constant or a property from the UserDetails
object can be used.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:attribute name="user-property" type="xs:token">
<xs:annotation>
<xs:documentation>A property of the UserDetails object which will be used as salt by a password encoder.
Typically something like "username" might be used.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="system-wide" type="xs:token">
<xs:annotation>
<xs:documentation>A single value that will be used as the salt for a password encoder.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ref" type="xs:token">
<xs:annotation>
<xs:documentation>Defines a reference to a Spring bean Id.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="security:password-encoder.attlist"/>
</xs:complexType>
</xs:element>
@@ -2066,36 +2018,6 @@
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="salt-source">
<xs:annotation>
<xs:documentation>Password salting strategy. A system-wide constant or a property from the UserDetails
object can be used.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:attribute name="user-property" type="xs:token">
<xs:annotation>
<xs:documentation>A property of the UserDetails object which will be used as salt by a password encoder.
Typically something like "username" might be used.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="system-wide" type="xs:token">
<xs:annotation>
<xs:documentation>A single value that will be used as the salt for a password encoder.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ref" type="xs:token">
<xs:annotation>
<xs:documentation>Defines a reference to a Spring bean Id.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="security:password-encoder.attlist"/>
</xs:complexType>
</xs:element>