Skip to content

Commit 0ed455b

Browse files
mhalbrittermhalbritter
committed
Apply SAML2 sign-request even if metadata url is set
Closes gh-33747
1 parent 4a6dd95 commit 0ed455b

File tree

4 files changed

+76
-11
lines changed

4 files changed

+76
-11
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ private RelyingPartyRegistration asRegistration(String id, Registration properti
9191
AssertingPartyProperties assertingParty = new AssertingPartyProperties(properties, id);
9292
boolean usingMetadata = StringUtils.hasText(assertingParty.getMetadataUri());
9393
Builder builder = (!usingMetadata) ? RelyingPartyRegistration.withRegistrationId(id)
94-
: createBuilderUsingMetadata(id, assertingParty).registrationId(id);
94+
: createBuilderUsingMetadata(assertingParty).registrationId(id);
9595
builder.assertionConsumerServiceLocation(properties.getAcs().getLocation());
9696
builder.assertionConsumerServiceBinding(properties.getAcs().getBinding());
97-
builder.assertingPartyDetails(mapAssertingParty(properties, id, usingMetadata));
97+
builder.assertingPartyDetails(mapAssertingParty(properties, id));
9898
builder.signingX509Credentials((credentials) -> properties.getSigning()
9999
.getCredentials()
100100
.stream()
@@ -120,8 +120,7 @@ private RelyingPartyRegistration asRegistration(String id, Registration properti
120120
return registration;
121121
}
122122

123-
private RelyingPartyRegistration.Builder createBuilderUsingMetadata(String id,
124-
AssertingPartyProperties properties) {
123+
private RelyingPartyRegistration.Builder createBuilderUsingMetadata(AssertingPartyProperties properties) {
125124
String requiredEntityId = properties.getEntityId();
126125
Collection<Builder> candidates = RelyingPartyRegistrations
127126
.collectionFromMetadataLocation(properties.getMetadataUri());
@@ -139,17 +138,14 @@ private Object getEntityId(RelyingPartyRegistration.Builder candidate) {
139138
return result[0];
140139
}
141140

142-
private Consumer<AssertingPartyDetails.Builder> mapAssertingParty(Registration registration, String id,
143-
boolean usingMetadata) {
141+
private Consumer<AssertingPartyDetails.Builder> mapAssertingParty(Registration registration, String id) {
144142
return (details) -> {
145143
AssertingPartyProperties assertingParty = new AssertingPartyProperties(registration, id);
146144
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
147145
map.from(assertingParty::getEntityId).to(details::entityId);
148146
map.from(assertingParty::getSingleSignonBinding).to(details::singleSignOnServiceBinding);
149147
map.from(assertingParty::getSingleSignonUrl).to(details::singleSignOnServiceLocation);
150-
map.from(assertingParty::getSingleSignonSignRequest)
151-
.when((ignored) -> !usingMetadata)
152-
.to(details::wantAuthnRequestsSigned);
148+
map.from(assertingParty::getSingleSignonSignRequest).to(details::wantAuthnRequestsSigned);
153149
map.from(assertingParty.getSinglelogoutUrl()).to(details::singleLogoutServiceLocation);
154150
map.from(assertingParty.getSinglelogoutResponseUrl()).to(details::singleLogoutServiceResponseLocation);
155151
map.from(assertingParty.getSinglelogoutBinding()).to(details::singleLogoutServiceBinding);

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.boot.autoconfigure.security.saml2;
1818

19-
import java.io.IOException;
2019
import java.io.InputStream;
2120
import java.util.List;
2221

@@ -416,7 +415,26 @@ void autoconfigurationWhenMultipleProvidersAndSpecifiedEntityId() throws Excepti
416415
testMultipleProviders("https://idp2.example.com/idp/shibboleth", "https://idp2.example.com/idp/shibboleth");
417416
}
418417

419-
private void testMultipleProviders(String specifiedEntityId, String expected) throws IOException, Exception {
418+
@Test
419+
void signRequestShouldApplyIfMetadataUriIsSet() throws Exception {
420+
try (MockWebServer server = new MockWebServer()) {
421+
server.start();
422+
String metadataUrl = server.url("").toString();
423+
setupMockResponse(server, new ClassPathResource("saml/idp-metadata"));
424+
this.contextRunner.withPropertyValues(PREFIX + ".foo.assertingparty.metadata-uri=" + metadataUrl,
425+
PREFIX + ".foo.assertingparty.singlesignon.sign-request=true",
426+
PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:org/springframework/boot/autoconfigure/security/saml2/rsa.key",
427+
PREFIX + ".foo.signing.credentials[0].certificate-location=classpath:org/springframework/boot/autoconfigure/security/saml2/rsa.crt")
428+
.run((context) -> {
429+
RelyingPartyRegistrationRepository repository = context
430+
.getBean(RelyingPartyRegistrationRepository.class);
431+
RelyingPartyRegistration registration = repository.findByRegistrationId("foo");
432+
assertThat(registration.getAssertingPartyDetails().getWantAuthnRequestsSigned()).isTrue();
433+
});
434+
}
435+
}
436+
437+
private void testMultipleProviders(String specifiedEntityId, String expected) throws Exception {
420438
try (MockWebServer server = new MockWebServer()) {
421439
server.start();
422440
String metadataUrl = server.url("").toString();

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/rsa.crt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIID1zCCAr+gAwIBAgIUCzQeKBMTO0iHVW3iKmZC41haqCowDQYJKoZIhvcNAQEL
3+
BQAwezELMAkGA1UEBhMCWFgxEjAQBgNVBAgMCVN0YXRlTmFtZTERMA8GA1UEBwwI
4+
Q2l0eU5hbWUxFDASBgNVBAoMC0NvbXBhbnlOYW1lMRswGQYDVQQLDBJDb21wYW55
5+
U2VjdGlvbk5hbWUxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0yMzA5MjAwODI5MDNa
6+
Fw0zMzA5MTcwODI5MDNaMHsxCzAJBgNVBAYTAlhYMRIwEAYDVQQIDAlTdGF0ZU5h
7+
bWUxETAPBgNVBAcMCENpdHlOYW1lMRQwEgYDVQQKDAtDb21wYW55TmFtZTEbMBkG
8+
A1UECwwSQ29tcGFueVNlY3Rpb25OYW1lMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEi
9+
MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUfi4aaCotJZX6OSDjv6fxCCfc
10+
ihSs91Z/mmN+yc1fsxVSs53SIbqUuo+Wzhv34kp8I/r03P9LWVTkFPbeDxAl75Oa
11+
PGggxK55US0Zfy9Hj1BwWIKV3330N61emID1GDEtFKL4yJbJdreQXnIXTBL2o76V
12+
nuV/tYozyZnb07IQ1WhUm5WDxgzM0yFudMynTczCBeZHfvharDtB8PFFhCZXW2/9
13+
TZVVfW4oOML8EAX3hvnvYBlFl/foxXekZSwq/odOkmWCZavT2+0sburHUlOnPGUh
14+
Qj4tHwpMRczp7VX4ptV1D2UrxsK/2B+s9FK2QSLKQ9JzAYJ6WxQjHcvET9jvAgMB
15+
AAGjUzBRMB0GA1UdDgQWBBQjDr/1E/01pfLPD8uWF7gbaYL0TTAfBgNVHSMEGDAW
16+
gBQjDr/1E/01pfLPD8uWF7gbaYL0TTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
17+
DQEBCwUAA4IBAQAGjUuec0+0XNMCRDKZslbImdCAVsKsEWk6NpnUViDFAxL+KQuC
18+
NW131UeHb9SCzMqRwrY4QI3nAwJQCmilL/hFM3ss4acn3WHu1yci/iKPUKeL1ec5
19+
kCFUmqX1NpTiVaytZ/9TKEr69SMVqNfQiuW5U1bIIYTqK8xo46WpM6YNNHO3eJK6
20+
NH0MW79Wx5ryi4i4C6afqYbVbx7tqcmy8CFeNxgZ0bFQ87SiwYXIj77b6sVYbu32
21+
doykBQgSHLcagWASPQ73m73CWUgo+7+EqSKIQqORbgmTLPmOUh99gFIx7jmjTyHm
22+
NBszx1ZVWuIv3mWmp626Kncyc+LLM9tvgymx
23+
-----END CERTIFICATE-----

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/rsa.key‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDUfi4aaCotJZX6
3+
OSDjv6fxCCfcihSs91Z/mmN+yc1fsxVSs53SIbqUuo+Wzhv34kp8I/r03P9LWVTk
4+
FPbeDxAl75OaPGggxK55US0Zfy9Hj1BwWIKV3330N61emID1GDEtFKL4yJbJdreQ
5+
XnIXTBL2o76VnuV/tYozyZnb07IQ1WhUm5WDxgzM0yFudMynTczCBeZHfvharDtB
6+
8PFFhCZXW2/9TZVVfW4oOML8EAX3hvnvYBlFl/foxXekZSwq/odOkmWCZavT2+0s
7+
burHUlOnPGUhQj4tHwpMRczp7VX4ptV1D2UrxsK/2B+s9FK2QSLKQ9JzAYJ6WxQj
8+
HcvET9jvAgMBAAECggEADdeRuZml1F65mDJm1enduaH+NWvEm1yEr3ecr0fbujYI
9+
bQ89+CVx/znvRvPH4aFwQwmgUZl12JrfS05MTectoPMBf/obDwtmPDPmsV2rdEi9
10+
2jEB11vW23T8X7L6hOdzCKHqrd8kkhzK1LuPnhHlaFipU8YlOBOuMYpv8eB78y79
11+
Qkd5/ZEygFhqVGz96R7nT/xS21aPC7OPhicAauLLuguF4caCNhwkjLi3bizLemUn
12+
4i41q69drg7G8WX6BTxzem5FupKfI8rn2EkOjO/biVRknzGxAdqkM8SDHWkqeOuY
13+
8QVhc1kZsMkB0BGPlDPStUwEHSfUiND4GJTcngc++QKBgQD2lyeW3PoPjQ1qzjN4
14+
V/0XE77zpcPE5dW7chLtiWRY1dqk2uOJ32iOtxuqk9Q/YMSZyPJlTkfI5JePuC/B
15+
MB+QXzXuWN03Vn0ZrOpQlxcdA4A1o10NT1nEw8kZlf4+LyUk8GpMGUhjnxFZpZbf
16+
5S3fy0/2V8wGvOmXR65c8m6ASQKBgQDcmfCV5npu1HrtO8jmU9gBIhniNjB4IWue
17+
TSRt3ANDQaVBqsVaIMe/mUEQrZ6MdikMeA4bobOA6bUYwOiq8JGWSenAzGL22TbA
18+
W51q6A8hgDCuH1JnoagqUIbr61kwEVcfbRHEFpuxLURsjoDg/xBtwO96SxWPh5Wr
19+
+f1q8t5/dwKBgGWc+AVk3e6Wk1bVzcPjjjl6O4+vWTLD+wUZBs+3dBBfX4/bWzQv
20+
Sai1r8Lk0+uh9qHgenJghZg1CneA0LztFbSqZ1DmcZIiI7720D+RY0bjcGup++hG
21+
MJmyjCXs9y2sw8OrBkKBkKDspXupjriIehTkdPjwSPTl1+Qs9575j6txAoGAT8n+
22+
ErnCHsQLkjLFf0lkH0TOR9uBvHGaEy+jtXiWVYUw2IeDyg2BMfOkbPvfFL7IKhJi
23+
R+w8mKvvLHzZqrpIbitduLY0NURrYTfBwCEfF+bdtJzvmTwHLwbhRgNhxtj+wgcZ
24+
HetvdK4CyaDhTH/02T2nYHw32CoaIJHS7xPZFhECgYEAv7xRawjlrC4V0BLjP3Ej
25+
pk8BbsRABxN1CrS6nJK+So4u2gKQDsL3WA0oJTS8v8AD5LvQUNr1d57FVlq9lwCd
26+
u623eOIuluCUZBVy1iYdkRXWz9pg5bCidCgEYUpF3SqpsuFou0XFzDD773UVQFVw
27+
VYriYasPwmzS2y2P7PKFzJs=
28+
-----END PRIVATE KEY-----

0 commit comments

Comments
 (0)