@@ -66,15 +66,15 @@ class Saml2RelyingPartyAutoConfigurationTests {
66
66
@ Test
67
67
void autoConfigurationShouldBeConditionalOnRelyingPartyRegistrationRepositoryClass () {
68
68
this .contextRunner .withPropertyValues (getPropertyValues (false )).withClassLoader (new FilteredClassLoader (
69
- "org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" ))
69
+ "org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" ))
70
70
.run ((context ) -> assertThat (context ).doesNotHaveBean (RelyingPartyRegistrationRepository .class ));
71
71
}
72
72
73
73
@ Test
74
74
@ Deprecated
75
75
void autoConfigurationShouldBeConditionalOnRelyingPartyRegistrationRepositoryClassDeprecated () {
76
76
this .contextRunner .withPropertyValues (getPropertyValues (true )).withClassLoader (new FilteredClassLoader (
77
- "org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" ))
77
+ "org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" ))
78
78
.run ((context ) -> assertThat (context ).doesNotHaveBean (RelyingPartyRegistrationRepository .class ));
79
79
}
80
80
@@ -264,12 +264,12 @@ void autoconfigurationWhenMetadataUrlAndPropertyPresentShouldUseBindingFromPrope
264
264
setupMockResponse (server , new ClassPathResource ("saml/idp-metadata" ));
265
265
this .contextRunner .withPropertyValues (PREFIX + ".foo.assertingparty.metadata-uri=" + metadataUrl ,
266
266
PREFIX + ".foo.assertingparty.singlesignon.binding=redirect" ).run ((context ) -> {
267
- RelyingPartyRegistrationRepository repository = context
268
- .getBean (RelyingPartyRegistrationRepository .class );
269
- RelyingPartyRegistration registration = repository .findByRegistrationId ("foo" );
270
- assertThat (registration .getAssertingPartyDetails ().getSingleSignOnServiceBinding ())
271
- .isEqualTo (Saml2MessageBinding .REDIRECT );
272
- });
267
+ RelyingPartyRegistrationRepository repository = context
268
+ .getBean (RelyingPartyRegistrationRepository .class );
269
+ RelyingPartyRegistration registration = repository .findByRegistrationId ("foo" );
270
+ assertThat (registration .getAssertingPartyDetails ().getSingleSignOnServiceBinding ())
271
+ .isEqualTo (Saml2MessageBinding .REDIRECT );
272
+ });
273
273
}
274
274
}
275
275
@@ -282,12 +282,12 @@ void autoconfigurationWhenMetadataUrlAndPropertyPresentShouldUseBindingFromPrope
282
282
setupMockResponse (server , new ClassPathResource ("saml/idp-metadata" ));
283
283
this .contextRunner .withPropertyValues (PREFIX + ".foo.identityprovider.metadata-uri=" + metadataUrl ,
284
284
PREFIX + ".foo.identityprovider.singlesignon.binding=redirect" ).run ((context ) -> {
285
- RelyingPartyRegistrationRepository repository = context
286
- .getBean (RelyingPartyRegistrationRepository .class );
287
- RelyingPartyRegistration registration = repository .findByRegistrationId ("foo" );
288
- assertThat (registration .getAssertingPartyDetails ().getSingleSignOnServiceBinding ())
289
- .isEqualTo (Saml2MessageBinding .REDIRECT );
290
- });
285
+ RelyingPartyRegistrationRepository repository = context
286
+ .getBean (RelyingPartyRegistrationRepository .class );
287
+ RelyingPartyRegistration registration = repository .findByRegistrationId ("foo" );
288
+ assertThat (registration .getAssertingPartyDetails ().getSingleSignOnServiceBinding ())
289
+ .isEqualTo (Saml2MessageBinding .REDIRECT );
290
+ });
291
291
}
292
292
}
293
293
@@ -405,7 +405,7 @@ private String[] getPropertyValuesWithoutSigningCredentials(boolean signRequests
405
405
PREFIX + ".foo." + assertingParty
406
406
+ ".entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php" ,
407
407
PREFIX + ".foo." + assertingParty
408
- + ".verification.credentials[0].certificate-location=classpath:saml/certificate-location" };
408
+ + ".verification.credentials[0].certificate-location=classpath:saml/certificate-location" };
409
409
}
410
410
411
411
private String [] getPropertyValuesWithoutSsoBinding (boolean useDeprecated ) {
@@ -417,7 +417,7 @@ private String[] getPropertyValuesWithoutSsoBinding(boolean useDeprecated) {
417
417
PREFIX + ".foo." + assertingParty
418
418
+ ".entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php" ,
419
419
PREFIX + ".foo." + assertingParty
420
- + ".verification.credentials[0].certificate-location=classpath:saml/certificate-location" };
420
+ + ".verification.credentials[0].certificate-location=classpath:saml/certificate-location" };
421
421
}
422
422
423
423
private String [] getPropertyValues (boolean useDeprecated ) {
@@ -443,7 +443,7 @@ private String[] getPropertyValues(boolean useDeprecated) {
443
443
PREFIX + ".foo.asserting-party.singlelogout.binding=post" ,
444
444
PREFIX + ".foo.entity-id={baseUrl}/saml2/foo-entity-id" ,
445
445
PREFIX + ".foo.acs.location={baseUrl}/login/saml2/foo-entity-id" ,
446
- PREFIX + ".foo.acs.binding=redirect" };
446
+ PREFIX + ".foo.acs.binding=redirect" };
447
447
}
448
448
449
449
private boolean hasFilter (AssertableWebApplicationContext context , Class <? extends Filter > filter ) {
0 commit comments