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

2 files changed, 115 insertions, 0 deletions

diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
new file mode 100644
index 00000000..9a461ab0
--- /dev/null
+++ b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor 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" entityID="https://idp.sics.se/idp/shibboleth">
+  <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">sics.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SICS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SICS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
+        <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
+        <mdui:Logo height="95" width="328">https://www.sics.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>sics.se</mdui:DomainHint>
+        <mdui:DomainHint>tii.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.64.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.135.0/24</mdui:IPHint>
+        <mdui:IPHint>192.71.100.0/25</mdui:IPHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
+BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
+MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
+x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
+9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
+mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
+5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
+zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
+TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
+HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
+cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
+Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
+cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
+/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
+cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
+RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
+hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
+ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
+lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
+/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
+XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
+SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <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://idp.sics.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.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">sics.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
+BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
+MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
+x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
+9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
+mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
+5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
+zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
+TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
+HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
+cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
+Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
+cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
+/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
+cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
+RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
+hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
+ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
+lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
+/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
+XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
+SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.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>
+</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 4b510eb2..47d48b71 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -54,4 +54,5 @@
   <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>