[java-identity-provider] branch master updated: IDP-1233 Try to differentiate between Front and Back Channel certs

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ead77406d1474e74080c191cb17f08ba715ede21

The following commit(s) were added to refs/heads/master by this push:
       new  ead7740   IDP-1233  Try to differentiate between Front and Back Channel certs
ead7740 is described below

commit ead77406d1474e74080c191cb17f08ba715ede21
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 20 14:42:31 2018 +0100

    IDP-1233  Try to differentiate between Front and Back Channel certs
    
    https://issues.shibboleth.net/jira/browse/IDP-1233
---
 .../idp/installer/ant/MetadataGeneratorTask.java       | 11 ++++++-----
 .../idp/installer/metadata/MetadataGenerator.java      | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
index b9df976..5c489f0 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
@@ -25,11 +25,6 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
-import net.shibboleth.idp.installer.metadata.MetadataGenerator;
-import net.shibboleth.idp.installer.metadata.MetadataGeneratorParameters;
-import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -38,6 +33,11 @@ import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
+import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
+import net.shibboleth.idp.installer.metadata.MetadataGenerator;
+import net.shibboleth.idp.installer.metadata.MetadataGeneratorParameters;
+import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
+
 /**
  * Task to generate metadata.
  */
@@ -226,6 +226,7 @@ public class MetadataGeneratorTask extends Task {
             final MetadataGenerator generator = new MetadataGenerator(outputFile);
             final List<List<String>> signing = new ArrayList<>(2);
             List<String> value = parameters.getBackchannelCert();
+            // IDP-1233 Note that MetadataGenerator.WriteKeyDescriptors() assumes that the order is backchannel, signing
             if (null != value) {
                 signing.add(value);
             }
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
index ba368c2..5670dbd 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
@@ -31,13 +31,6 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.idp.saml.xmlobject.ExtensionsConstants;
-import net.shibboleth.idp.saml.xmlobject.Scope;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import net.shibboleth.utilities.java.support.xml.XMLConstants;
-
 import org.opensaml.core.xml.LangBearing;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.ext.saml2mdui.Description;
@@ -60,6 +53,13 @@ import org.opensaml.xmlsec.signature.support.SignatureConstants;
 
 import com.google.common.collect.ImmutableSet;
 
+import net.shibboleth.idp.saml.xmlobject.ExtensionsConstants;
+import net.shibboleth.idp.saml.xmlobject.Scope;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
+import net.shibboleth.utilities.java.support.xml.XMLConstants;
+
 /**
  * This class gathers information which it then uses to generate IdP Metadata. Loosely based on the SP metadata
  * generator, and the V2 metadata.
@@ -644,6 +644,10 @@ public class MetadataGenerator {
      * @throws IOException if badness happens
      */
     protected void writeKeyDescriptors() throws IOException {
+        if (getSigningCerts().size() == 2) {
+            writer.write("        <!-- First signing certificate is BackChannel, the Second is FrontChannel -->");
+            writer.newLine();
+        }
         writeKeyDescriptors(getSigningCerts(), "signing");
         writeKeyDescriptors(getEncryptionCerts(), "encryption");
         writer.newLine();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.