diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | swamid-2.0/kiidp.ki.se-idp-shibboleth.xml | 17 | ||||
| -rw-r--r-- | swamid-2.0/samltest.swamid.se-r_and_s-sp.xml | 2 | ||||
| -rw-r--r-- | swamid-2.0/weblogin.uu.se-idp-shibboleth.xml | 7 |
4 files changed, 25 insertions, 3 deletions
@@ -124,6 +124,8 @@ tidy: committest: test @echo "Checking for entity-categories in SPSSODescriptors" @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | xmllint --xpath /EntityDescriptor/SPSSODescriptor/Extensions/EntityAttributes - 2>/dev/null | grep -q entity-category ; then echo " $$x" ; fi ; done | grep . && exit 1 || true + @echo "Checking for entity-categories in IDPSSODescriptor" + @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | xmllint --xpath /EntityDescriptor/IDPSSODescriptor/Extensions/EntityAttributes - 2>/dev/null | grep -q entity-category ; then echo " $$x" ; fi ; done | grep . && exit 1 || true @echo "Checking for MDUI in EntityDescriptor/Extensions" @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | xmllint --xpath /EntityDescriptor/Extensions/UIInfo - 2>/dev/null | grep -q . ; then echo " $$x" ; fi ; done | grep . && exit 1 || true diff --git a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml index 715f62a5..8d817da9 100644 --- a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml +++ b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml @@ -11,6 +11,7 @@ <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DomainHint>ki.se</mdui:DomainHint> <mdui:IPHint>130.229.0.0/18</mdui:IPHint> <mdui:IPHint>130.237.96.0/19</mdui:IPHint> <mdui:IPHint>130.237.128.0/20</mdui:IPHint> @@ -20,12 +21,10 @@ <mdui:IPHint>193.10.140.0/22</mdui:IPHint> <mdui:IPHint>194.14.96.0/24</mdui:IPHint> <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint> - <!-- Karolinska Sjukhuset, SLL --> <mdui:IPHint>136.155.0.0/16</mdui:IPHint> <mdui:IPHint>159.38.0.0/16</mdui:IPHint> <mdui:IPHint>193.10.63.0/24</mdui:IPHint> <mdui:IPHint>193.10.76.0/24</mdui:IPHint> - <mdui:DomainHint>ki.se</mdui:DomainHint> <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint> <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint> </mdui:DiscoHints> @@ -106,8 +105,22 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg== <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL> </md:Organization> + <md:ContactPerson contactType="administrative"> + <md:Company>Karolinska Institutet</md:Company> + <md:SurName>Malin Westerberg</md:SurName> + <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress> + <md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber> + </md:ContactPerson> <md:ContactPerson contactType="technical"> <md:Company>Karolinska Institutet</md:Company> + <md:SurName>Eric Johansson</md:SurName> + <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress> + <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber> + </md:ContactPerson> + <md:ContactPerson contactType="support"> + <md:Company>Karolinska Institutet</md:Company> + <md:SurName>IT-support</md:SurName> <md:EmailAddress>it-support@ki.se</md:EmailAddress> + <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml index f7998bd5..45f49ea9 100644 --- a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml +++ b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml @@ -3,7 +3,7 @@ <ns0:Extensions> <ns1:EntityAttributes> <ns2:Attribute Name="http://macedir.org/entity-category"> - <ns2:AttributeValue xsi:type="xs:string">http://id.incommon.org/category/research-and-scholarship</ns2:AttributeValue> + <ns2:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> </ns2:Attribute> </ns1:EntityAttributes> </ns0:Extensions> diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml index a14d88d1..26bf09dc 100644 --- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml +++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml @@ -1,5 +1,12 @@ <?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://weblogin.uu.se/idp/shibboleth"> + <Extensions> + <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> + <samla:Attribute xmlns:samla="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"> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + </samla:Attribute> + </mdattr: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">user.uu.se</shibmd:Scope> |