a combined feed for discovery services

5 files changed, 65 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index e63c383f..1190dc47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-swamid-backport-1.0.xml
+swamid-sp-1.0.xml
+swamid-idp-1.0.xml
 swamid-externals-sp-2.0.xml
diff --git a/Makefile b/Makefile
index 4b192359..8ed79df1 100644
--- a/Makefile
+++ b/Makefile
@@ -32,24 +32,30 @@ swamid-interfederations1:
 swamid-interfederations2:
 	@scripts/aggregate.sh swamid-interfederations-2.0
 
-swamid: swamid1 swamid2
+swamid: swamid1 swamid2 swamid-no-interfederation-combined
 
 swamid1:
 	@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST)
 
-swamid2-deps: swamid-backport-1.0.xml swamid-externals-sp-2.0.xml
+swamid2-deps: swamid-sp-1.0.xml swamid-idp-1.0.xml swamid-externals-sp-2.0.xml
 
 swamid2: swamid2-deps
 	@saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
 	@test -s swamid-2.0.xml && cp swamid-2.0.xml $(DEST)
 
-swamid-backport-1.0.xml:
-	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-1.0.mxml > swamid-backport-1.0.xml
+swamid-sp-1.0.xml:
+	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-1.0.mxml > swamid-sp-1.0.xml
+
+swamid-idp-1.0.xml:
+	@xsltproc --xinclude xslt/extract-idp.xslt swamid-1.0.mxml > swamid-idp-1.0.xml
 
 swamid-externals-sp-2.0.xml: swamid-externals-2.0.mxml
 	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-externals-2.0.mxml > swamid-externals-sp-2.0.xml
 
+swamid-no-interfederation-combined: swamid2-deps
+	@saml-md-tool swamid-no-interfederation-combined update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
+
 nya:
 	@saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s nya-1.0.xml && cp nya-1.0.xml $(DEST)
diff --git a/swamid-2.0.mxml b/swamid-2.0.mxml
index c2216a85..4fc4ce94 100644
--- a/swamid-2.0.mxml
+++ b/swamid-2.0.mxml
@@ -24,5 +24,5 @@ If You do not accept these Terms, then You must not continue to use this Metadat
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-externals-sp-2.0.xml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-interfederations-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-backport-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
+  <xi:include href="swamid-sp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-no-interfederation-combined.mxml b/swamid-no-interfederation-combined.mxml
new file mode 100644
index 00000000..251ab211
--- /dev/null
+++ b/swamid-no-interfederation-combined.mxml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
+                    xmlns:xi="http://www.w3.org/2001/XInclude" 
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+                    Name="http://md.swamid.se/md/swamid-no-interfederation-combined.xml">
+
+  <!--
+
+       IMPORTANT NOTICE: READ CAREFULLY
+
+You are reading this because You wish to use the technical information (the “Metadata”) 
+published on behalf of the Registrars. These Terms of Access and Use (these “Terms”) govern 
+the use of the Metadata. By accessing or using the Metadata You accept that the access and 
+use will be on and subject to these Terms. These Terms will be binding and enforceable on 
+You as contractual obligations.
+
+The Terms is available at http://md.swamid.se/md/terms-of-use.txt
+
+If You do not accept these Terms, then You must not continue to use this Metadata.
+
+    -->
+
+  <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
+  <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
+  <xi:include href="swamid-idp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
+  <xi:include href="swamid-sp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
+</EntitiesDescriptor>
diff --git a/xslt/extract-idp.xslt b/xslt/extract-idp.xslt
new file mode 100644
index 00000000..32824386
--- /dev/null
+++ b/xslt/extract-idp.xslt
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+                xmlns:exsl="http://exslt.org/common"
+                extension-element-prefixes="exsl"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
+                xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
+
+  <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+
+  <xsl:template match="/md:EntitiesDescriptor">
+  <md:EntitiesDescriptor>
+    <xsl:apply-templates select="md:EntityDescriptor[md:IDPSSODescriptor]"/>
+  </md:EntitiesDescriptor>
+  </xsl:template>
+
+  <xsl:template match="md:EntityDescriptor">
+     <xi:include><xsl:attribute name="href"><xsl:value-of select="@xml:base"/></xsl:attribute></xi:include>
+  </xsl:template>
+
+</xsl:stylesheet>