SWAMID-190 entityID "https://gerrit.cs.lth.se/shibboleth" bort

4 files changed, 3 insertions, 101 deletions

diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh
index 913bda72..053a0a8e 100755
--- a/scripts/get-metadata.sh
+++ b/scripts/get-metadata.sh
@@ -23,9 +23,9 @@ EOF
 fi
 
 if [ `uname -s` == "Darwin" ]; then
-	SEDI='sed -i "" '
+	SEDI="sed -i '' "
 else
-	SEDI='sed -i'
+	SEDI="sed -i"
 fi
 
 script_cwd=`dirname "$0"`
diff --git a/sp-with-coco-errors b/sp-with-coco-errors
index 0b87c793..b805dff7 100644
--- a/sp-with-coco-errors
+++ b/sp-with-coco-errors
@@ -18,3 +18,4 @@ swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-ne
 swamid-2.0/moodle.media.nordu.net-.xml
 swamid-2.0/www.service4mobility.com-mobility_su_se.xml
 swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
+swamid-2.0/mittkau-stage.sai.kau.se-shibboleth.xml
diff --git a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml b/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
deleted file mode 100644
index d01a71c4..00000000
--- a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://gerrit.cs.lth.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gerrit.cs.lth.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gerrit.cs.lth.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Gerrit</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Gerrit</mdui:DisplayName>
-        <mdui:Description xml:lang="en">gerrit server for undergraduate education at the Dept. of Computer Science</mdui:Description>
-        <mdui:Description xml:lang="sv">gerrit-system för grundutbildningen vid datavetenskap</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>gerrit.cs.lth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gerrit.cs.lth.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-            MIID9zCCAl+gAwIBAgIJAIdYoAju0pc8MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
-            BAMTEGdlcnJpdC5jcy5sdGguc2UwHhcNMTgwNTA0MDY1ODI0WhcNMjgwNTAxMDY1
-            ODI0WjAbMRkwFwYDVQQDExBnZXJyaXQuY3MubHRoLnNlMIIBojANBgkqhkiG9w0B
-            AQEFAAOCAY8AMIIBigKCAYEAtuJTh5fqRexoqmlwz4D1YIaGT8EjzWhAA7kmrheZ
-            jdVd1IwUXr1aLo97C/eOhg9I3Ltfc7X94KSbVVhT6M7stmm3n6/fUM9WEN6uCQ4l
-            9B7a768vQWLEiNwvoO+R3i6qB4nRICGgMh7moRcbC06/aJzrBbHfHW9n+dT2b3tI
-            rfEqBMhryIUcnss+eVGFWsmzoPXg3dRFeZZcUPHm/aBWW/DptnbX3Lu3SvhZdoSd
-            GTLsYvGnare9n33xE9SASRSIJzce2fQ5hT3nYbkVZfdGC4FHb8hxRTg7hw0udP2h
-            Fx0FPniErN7QrjmChS5fkLsvx9hrnMdESgEKvluPYgeITAKof0I04o03vZmZWJWz
-            uJsBAtCY0/HpPg0aRPA0b70e4QKeDkLaCfzTS5unJM0stUFkK3J2q4vjuJG0uNhn
-            8Sdy0ZccIbyc2dsGoM10YfzeFRjhyNICcyqmMiShdSR6cDvux53wDZ0RCH1Ve95X
-            KHFG4fBdrTjkgVen3dmRUfUVAgMBAAGjPjA8MBsGA1UdEQQUMBKCEGdlcnJpdC5j
-            cy5sdGguc2UwHQYDVR0OBBYEFMrQzCVtVik+AW9kBV4ObkxOSC4UMA0GCSqGSIb3
-            DQEBCwUAA4IBgQAKvVH74teO58fKPDsF/57t0ewFDs7lWSLqN8k6oKjZRUZSpDhu
-            HCk2IENFYqSpMaVeekjE39m/85HnZ4mNBjGfar9PfcXcPZoqZcQIHQssHEbWr4CE
-            Wh5pFu/03/IHYy8GGS9y1NL/efMfHfzIUJal8r3WVfk/qBo+Nz7US2FfELbpXjc/
-            iYSz10B1pfGsEMDGrLtlL2s6FX2PoGkEB6q2ph/2mtndT6hu5MM1kitUoYohB76A
-            RnmblRyn0WllgSuL4trNkohEKB0ghgWiBUWdBqRWmi2Zd3OXX8wm+5sASJrcX2RJ
-            Rxslw68twPeMTK6K/Nhztvtr5XYQf4J+RlhYfKgEiAKPWW2llaTQCfr1CREeOUZB
-            swnAsQKSeB/WPxrOJFjm+dMvuAEc2TB8uTDcZWwCFE9FspfCYERkT/tGE8VJqpfy
-            ASAQqda7JIjMCOi6pw/kQpI5Ja8518toOJxRUC063McMiajSInBVUmCLZ9f3izvg
-            jRU0CDJuMaGpGt8=
-	  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gerrit.cs.lth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Moller</md:SurName>
-    <md:EmailAddress>mailto:peter.moller@cs.lth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 6621921d..ceef208f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -447,7 +447,6 @@
   <xi:include href="swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/test-du.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/du.hr.evry.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/gerrit.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/luplay.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml"/>
   <xi:include href="swamid-2.0/hvplay.hv.se.xml"/>