Merge branch 'master' of md-master.swamid.se:swamid-metadata

6 files changed, 126 insertions, 2 deletions

diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index 1806f030..bdae726d 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -130,4 +130,7 @@
   <xi:include href="nya-1.0/wb11.ladok.umu.se-aw-sp.xml"/>
   <xi:include href="nya-1.0/wb11.ladok.umu.se-dw-sp.xml"/>
   <xi:include href="nya-1.0/www.studera.testa.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/toylan3.umdc.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 9c49437e..db43bb40 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -10,7 +10,6 @@
   <xi:include href="swamid-1.0/beta.augustus.se.xml"/>
   <xi:include href="swamid-1.0/dspace.it.su.se.xml"/>
   <xi:include href="swamid-1.0/lists.su.se.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.sys.kth.se.xml"/>
   <xi:include href="swamid-1.0/pp-admin.it.su.se.xml"/>
   <xi:include href="swamid-1.0/pp-komm-admin.it.su.se.xml"/>
   <xi:include href="swamid-1.0/www.sub.su.se.xml"/>
diff --git a/swamid-1.0/saml-1.sys.kth.se.xml b/swamid-1.0/saml-1.sys.kth.se.xml
index 9c1a430f..190f0977 100644
--- a/swamid-1.0/saml-1.sys.kth.se.xml
+++ b/swamid-1.0/saml-1.sys.kth.se.xml
@@ -108,7 +108,7 @@ sdhdXg==
     </AttributeAuthorityDescriptor>

 <Organization>

     <OrganizationName xml:lang="en">KTH</OrganizationName>

-    <OrganizationDisplayName xml:lang="en">Royal Institute of Technology (SAML2)</OrganizationDisplayName>

+    <OrganizationDisplayName xml:lang="en">Kungliga Tekniska högskolan</OrganizationDisplayName>

     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>

   </Organization>

   <ContactPerson contactType="technical">

