summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--swamid-2.0/idp.oru.se-idp-shibboleth.xml192
-rw-r--r--swamid-testing-idp-1.0.mxml1
3 files changed, 195 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 06bbe66c..ae7fd86e 100644
--- a/Makefile
+++ b/Makefile
@@ -175,8 +175,6 @@ testMDUI:
@echo "Checking for bad lang codes"
@# Lang = ISO_639-1
@for x in swamid-2.0/*.xml ; do bad_langs=`cat $$x | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u | grep -vxE 'cs|da|de|en|fi|fr|it|sv|no|nn|nb|is'` ; if [ -n "$$bad_langs" ] ; then echo " $$x: `echo $$bad_langs`" | sed 's/.*/&/' ; fi ; done | grep . && exit 1 || exit 0
- @echo "Check for mismatch between MDUI DisplayName and OrganizationDisplayName"
- @for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do for lang in `cat $$x | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do mdui_displayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` organizationdisplayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ; if [ -n "$$mdui_displayname" -a -n "$$organizationdisplayname" -a "$$mdui_displayname" != "$$organizationdisplayname" ] ; then echo "$$x: $$lang '$$mdui_displayname' vs $$lang '$$organizationdisplayname'" | sed 's/.*/&/'; fi ; done ; done | grep . && exit 1 || true
@echo "Checking for uniq IdP MDUI DisplayName"
@for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^; $$x $$lang ;" | sed 's/.*/&/' ; done | sort -k 3 | uniq -d -f 2 ; done | grep . && exit 1 || true
@echo "Checking for invalid IPHint"
@@ -279,7 +277,8 @@ test2: $(SWAMIDXML) schematest testMDUI testOrgData testEntCat testSimpleSign te
@if ( grep -q IDPSSODescriptor $< ) ; then \
echo "Do IdP checks" ; \
for lang in `cat $< | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do \
- mdui_displayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` organizationdisplayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ; if [ -n "$$mdui_displayname" -a -n "$$organizationdisplayname" -a "$$mdui_displayname" != "$$organizationdisplayname" ] ; then echo "Missmatch for lang = $$lang\nDisplayName = '$$mdui_displayname' but OrganizationDisplayName = '$$organizationdisplayname'" | sed 's/.*/&/'; fi | grep . && exit 1 || true ;\
+ mdui_displayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'`;\
+ organizationdisplayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ;\
for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor | egrep -v $<` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | egrep "^$$mdui_displayname$$" | sed "s;^;Duplicate DisplayName in $$x for lang = $$lang\n;" | sed 's/.*/&/' ; done | grep . && exit 1 || true;\
done \
fi
diff --git a/swamid-2.0/idp.oru.se-idp-shibboleth.xml b/swamid-2.0/idp.oru.se-idp-shibboleth.xml
new file mode 100644
index 00000000..4932e502
--- /dev/null
+++ b/swamid-2.0/idp.oru.se-idp-shibboleth.xml
@@ -0,0 +1,192 @@
+<?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://idp.oru.se/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" errorURL="https://idp.oru.se/identity/feedback.htm" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">idp.oru.se</shibmd:Scope>
+ <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Örebro universitet - TEST</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Örebro University - TEST</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
+ <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://www.oru.se</mdui:PrivacyStatementURL>
+ <mdui:Logo height="65" width="90">https://shib-idp-2.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>oru.se</mdui:DomainHint>
+ <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDajCCAlICCQDPtp194yuCkDANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
+RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
+IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
+Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
+CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
+CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
+hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD5X28gK3MZqbILw3CpDNtvQXXNLL+Yu4/RBTEGJPe52agsbFtOmTNTAX36
+E5mbJkl8dJA7JZEDbb+n5pqNX29S3ByBoxh5KYyU8bGqqdBS+gnktEMp2Ov5YTlV
+AJ3Oh+fbeC7XoZGfiRQAcQsevuJmYX1ciQnY+Z7Zw6nJX30gpPbQnCQ8WvxGpX0g
+p1fKph/5C8tUCiQQHW7sTPOWQoHSt+NEUYiyTIZUVnMfzpFmeVoFAdCo6xCaR17+
+tc46TCygoUqSWX3i6qtYmHojMk3AnIIszveJMc2EnT/m5cUa05T0nPDE2COefXt9
+5axrvykxYDWE76wid9tZsOrFdspFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABp9
+YIbANYrIRwg9a5gR5r8Mfkf3VwUCxo0wGp0X6VnJCvpwNcL+fRNf3AmQEE+6+vTk
+7t9LqlCNzSfRbk9VqZK5CSp0mUDRr0tIWZxxU8bYvGT8Mn60r+Ng93SzOCOJx6k2
+vjDDESiNR5pKJ7WisTVLVa7Ve2YIRcc7IPZPZGQRM26XlnBjOMJ4MZMNxwSlj+2b
+Ipb5f9y5AjrkI3FpHE0gHNl0gzFa6Hd2Cfn+rw+GGrWrcz5KscFu5Z6nhxN2KKlS
+Km7JSP1DHVWSbdtYwRFn1Lw2daDfLxUD9eWQpydycMRvNTaqwGOR90sJbzRvN0tb
+lG3tGJ938zt7FPeuL04=
+
+
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDajCCAlICCQDs5xxKpaMg9TANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
+RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
+IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
+Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
+CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
+CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
+hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDjMaVhR0rA07ogCcVXpPgZGGjD8TGacWfuNhYq+Mxqfj0VRKCFBapZSjjP
+M8bXnPLm6gNSXINiPUFDMUOqfSa45obO8pZTSWPDJVoPpL1JsshH6aSDw+JRsnA6
+gYtzSL9JXFTJ031SykvSamVkdliSaDbl4GzpHcV6QWG3jn8jJcH/U+ZAMPsRh/hK
+A/l6uTjk+ITmaZQNfDYWSG+/iPWaH9kD+Eu86+2i2OHN+H4vaqjsKOfWRwYFoC1v
+xIBW1s44LcRvMl7i557p0OQHXZSrUGCtFvU/9h+f8O9vUBNJ8SGG0HwcTa86Mmf/
+IAX1thD55Msl5y00jEtKWEFohLJRAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADVk
++DjCPdlGLGxvsoFd/v4Fjyqi+UM/XjopIY92uGfdIikDG0NgO1YKYtOUOnKQudmc
+tB8wrv+ircsgE0Ply4KpSAfEG5jmyIgBNimB177OAxDEldKOpimvBDEjijwVkgHR
+HvlLXkmQ658aCQ3CVbuVlckhhRU43Iv94glUf5htD+vokfadIX/Bdw7A4j3IKnhK
+IjNOUsJnKVdUIBGSipUxDzHiwz9kPJw0FxxxUpfR7NOhOChNvjSnPaErm6v9H/hl
+N53PYLrgu7fMgINxTgPwdv1unfU1kYZUJtFt1I/wYulHEDIU8FPq3G2fdCMexpr+
+qzdjBhUfdsHeXtWHnx4=
+
+
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oru.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oru.se/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oru.se/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oru.se/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>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:2.0:profiles:AuthnRequest" Location="https://idp.oru.se/idp/profile/SAML2/Unsolicited/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oru.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oru.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">idp.oru.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDajCCAlICCQDPtp194yuCkDANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
+RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
+IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
+Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
+CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
+CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
+hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD5X28gK3MZqbILw3CpDNtvQXXNLL+Yu4/RBTEGJPe52agsbFtOmTNTAX36
+E5mbJkl8dJA7JZEDbb+n5pqNX29S3ByBoxh5KYyU8bGqqdBS+gnktEMp2Ov5YTlV
+AJ3Oh+fbeC7XoZGfiRQAcQsevuJmYX1ciQnY+Z7Zw6nJX30gpPbQnCQ8WvxGpX0g
+p1fKph/5C8tUCiQQHW7sTPOWQoHSt+NEUYiyTIZUVnMfzpFmeVoFAdCo6xCaR17+
+tc46TCygoUqSWX3i6qtYmHojMk3AnIIszveJMc2EnT/m5cUa05T0nPDE2COefXt9
+5axrvykxYDWE76wid9tZsOrFdspFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABp9
+YIbANYrIRwg9a5gR5r8Mfkf3VwUCxo0wGp0X6VnJCvpwNcL+fRNf3AmQEE+6+vTk
+7t9LqlCNzSfRbk9VqZK5CSp0mUDRr0tIWZxxU8bYvGT8Mn60r+Ng93SzOCOJx6k2
+vjDDESiNR5pKJ7WisTVLVa7Ve2YIRcc7IPZPZGQRM26XlnBjOMJ4MZMNxwSlj+2b
+Ipb5f9y5AjrkI3FpHE0gHNl0gzFa6Hd2Cfn+rw+GGrWrcz5KscFu5Z6nhxN2KKlS
+Km7JSP1DHVWSbdtYwRFn1Lw2daDfLxUD9eWQpydycMRvNTaqwGOR90sJbzRvN0tb
+lG3tGJ938zt7FPeuL04=
+
+
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDajCCAlICCQDs5xxKpaMg9TANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
+RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
+IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
+Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
+CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
+CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
+hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDjMaVhR0rA07ogCcVXpPgZGGjD8TGacWfuNhYq+Mxqfj0VRKCFBapZSjjP
+M8bXnPLm6gNSXINiPUFDMUOqfSa45obO8pZTSWPDJVoPpL1JsshH6aSDw+JRsnA6
+gYtzSL9JXFTJ031SykvSamVkdliSaDbl4GzpHcV6QWG3jn8jJcH/U+ZAMPsRh/hK
+A/l6uTjk+ITmaZQNfDYWSG+/iPWaH9kD+Eu86+2i2OHN+H4vaqjsKOfWRwYFoC1v
+xIBW1s44LcRvMl7i557p0OQHXZSrUGCtFvU/9h+f8O9vUBNJ8SGG0HwcTa86Mmf/
+IAX1thD55Msl5y00jEtKWEFohLJRAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADVk
++DjCPdlGLGxvsoFd/v4Fjyqi+UM/XjopIY92uGfdIikDG0NgO1YKYtOUOnKQudmc
+tB8wrv+ircsgE0Ply4KpSAfEG5jmyIgBNimB177OAxDEldKOpimvBDEjijwVkgHR
+HvlLXkmQ658aCQ3CVbuVlckhhRU43Iv94glUf5htD+vokfadIX/Bdw7A4j3IKnhK
+IjNOUsJnKVdUIBGSipUxDzHiwz9kPJw0FxxxUpfR7NOhOChNvjSnPaErm6v9H/hl
+N53PYLrgu7fMgINxTgPwdv1unfU1kYZUJtFt1I/wYulHEDIU8FPq3G2fdCMexpr+
+qzdjBhUfdsHeXtWHnx4=
+
+
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oru.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oru.se/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>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">Orebro University</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Orebro University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://idp.oru.se</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ <Company>Örebro University</Company>
+ <SurName>IT Avdelningen</SurName>
+ <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
+ <TelephoneNumber>+46 19 303166</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Örebro universitet</Company>
+ <SurName>IT-support</SurName>
+ <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <Company>Örebro University</Company>
+ <SurName>IT Avdelningen Örebro universitet</SurName>
+ <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
+ <TelephoneNumber>+46 19 303166</TelephoneNumber>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 4948a636..57bdc42f 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -62,4 +62,5 @@
<xi:include href="swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.test.sunet.se-idp.xml"/>
<xi:include href="swamid-2.0/swamidtest.vr.se-idp-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/idp.oru.se-idp-shibboleth.xml"/>
</EntitiesDescriptor>