Adding API for generating SAML SP metadata

Resolves elastic#49018

Author: BigPandaToo

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlSpMetadataAction.java

@@ -9,7 +9,7 @@
 import org.elasticsearch.action.ActionType;
 
 public class SamlSpMetadataAction extends ActionType<SamlSpMetadataResponse> {
-    public static final String NAME = "cluster:admin/xpack/security/saml/metadata";
+    public static final String NAME = "cluster:monitor/xpack/security/saml/metadata";
     public static final SamlSpMetadataAction INSTANCE = new SamlSpMetadataAction();
 
     private SamlSpMetadataAction() {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlSpMetadataRequest.java

@@ -18,14 +18,15 @@
 
 public class SamlSpMetadataRequest extends ActionRequest {
 
-    String realmName;
+    private String realmName;
 
     public SamlSpMetadataRequest(StreamInput in) throws IOException {
         super(in);
         realmName = in.readOptionalString();
     }
 
-    public SamlSpMetadataRequest() {
+    public SamlSpMetadataRequest(String realmName) {
+        this.realmName = realmName;
     }
 
     @Override

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/saml/SamlSpMetadataRequestTests.java

@@ -17,15 +17,14 @@
 
 public class SamlSpMetadataRequestTests extends ESTestCase {
 
-    public void testValidateFailsWhenRealmNotSet() {
-        final SamlSpMetadataRequest samlSPMetadataRequest = new SamlSpMetadataRequest();
+    public void testValidateFailsWhenRealmEmpty() {
+        final SamlSpMetadataRequest samlSPMetadataRequest = new SamlSpMetadataRequest("");
         final ActionRequestValidationException validationException = samlSPMetadataRequest.validate();
         assertThat(validationException.getMessage(), containsString("Realm name may not be empty"));
     }
 
     public void testValidateSerialization()  throws IOException {
-        final SamlSpMetadataRequest samlSPMetadataRequest = new SamlSpMetadataRequest();
-        samlSPMetadataRequest.setRealmName("saml1");
+        final SamlSpMetadataRequest samlSPMetadataRequest = new SamlSpMetadataRequest("saml1");
         try (BytesStreamOutput out = new BytesStreamOutput()) {
             samlSPMetadataRequest.writeTo(out);
             try (StreamInput in = out.bytes().streamInput()) {
@@ -36,8 +35,7 @@ public void testValidateSerialization()  throws IOException {
     }
 
     public void testValidateToString() {
-        final SamlSpMetadataRequest samlSPMetadataRequest = new SamlSpMetadataRequest();
-        samlSPMetadataRequest.setRealmName("saml1");
+        final SamlSpMetadataRequest samlSPMetadataRequest = new SamlSpMetadataRequest("saml1");
         assertThat(samlSPMetadataRequest.toString(), containsString("{realmName=saml1}"));
     }
 }

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlSpMetadataAction.java

@@ -17,8 +17,8 @@
 import org.elasticsearch.xpack.core.security.action.saml.SamlSpMetadataRequest;
 import org.elasticsearch.xpack.core.security.action.saml.SamlSpMetadataResponse;
 import org.elasticsearch.xpack.security.authc.Realms;
-import org.elasticsearch.xpack.security.authc.saml.SamlEntityDescriptorBuilder;
 import org.elasticsearch.xpack.security.authc.saml.SamlRealm;
+import org.elasticsearch.xpack.security.authc.saml.SamlSpMetadataBuilder;
 import org.elasticsearch.xpack.security.authc.saml.SamlUtils;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml.saml2.metadata.impl.EntityDescriptorMarshaller;
@@ -63,8 +63,8 @@ protected void doExecute(Task task, SamlSpMetadataRequest request,
     private void prepareMetadata(SamlRealm realm, ActionListener<SamlSpMetadataResponse> listener) {
         try {
             final EntityDescriptorMarshaller marshaller = new EntityDescriptorMarshaller();
-            final SamlEntityDescriptorBuilder samlEntityDescriptorBuilder = new SamlEntityDescriptorBuilder(realm);
-            final EntityDescriptor descriptor = samlEntityDescriptorBuilder.getEntityDescriptor();
+            final SamlSpMetadataBuilder builder = new SamlSpMetadataBuilder(realm);
+            final EntityDescriptor descriptor = builder.build();
             final Element element = marshaller.marshall(descriptor);
             final StringWriter writer = new StringWriter();
             final Transformer serializer = SamlUtils.getHardenedXMLTransformer();