SWAMID-153, Två Entity ID

3 files changed, 143 insertions, 1 deletions

diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh
index 39e401c2..913bda72 100755
--- a/scripts/get-metadata.sh
+++ b/scripts/get-metadata.sh
@@ -22,6 +22,12 @@ EOF
 	exit 1
 fi
 
+if [ `uname -s` == "Darwin" ]; then
+	SEDI='sed -i "" '
+else
+	SEDI='sed -i'
+fi
+
 script_cwd=`dirname "$0"`
 if test -d swamid-2.0 ; then
 	echo "Moving into swamid-2.0/"
@@ -69,7 +75,7 @@ case $x in
 			read x
 			case $x in
 				Y|y|"")
-					sed -i "s;^</md:EntitiesDescriptor>;  <xi:include href=\"swamid-2.0/$entityidfn\"/>\n&;" ../swamid-sp-2.0.mxml
+					$SEDI "s;^</md:EntitiesDescriptor>;  <xi:include href=\"swamid-2.0/$entityidfn\"/>\n&;" ../swamid-sp-2.0.mxml
 					echo --
 					tail -n 10 ../swamid-sp-2.0.mxml | sed 's/^/  /'
 					echo --
diff --git a/swamid-2.0/secure.ouriginal.com.xml b/swamid-2.0/secure.ouriginal.com.xml
new file mode 100644
index 00000000..2a640872
--- /dev/null
+++ b/swamid-2.0/secure.ouriginal.com.xml
@@ -0,0 +1,135 @@
+<?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="secure.ouriginal.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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>
+      <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://secure.ouriginal.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Ouriginal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ouriginal</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ouriginal is a similarity detection solution that combines text-matching with writing-style analysis to promote academic integrity and help combat plagiarism.</mdui:Description>
+        <mdui:Description xml:lang="en">Ouriginal is a similarity detection solution that combines text-matching with writing-style analysis to promote academic integrity and help combat plagiarism.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.ouriginal.com/sv/var-berattelse-2/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.ouriginal.com/our-company/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.ouriginal.com/privacy-and-personal-data-protection-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>secure.ouriginal.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
+          <ds:X509Certificate>
+            MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+            BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIxMDMyMjE0NDkzOVoXDTI0MDMy
+            MTE0NDkzOVowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
+            CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC550nQZxq1RT2zjHgVbuNSKhwO9ZV3
+            2/0vJg+X9S1K7r8DUnuuIludj8Ms0X5DZbx8z4bHlC+N3x0Xb0dNGSqieTJEuUho
+            qY6+IzQ+Hc7Sn4EDkBQ23NeLrxGbqaA3rMVoM72p4ponGUj9uNjTHQyz6kAveKUM
+            sEQPGbfvO21YR8X/RnrC54DNwHAhJT2YhqJTjJV2UlajCuc8S5e7GkGLF9nZn8re
+            0f1CsLgk2ecpN0g87yO21xS86MW/y8Etx0Suu1zzCliop2hw6UZqXvubEqS90fEm
+            lMiJsSOTjaUscLBbBxmzeEdW7dJ8kFOlW/EsP9sX3QubNFg400Dxrx8T8zW5vRQI
+            ypBRflZPh8JXiBNSOnMDvROjQ0DjXh0KlLZjuk8CnYzpmdXxwhaYY3Zo1b6Cn7Ip
+            C/BCqHuqZ3j7vGR6DgthqB+ycRcaOZPdk/1X1KVD1Sgn1c8qVmdMszP1QFPDAjzm
+            /vVHAZrD4A/+4+X7p9GGrAVfvOk1HOygMBsCAwEAAaNYMFYwNQYDVR0RBC4wLIIU
+            c2VjdXJlLm91cmlnaW5hbC5jb22GFHNlY3VyZS5vdXJpZ2luYWwuY29tMB0GA1Ud
+            DgQWBBT19RHub8VeWlx16G3IOGsK97RHuDANBgkqhkiG9w0BAQsFAAOCAYEAk8ET
+            IQyRaTUqfG7fcG4L3HhPcz1Go6C8XWqnM5Foo6sTeW8U4fJ3MLF3MeQOxRp02rUd
+            ZU7F/e3yoiYZKHMAz20naSdY6BCmYLjhO7wyUMzz7OUVUGc5HI1fpgrzAFojLfl9
+            zwJHGRzylqnQuA81sqs4MEJ4iJTCFXthVvxHvsDaf6SV60e9gNtHQjkaEvRrDX69
+            IiV481MIpwfwtmzHnBr52QwUy1j2z1jhTV2ldl5nJo94mzCKHR0fKd+vcaT989q8
+            113AdDFEaRq2x/l1vmU2D/w8+4XelzVun/SnFAJzErAazeIc2Nz41VZebMkuPFPZ
+            IACDq/DGqFrAC7kNLyJFLlWmGGx+w3Fpc+FHR+EVrGo02SMI/psoBHpWzW+fWMYj
+            GkfCrw/lhLj11MulWcRDXUHFBTtPXQndPlSAzieUMDivAa/5Fv8zwN18S0PSYYKW
+            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>secure.ouriginal.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
+          <ds:X509Certificate>
+            MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+            BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIxMDMyMjE0NDkzOVoXDTI0MDMy
+            MTE0NDkzOVowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
+            CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC550nQZxq1RT2zjHgVbuNSKhwO9ZV3
+            2/0vJg+X9S1K7r8DUnuuIludj8Ms0X5DZbx8z4bHlC+N3x0Xb0dNGSqieTJEuUho
+            qY6+IzQ+Hc7Sn4EDkBQ23NeLrxGbqaA3rMVoM72p4ponGUj9uNjTHQyz6kAveKUM
+            sEQPGbfvO21YR8X/RnrC54DNwHAhJT2YhqJTjJV2UlajCuc8S5e7GkGLF9nZn8re
+            0f1CsLgk2ecpN0g87yO21xS86MW/y8Etx0Suu1zzCliop2hw6UZqXvubEqS90fEm
+            lMiJsSOTjaUscLBbBxmzeEdW7dJ8kFOlW/EsP9sX3QubNFg400Dxrx8T8zW5vRQI
+            ypBRflZPh8JXiBNSOnMDvROjQ0DjXh0KlLZjuk8CnYzpmdXxwhaYY3Zo1b6Cn7Ip
+            C/BCqHuqZ3j7vGR6DgthqB+ycRcaOZPdk/1X1KVD1Sgn1c8qVmdMszP1QFPDAjzm
+            /vVHAZrD4A/+4+X7p9GGrAVfvOk1HOygMBsCAwEAAaNYMFYwNQYDVR0RBC4wLIIU
+            c2VjdXJlLm91cmlnaW5hbC5jb22GFHNlY3VyZS5vdXJpZ2luYWwuY29tMB0GA1Ud
+            DgQWBBT19RHub8VeWlx16G3IOGsK97RHuDANBgkqhkiG9w0BAQsFAAOCAYEAk8ET
+            IQyRaTUqfG7fcG4L3HhPcz1Go6C8XWqnM5Foo6sTeW8U4fJ3MLF3MeQOxRp02rUd
+            ZU7F/e3yoiYZKHMAz20naSdY6BCmYLjhO7wyUMzz7OUVUGc5HI1fpgrzAFojLfl9
+            zwJHGRzylqnQuA81sqs4MEJ4iJTCFXthVvxHvsDaf6SV60e9gNtHQjkaEvRrDX69
+            IiV481MIpwfwtmzHnBr52QwUy1j2z1jhTV2ldl5nJo94mzCKHR0fKd+vcaT989q8
+            113AdDFEaRq2x/l1vmU2D/w8+4XelzVun/SnFAJzErAazeIc2Nz41VZebMkuPFPZ
+            IACDq/DGqFrAC7kNLyJFLlWmGGx+w3Fpc+FHR+EVrGo02SMI/psoBHpWzW+fWMYj
+            GkfCrw/lhLj11MulWcRDXUHFBTtPXQndPlSAzieUMDivAa/5Fv8zwN18S0PSYYKW
+            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ouriginal.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ouriginal.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ouriginal</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Prio Infocenter AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Prio Infocenter AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ouriginal Group AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ouriginal Group AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.ouriginal.com/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.ouriginal.com/sv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Witasp</md:SurName>
+    <md:EmailAddress>mailto:peter.witasp@ouriginal.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Forsberg</md:SurName>
+    <md:EmailAddress>mailto:simon.forsberg@ouriginal.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johannes</md:GivenName>
+    <md:SurName>Knabe</md:SurName>
+    <md:EmailAddress>mailto:johannes.knabe@ouriginal.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 137ecb89..1e96ec6c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -687,4 +687,5 @@
   <xi:include href="swamid-2.0/get.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-sp.xml"/>
   <xi:include href="swamid-2.0/account.lnu.se-saml2.xml"/>
+  <xi:include href="swamid-2.0/secure.ouriginal.com.xml"/>
 </md:EntitiesDescriptor>