Add RelyingPartyRegistrationsDecoder

This adds the RelyingPartyRegistrationsDecoder component
which allows configuration with signature verification credentials.

Closes spring-projectsgh-12116
Closes spring-projectsgh-15017
Closes spring-projectsgh-15090

Author: jzheaux

docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc

@@ -588,6 +588,59 @@ class MyCustomSecurityConfiguration {
 A relying party can be multi-tenant by registering more than one relying party in the `RelyingPartyRegistrationRepository`.
 ====
 
+In the event that the location you are using is an HTTP url, you should also verify the metadata's signature. You can do this by using ``RelyingPartyRegistrations``'s underlying `RelyingPartyRegistrationsDecoder` like so:
+
+.Relying Party Registrations Decoder
+[tabs]
+======
+Java::
++
+[source,java,role="primary"]
+----
+@Configuration
+@EnableWebSecurity
+public class MyCustomSecurityConfiguration {
+	@Bean
+    RelyingPartyRegistrationsDecoder registrationsDecoder() {
+		PublicKey pub = lookupAssertingPartyPublicKey();
+		Set<Credential> credentials = Set.of(new BasicCredential(pub));
+		return new OpenSamlRelyingPartyRegistrationsDecoder(credentials);
+    }
+
+    @Bean
+    public RelyingPartyRegistrationRepository registrations(RelyingPartyRegistrationsDecoder decoder) {
+		return new InMemoryRelyingPartyRegistrationRepository(
+			decoder.decode("https://idp.example.org/ap/metadata").registrationId("ap").build());
+    }
+}
+----
+
+Kotlin::
++
+[source,kotlin,role="secondary"]
+----
+@Configuration
+@EnableWebSecurity
+class MyCustomSecurityConfiguration  {
+    @Bean
+    fun registrationsDecoder(): RelyingPartyRegistrationsDecoder {
+        val pub: PublicKey = lookupAssertingPartyPublicKey()
+        val credentials: Set<Credential> = java.util.Set.of<Credential>(BasicCredential(pub))
+        return OpenSamlRelyingPartyRegistrationsDecoder(credentials)
+    }
+
+    @Bean
+    fun registrations(decoder:RelyingPartyRegistrationsDecoder): RelyingPartyRegistrationRepository {
+        return InMemoryRelyingPartyRegistrationRepository(
+            decoder.decode("https://idp.example.org/ap/metadata").registrationId("ap").build())
+    }
+}
+----
+======
+
+[NOTE]
+The semantics of `RelyingPartyRegistrationsDecoder` are identical to `RelyingPartyRegistrations` with two important exceptions. First, the default registration id is URL-safe. Second, once each `RelyingPartyRegistration` is built, it is not of type `OpenSamlRelyingPartyRegistration` as this class is now deprecated.
+
 [[servlet-saml2login-relyingpartyregistration]]
 == RelyingPartyRegistration
 A {security-api-url}org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistration.html[`RelyingPartyRegistration`]

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/metadata/OpenSamlSigningUtils.java

@@ -80,7 +80,13 @@ static String serialize(XMLObject object) {
 	}
 
 	static <O extends SignableXMLObject> O sign(O object, RelyingPartyRegistration relyingPartyRegistration) {
-		SignatureSigningParameters parameters = resolveSigningParameters(relyingPartyRegistration);
+		List<String> algorithms = relyingPartyRegistration.getAssertingPartyDetails().getSigningAlgorithms();
+		List<Credential> credentials = resolveSigningCredentials(relyingPartyRegistration);
+		return sign(object, algorithms, credentials);
+	}
+
+	static <O extends SignableXMLObject> O sign(O object, List<String> algorithms, List<Credential> credentials) {
+		SignatureSigningParameters parameters = resolveSigningParameters(algorithms, credentials);
 		try {
 			SignatureSupport.signObject(object, parameters);
 			return object;
@@ -98,6 +104,11 @@ private static SignatureSigningParameters resolveSigningParameters(
 			RelyingPartyRegistration relyingPartyRegistration) {
 		List<Credential> credentials = resolveSigningCredentials(relyingPartyRegistration);
 		List<String> algorithms = relyingPartyRegistration.getAssertingPartyDetails().getSigningAlgorithms();
+		return resolveSigningParameters(algorithms, credentials);
+	}
+
+	private static SignatureSigningParameters resolveSigningParameters(List<String> algorithms,
+			List<Credential> credentials) {
 		List<String> digests = Collections.singletonList(SignatureConstants.ALGO_ID_DIGEST_SHA256);
 		String canonicalization = SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
 		SignatureSigningParametersResolver resolver = new SAMLMetadataSignatureSigningParametersResolver();

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
@@ -62,13 +64,15 @@ public class OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter
 		OpenSamlInitializationService.initialize();
 	}
 
-	private final OpenSamlMetadataRelyingPartyRegistrationConverter converter;
+	private final OpenSamlRelyingPartyRegistrationsDecoder converter;
 
 	/**
 	 * Creates a {@link OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter}
 	 */
 	public OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter() {
-		this.converter = new OpenSamlMetadataRelyingPartyRegistrationConverter();
+		this.converter = new OpenSamlRelyingPartyRegistrationsDecoder();
+		this.converter.setRegistrationIdGenerator(EntityDescriptor::getEntityID);
+		this.converter.setBuilderFactory(OpenSamlRelyingPartyRegistration.Builder::new);
 	}
 
 	@Override
@@ -89,7 +93,7 @@ public List<MediaType> getSupportedMediaTypes() {
 	@Override
 	public RelyingPartyRegistration.Builder read(Class<? extends RelyingPartyRegistration.Builder> clazz,
 			HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
-		return this.converter.convert(inputMessage.getBody()).iterator().next();
+		return this.converter.decode(inputMessage.getBody()).iterator().next();
 	}
 
 	@Override