Resolved SWAMID-470

4 files changed, 13 insertions, 85 deletions

diff --git a/scripts/remove_entity.sh b/scripts/remove_entity.sh
index 8945a430..66a38235 100755
--- a/scripts/remove_entity.sh
+++ b/scripts/remove_entity.sh
@@ -15,15 +15,26 @@ case $x in
 esac
 
 echo
+if [ `uname -s` == "Darwin" ]; then
+	MacOSX = true
+fi
 if (grep -q $1 sp-with-simplesign); then
-	sed -i "/$1/d" sp-with-simplesign
+	if ( $MacOSX ) ; then
+		sed -i "" "/$1/d" sp-with-simplesign
+	else
+		sed -i "/$1/d" sp-with-simplesign
+	fi
 fi
 grep $1 *.mxml | sed 's/.*:  <xi:include href="\(.*\)"\/>/\1/' | while read file ; do
 	git rm $file
 done
 
 grep $1 *.mxml | sed 's/\(.*\.mxml\):  <xi:include href=".*"\/>/\1/' | while read file ; do
-	sed -i "/$1/d" $file
+	if ( $MacOSX ) ; then
+		sed -i "" "/$1/d" $file
+	else
+		sed -i "/$1/d" $file
+	fi
 done
 git diff
 
diff --git a/sp-with-simplesign b/sp-with-simplesign
index dbe53f06..e004b6da 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -151,7 +151,6 @@ shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
 shib-idp-2.oru.se-idp-shibboleth.xml
 shib-idp-test.oru.se-idp-shibboleth.xml
 shib1.oru.se-shibboleth.xml
-shibboleth.antagning.se-shibboleth-idp.xml
 shibboleth.ebscohost.com.xml
 shibboleth.msacademicverify.com-shibboleth-sp.xml
 shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
diff --git a/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml
deleted file mode 100644
index 696a5158..00000000
--- a/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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://shibboleth.antagning.se/shibboleth-idp">
-  <Extensions>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns="" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </attr:EntityAttributes>
-  </Extensions>
-  <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">studera.nu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Antagning.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universityadmissions.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för sökande med konto i NyA-systemet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Identity Provider for students with account in the NyA-system.</mdui:Description>
-        <mdui:Keywords xml:lang="sv">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">antagning.se universityadmissions.se</mdui:Keywords>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIJAJnCjgPyD5z4MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYW50YWduaW5nLnNlMB4XDTE0MTIxODA4MjAzNVoXDTI0MTIxNTA4MjAzNVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+5lIFn1Td3qxstitszLSIfXPSMrjMLep5S5zwDU81hbkJoAbOWPNMovYkMiie16Rh66TUayhr7wnNneWtWUpsgQm3DeRGQnsdkFsiR4eDwvuBFUdi0b/egBviys6BHK5/YOuJYZROmN/wPgSTcVMui5IYVwgcL3xROCkbSxJxQVmr8R22IMV9KIc6DtANMufiHwlf4xXZ7AIb/j9ZFMsAzdSzPbTufNmnpr/6ww/6I5g2iuYfa9bC/88G16qJ52oSyk2LkOvE3GuL5259bh/IRLAyOWg34mg6gNFliKdgT+yo1IUN6R2MT2qGm7kW5aSNOVWHnoPlk1ccv3H0ZueXAgMBAAGjgYQwgYEwHQYDVR0OBBYEFFBZMWHu/uUxUTC2hR+Yp2QwykUSMFIGA1UdIwRLMEmAFFBZMWHu/uUxUTC2hR+Yp2QwykUSoSakJDAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmFudGFnbmluZy5zZYIJAJnCjgPyD5z4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALG4+NwZRd0ArQqLkmEg3ERawa0JlnIUpqe5pp8trHgtfOnICZvp0Mo/l5jbw/4K5VgVidto/pB55q55fg5e+Kvl2qN8QTmUX0Ys82et/0b/JMDj+W9rubMW3x83fOa1iRy9lWlY8zwkdRpaM7JQvqck6jwiI3PRr1x4x8cPt3d+QTjhzvV7HCzrb0qWK2xsKCTkF+GREdIslPYWjgTJwHSP945Kmya/cD5kJK0xExiewzbx3gAVTufdcq29Cd5xb5bqOyri9Ag4v8Ro8b28x4bS6DstiYu+F/kKwUjnvM9tR27WFtS9XFBBGBnjNfLaIEYLFZz+872cPMrpmAd5yfg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.antagning.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://shibboleth.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.antagning.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">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIJAJnCjgPyD5z4MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYW50YWduaW5nLnNlMB4XDTE0MTIxODA4MjAzNVoXDTI0MTIxNTA4MjAzNVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+5lIFn1Td3qxstitszLSIfXPSMrjMLep5S5zwDU81hbkJoAbOWPNMovYkMiie16Rh66TUayhr7wnNneWtWUpsgQm3DeRGQnsdkFsiR4eDwvuBFUdi0b/egBviys6BHK5/YOuJYZROmN/wPgSTcVMui5IYVwgcL3xROCkbSxJxQVmr8R22IMV9KIc6DtANMufiHwlf4xXZ7AIb/j9ZFMsAzdSzPbTufNmnpr/6ww/6I5g2iuYfa9bC/88G16qJ52oSyk2LkOvE3GuL5259bh/IRLAyOWg34mg6gNFliKdgT+yo1IUN6R2MT2qGm7kW5aSNOVWHnoPlk1ccv3H0ZueXAgMBAAGjgYQwgYEwHQYDVR0OBBYEFFBZMWHu/uUxUTC2hR+Yp2QwykUSMFIGA1UdIwRLMEmAFFBZMWHu/uUxUTC2hR+Yp2QwykUSoSakJDAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmFudGFnbmluZy5zZYIJAJnCjgPyD5z4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALG4+NwZRd0ArQqLkmEg3ERawa0JlnIUpqe5pp8trHgtfOnICZvp0Mo/l5jbw/4K5VgVidto/pB55q55fg5e+Kvl2qN8QTmUX0Ys82et/0b/JMDj+W9rubMW3x83fOa1iRy9lWlY8zwkdRpaM7JQvqck6jwiI3PRr1x4x8cPt3d+QTjhzvV7HCzrb0qWK2xsKCTkF+GREdIslPYWjgTJwHSP945Kmya/cD5kJK0xExiewzbx3gAVTufdcq29Cd5xb5bqOyri9Ag4v8Ro8b28x4bS6DstiYu+F/kKwUjnvM9tR27WFtS9XFBBGBnjNfLaIEYLFZz+872cPMrpmAd5yfg=                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.antagning.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">UHR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Antagning.se</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Universityadmissions.se</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Universityadmissions.se</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Universityadmissions.se</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Universityadmissions.se</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index db560215..850aced1 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -5,7 +5,6 @@
   <xi:include href="swamid-edugain-idp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
 
   <!-- Opt-out from eduGAIN IDP:s -->
-  <xi:include href="swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>