make the feeds more clear and include both transitive and non-transitive versions for SPs

6 files changed, 66 insertions, 5 deletions

diff --git a/HEADER.html b/HEADER.html
index 50223e19..099bed47 100644
--- a/HEADER.html
+++ b/HEADER.html
@@ -17,7 +17,9 @@ These are metadata feeds to be consumed by SWAMID members and relying parties:
 <dl>
 <dt><b>swamid-1.0</b></dt><dd>SWAMID version 1.0 main metadata feed.</dd>
 <dt><b>swamid-2.0</b></dt><dd>SWAMID version 2.0 main metadata feed. If you are switching over to SWAMID 2.0 you may want to keep both swamid-1.0 and swamid-2.0 loaded at the same time.</dd>
-<dt><b>swamid-idp</b></dt><dd>Aggregate of all SWAMID 1.0 and 2.0 and SWAMID interfederation identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with the full set of identity providers in the SWAMID ring of trust.</dd>
+<dt><b>swamid-idp</b></dt><dd>Aggregate of all SWAMID 1.0 and 2.0 registered identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with identity providers in the local SWAMID ring of trust.</dd>
+<dt><b>swamid-idp-transitive</b></dt><dd>Aggregate of all SWAMID 1.0 and 2.0 and SWAMID interfederation identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with the full set of identity providers in the SWAMID transitive ring of trust.</dd>
+<dt><b>swamid-discovery</b></dt><dd>All IdPs and SPs excluding all interfederation IdPs. Only for use with discovery services.</dd>
 </dl>
 
 <p>Other files in this directory are explained below:</p>
diff --git a/Makefile b/Makefile
index 9d6359d8..854fd99a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ swamid-interfederations1:
 swamid-interfederations2:
 	@scripts/aggregate.sh swamid-interfederations-2.0
 
-swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-idp publish
+swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-discovery swamid-idp swamid-idp-transitive publish
 
 publish: swamid-tou-en.txt swamid-tou-sv.txt HEADER.html README.html
 	cp swamid-tou-en.txt swamid-tou-sv.txt sunet-swamid.png HEADER.html README.html $(DEST)
@@ -63,10 +63,18 @@ swamid-no-interfederation-combined: swamid2-deps
 	@saml-md-tool swamid-no-interfederation-combined update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
 	@test -s swamid-no-interfederation-combined.xml && cp swamid-no-interfederation-combined.xml $(DEST)
 
+swamid-discovery: swamid2-deps
+	@saml-md-tool swamid-discovery update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
+	@test -s swamid-discovery.xml && cp swamid-discovery.xml $(DEST)
+
 swamid-idp: swamid2-deps
 	@saml-md-tool swamid-idp update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
 	test -s swamid-idp.xml && cp swamid-idp.xml $(DEST)
 
+swamid-idp-transitive: swamid2-deps
+	@saml-md-tool swamid-idp-transitive update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
+	test -s swamid-idp-transitive.xml && cp swamid-idp-transitive.xml $(DEST)
+
 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/README.html b/README.html
index cf9cc4f1..282303bb 100644
--- a/README.html
+++ b/README.html
@@ -22,10 +22,10 @@
 <dl>
 <dt><b>swamid-ki-sll-1.0</b></dt><dd>Production KI-SLL interfederation</dd>
 <dt><b>swamid-fiv-test</b></dt><dd>Test Federation i Väst upstream</dd>
-<dt><b>swamid-no-interfederation-combined</b></dt><dd>Aggregate of all SWAMID 1.0 and 2.0 SPs and IdPs excluding any interfederation IdPs. Only for use in SWAMID discovery services</dd>
+<dt><b>swamid-discovery</b></dt><dd>Aggregate of all SWAMID 1.0 and 2.0 SPs and IdPs excluding any interfederation IdPs. Only for use in SWAMID discovery services</dd>
 </dl>
 
 <h2>Deprecated</h2>
 
-<p><b>Do not use</b>:nya-1.0 and nya-1.0-testing</p>
+<p><b>Do not use</b>:swamid-no-interfederation-combined-1.0.xml, nya-1.0 and nya-1.0-testing</p>
 </div>
diff --git a/swamid-discovery.mxml b/swamid-discovery.mxml
new file mode 100644
index 00000000..251ab211
--- /dev/null
+++ b/swamid-discovery.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/swamid-idp-full.mxml b/swamid-idp-full.mxml
new file mode 100644
index 00000000..b8ca0501
--- /dev/null
+++ b/swamid-idp-full.mxml
@@ -0,0 +1,25 @@
+<?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-2.0.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.mxml" xpointer="xpointer(//*[@entityID])"/>
+  <xi:include href="swamid-interfederations-idp-2.0.xml" xpointer="xpointer(//*[@entityID])"/>
+</EntitiesDescriptor>
diff --git a/swamid-idp.mxml b/swamid-idp.mxml
index f82fd40d..e8a256f6 100644
--- a/swamid-idp.mxml
+++ b/swamid-idp.mxml
@@ -22,5 +22,4 @@ If You do not accept these Terms, then You must not continue to use this Metadat
 
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-idp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-interfederations-idp-2.0.xml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>