diff --git a/swamid-1.0/shib-1-r.referens.sys.kth.se.xml b/swamid-1.0/shib-1-r.referens.sys.kth.se.xml
new file mode 100644
index 00000000..174e6642
--- /dev/null
+++ b/swamid-1.0/shib-1-r.referens.sys.kth.se.xml
@@ -0,0 +1,118 @@
+<EntityDescriptor entityID="https://shib-1-r.referens.sys.kth.se/idp/shibboleth"
+                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">referens.sys.kth.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDXDCCAkSgAwIBAgIVAIUBv1N6gZ7vliMcsnce6/+6X2dSMA0GCSqGSIb3DQEB
+BQUAMCcxJTAjBgNVBAMTHHNoaWItMS1yLnJlZmVyZW5zLnN5cy5rdGguc2UwHhcN
+MTAwNzIyMTIxNjMxWhcNMzAwNzIyMTIxNjMxWjAnMSUwIwYDVQQDExxzaGliLTEt
+ci5yZWZlcmVucy5zeXMua3RoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAuRPJV4gqh9CkDFXkDJhDY86wGasW9RB2w9gv+cL8St/b1zxcXEfTLtKd
+Rdf4N4yGGj/0iziJrbLSmGEE3sZGPLeHlIYYGLWyT+VcCw/UQSB4iR9uXTo4/cNb
+YgpOuTl7eJCPa3u/DJ/djy4Qkk2Ok8tnYLzMfkiZZKP9faUEiYCYBOHh8fuBrENF
+OxMSqEBWF+bBpqDhVp79SE86px2gd+o1IkDC2tMzAGVmRSydC08/N/+mDrrBrag2
+wJ30FJAeDug+oFkwQ404EoEUztTsnn3gDUZ3RTNLCFaSbfIyrfXxdHl/z4tnHvYl
+PLUbQMDBn6P9cVo53hkuDVI56BQCJQIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
+LTEtci5yZWZlcmVucy5zeXMua3RoLnNlhjNodHRwczovL3NoaWItMS1yLnJlZmVy
+ZW5zLnN5cy5rdGguc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFASeR4oxM6/s
++EYDvHCII6mTaAq/MA0GCSqGSIb3DQEBBQUAA4IBAQCut7as9Yo9bdH5ZcFwNTz5
+DjQZW7hZYs3fdBf9/tdfMg4mhOuBYrEDoZfdGrsRfHJb59qRG57yOfJQTZ0M3Ld0
+OWveYfZ+VqT8C4Qr9hK9qg6UxZdkoQZVRVseM7i00AlTbckqf+t/rruFPhCURyr0
+hz6p92iEQcdJkcQ0OPcd0bA6R/DisP1b+cO82mvqHGPNVgFhW83OaIKBYTW3gV84
+QthuwttY8olJBR62w7wl3V8OOod3fi707iK1+uTBTBnmyCimq9tyhhRJL290c23c
+A7VlBNLOTweEKWEGoMAE8meALW+o3Q8ZC3GUFyi6zV3L92x6xwb0YyNnYpS/wf0U
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://shib-1-r.referens.sys.kth.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/Redirect/SSO" />
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">referens.sys.kth.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDXDCCAkSgAwIBAgIVAIUBv1N6gZ7vliMcsnce6/+6X2dSMA0GCSqGSIb3DQEB
+BQUAMCcxJTAjBgNVBAMTHHNoaWItMS1yLnJlZmVyZW5zLnN5cy5rdGguc2UwHhcN
+MTAwNzIyMTIxNjMxWhcNMzAwNzIyMTIxNjMxWjAnMSUwIwYDVQQDExxzaGliLTEt
+ci5yZWZlcmVucy5zeXMua3RoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAuRPJV4gqh9CkDFXkDJhDY86wGasW9RB2w9gv+cL8St/b1zxcXEfTLtKd
+Rdf4N4yGGj/0iziJrbLSmGEE3sZGPLeHlIYYGLWyT+VcCw/UQSB4iR9uXTo4/cNb
+YgpOuTl7eJCPa3u/DJ/djy4Qkk2Ok8tnYLzMfkiZZKP9faUEiYCYBOHh8fuBrENF
+OxMSqEBWF+bBpqDhVp79SE86px2gd+o1IkDC2tMzAGVmRSydC08/N/+mDrrBrag2
+wJ30FJAeDug+oFkwQ404EoEUztTsnn3gDUZ3RTNLCFaSbfIyrfXxdHl/z4tnHvYl
+PLUbQMDBn6P9cVo53hkuDVI56BQCJQIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
+LTEtci5yZWZlcmVucy5zeXMua3RoLnNlhjNodHRwczovL3NoaWItMS1yLnJlZmVy
+ZW5zLnN5cy5rdGguc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFASeR4oxM6/s
++EYDvHCII6mTaAq/MA0GCSqGSIb3DQEBBQUAA4IBAQCut7as9Yo9bdH5ZcFwNTz5
+DjQZW7hZYs3fdBf9/tdfMg4mhOuBYrEDoZfdGrsRfHJb59qRG57yOfJQTZ0M3Ld0
+OWveYfZ+VqT8C4Qr9hK9qg6UxZdkoQZVRVseM7i00AlTbckqf+t/rruFPhCURyr0
+hz6p92iEQcdJkcQ0OPcd0bA6R/DisP1b+cO82mvqHGPNVgFhW83OaIKBYTW3gV84
+QthuwttY8olJBR62w7wl3V8OOod3fi707iK1+uTBTBnmyCimq9tyhhRJL290c23c
+A7VlBNLOTweEKWEGoMAE8meALW+o3Q8ZC3GUFyi6zV3L92x6xwb0YyNnYpS/wf0U
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+<Organization>
+    <OrganizationName xml:lang="en">KTH-REFERENS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Kungliga Tekniska högskolan (REFERENS)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Royal Institute of Technology (KTH)</Company>
+    <EmailAddress>itesc@kth.se</EmailAddress>
+  </ContactPerson>
+
+    
+</EntityDescriptor>    
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 56b3b4a1..b8e5fc32 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -68,4 +68,5 @@
   <xi:include href="swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/shib-1-r.referens.sys.kth.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index ac4ecc5c..7a153971 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -61,4 +61,7 @@
   <xi:include href="swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/toylan3.umdc.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se.xml"/>
 </EntitiesDescriptor>