Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add nameIdFormat to Properties

Browse Source 
Add the new property nameIdFormat to the Saml2RelyingPartyProperties and
the corresponding mapping to the
Saml2RelyingPartyRegistrationConfiguration.

See gh-39395
This commit is contained in:
BenchmarkingBuffalo 2024-02-04 18:20:05 +01:00 committed by Moritz Halbritter
parent 22de896339
commit 8e75817d6a
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java
View File

@ -31,6 +31,7 @@ import org.springframework.security.saml2.provider.service.registration.Saml2Mes
* @author Madhura Bhave
* @author Phillip Webb
* @author Moritz Halbritter
* @author Lasse Wulff
* @since 2.2.0
*/
@ConfigurationProperties("spring.security.saml2.relyingparty")
@ -72,6 +73,8 @@ public class Saml2RelyingPartyProperties {
*/
private final AssertingParty assertingparty = new AssertingParty();
private String nameIdFormat;
public String getEntityId() {
return this.entityId;
}
@ -92,12 +95,20 @@ public class Saml2RelyingPartyProperties {
return this.decryption;
}
public Singlelogout getSinglelogout() {
return this.singlelogout;
}
public AssertingParty getAssertingparty() {
return this.assertingparty;
}
public Singlelogout getSinglelogout() {
return this.singlelogout;
public String getNameIdFormat() {
return this.nameIdFormat;
}
public void setNameIdFormat(String nameIdFormat) {
this.nameIdFormat = nameIdFormat;
}
public static class Acs {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java
View File

@ -56,6 +56,7 @@ import org.springframework.util.StringUtils;
* @author Phillip Webb
* @author Moritz Halbritter
* @author Lasse Lindqvist
* @author Lasse Wulff
*/
@Configuration(proxyBeanMethods = false)
@Conditional(RegistrationConfiguredCondition.class)
@ -104,6 +105,7 @@ class Saml2RelyingPartyRegistrationConfiguration {
builder.singleLogoutServiceResponseLocation(properties.getSinglelogout().getResponseUrl());
builder.singleLogoutServiceBinding(properties.getSinglelogout().getBinding());
builder.entityId(properties.getEntityId());
builder.nameIdFormat(properties.getNameIdFormat());
RelyingPartyRegistration registration = builder.build();
boolean signRequest = registration.getAssertingPartyDetails().getWantAuthnRequestsSigned();
validateSigningCredentials(properties, signRequest);

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyPropertiesTests.java
View File

@ -34,6 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link Saml2RelyingPartyProperties}.
*
* @author Madhura Bhave
* @author Lasse Wulff
*/
class Saml2RelyingPartyPropertiesTests {
@ -102,6 +103,13 @@ class Saml2RelyingPartyPropertiesTests {
.getSignRequest()).isNull();
}
@Test
void customizeNameIdFormat() {
bind("spring.security.saml2.relyingparty.registration.simplesamlphp.name-id-format", "sampleNameIdFormat");
assertThat(this.properties.getRegistration().get("simplesamlphp").getNameIdFormat())
.isEqualTo("sampleNameIdFormat");
}
private void bind(String name, String value) {
bind(Collections.singletonMap(name, value));
}