diff options
| -rwxr-xr-x | scripts/get-metadata.sh | 2 | ||||
| -rw-r--r-- | swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml (renamed from swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml) | 59 | ||||
| -rw-r--r-- | swamid-sp-2.0.mxml | 2 |
3 files changed, 45 insertions, 18 deletions
diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh index a7574458..55f33ec7 100755 --- a/scripts/get-metadata.sh +++ b/scripts/get-metadata.sh @@ -45,7 +45,7 @@ else if [ -s "${metadataurl}" ]; then metadata=`cat "$metadataurl"` else - urls="https://${metadataurl}/idp/shibboleth https://${metadataurl}/Shibboleth.sso/Metadata https://${metadataurl}/saml/index/sp-metadata https://${metadataurl}/saml/metadata https://${metadataurl}/federationmetadata/2007-06/federationmetadata.xml" + urls="https://${metadataurl}/idp/shibboleth https://${metadataurl}/Shibboleth.sso/Metadata https://${metadataurl}/saml/index/sp-metadata https://${metadataurl}/saml/metadata https://${metadataurl}/federationmetadata/2007-06/federationmetadata.xml https://metadata.swamid.se/?rawXML=${metadataurl}" for i in ${urls}; do metadata=`curl -L -s -k -f "${i}"` [ -n "${metadata}" ] && break diff --git a/swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml b/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml index 5061c3d2..8c078815 100644 --- a/swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml +++ b/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml @@ -5,10 +5,8 @@ <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"> - <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://www.swamid.se/category/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> @@ -16,9 +14,13 @@ <md:Extensions> <mdui:UIInfo> <mdui:DisplayName xml:lang="sv">Inloggning LED Jenkins</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">LED Jenkins login</mdui:DisplayName> <mdui:Description xml:lang="sv">Inloggning mot LED Jenkins</mdui:Description> <mdui:Description xml:lang="en">Login to LED Jenkins</mdui:Description> + <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL> + <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL> + <mdui:PrivacyStatementURL xml:lang="en">https://ladok3.its.umu.se/privacy-policy/index-en.html</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL> + <mdui:DisplayName xml:lang="en">LED Jenkins login</mdui:DisplayName> </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor use="signing"> @@ -82,20 +84,45 @@ aeTtz7U=</ds:X509Certificate> <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat> <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jenkins.led.ladok.se/securityRealm/finishLogin" index="0"/> + <md:AttributeConsumingService index="1"> + <md:ServiceName xml:lang="sv">Inloggning LED Jenkins</md:ServiceName> + <md:ServiceName xml:lang="en">LED Jenkins login</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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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:AttributeConsumingService> </md:SPSSODescriptor> - <md:ContactPerson contactType="administrative"> - <md:Company>ITS, Umea universitet</md:Company> - <md:SurName>Anders Sigfridsson</md:SurName> - <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress> - </md:ContactPerson> + <md:Organization> + <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName> + <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL> + <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="technical"> - <md:Company>ITS, Umea universitet</md:Company> - <md:SurName>Anders Sigfridsson</md:SurName> - <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress> + <md:Company>ITS, Umeå universitet</md:Company> + <md:SurName>Ladok-supporten</md:SurName> + <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress> + <md:TelephoneNumber>+46907866600</md:TelephoneNumber> </md:ContactPerson> <md:ContactPerson contactType="support"> - <md:Company>ITS, Umea universitet</md:Company> - <md:SurName>Anders Sigfridsson</md:SurName> - <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress> + <md:Company>ITS, Umeå universitet</md:Company> + <md:SurName>Ladok-supporten</md:SurName> + <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress> + <md:TelephoneNumber>+46907866600</md:TelephoneNumber> + </md:ContactPerson> + <md:ContactPerson contactType="administrative"> + <md:Company>ITS, Umeå universitet</md:Company> + <md:SurName>Ladok-supporten</md:SurName> + <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress> + <md:TelephoneNumber>+46907866600</md:TelephoneNumber> + </md:ContactPerson> + <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security"> + <md:Company>ITS, Umeå universitet</md:Company> + <md:SurName>Ladok-supporten</md:SurName> + <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress> + <md:TelephoneNumber>+46907866600</md:TelephoneNumber> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 2ce6c59d..fd2866b6 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -535,7 +535,7 @@ <xi:include href="swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml"/> <xi:include href="swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml"/> <xi:include href="swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml"/> - <xi:include href="swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml"/> + <xi:include href="swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml"/> <xi:include href="swamid-2.0/fidustest.skolverket.se-shibboleth.xml"/> <xi:include href="swamid-2.0/staging.ilabsolutions.com.xml"/> <xi:include href="swamid-2.0/my.ilabsolutions.com.xml"/> |