diff options
| author | Paul Scott <paul.scott@kau.se> | 2017-10-11 14:09:23 +0200 |
|---|---|---|
| committer | Paul Scott <paul.scott@kau.se> | 2017-10-11 14:09:23 +0200 |
| commit | a1725a72bfbe77ccaa4f212d91a5f97f6ae1747a (patch) | |
| tree | 2ba715b5f5bff2a16570468386e0ef405c843fb5 | |
| parent | e1acb67fe4dbdae686a4903afbfd0ec55508ad40 (diff) | |
Refix scalable-learning SPs to prevent UKFed blocking
| -rw-r--r-- | swamid-2.0/scalear-staging2.herokuapp.com.xml | 9 | ||||
| -rw-r--r-- | swamid-2.0/test.scalable-learning.com.xml | 15 | ||||
| -rw-r--r-- | swamid-2.0/www.scalable-learning.com.xml | 13 |
3 files changed, 19 insertions, 18 deletions
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml index 446bf6ba..ca227eaa 100644 --- a/swamid-2.0/scalear-staging2.herokuapp.com.xml +++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml @@ -48,7 +48,8 @@ </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> + <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat> + <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-staging2.herokuapp.com/saml/consume"/> <md:AttributeConsumingService index="0"> <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName> @@ -65,14 +66,14 @@ <md:Organization> <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName> <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">scalear-staging2.herokuapp.com</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">https://scalear-staging2.herokuapp.com</md:OrganizationURL> </md:Organization> <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical"> <Company>ScalableLearning</Company> - <EmailAddress>support@scalable-learning.com</EmailAddress> + <EmailAddress>mailto:support@scalable-learning.com</EmailAddress> </md:ContactPerson> <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative"> <Company>ScalableLearning</Company> - <EmailAddress>support@scalable-learning.com</EmailAddress> + <EmailAddress>mailto:support@scalable-learning.com</EmailAddress> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml index db561c6f..04562a54 100644 --- a/swamid-2.0/test.scalable-learning.com.xml +++ b/swamid-2.0/test.scalable-learning.com.xml @@ -47,14 +47,13 @@ </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:NameIDFormat> - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - </md:NameIDFormat> + <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat> + <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://test.scalable-learning.com/saml/consume"/> <md:AttributeConsumingService index="0"> <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName> - <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education. </md:ServiceDescription> - <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription> + <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription> + <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription> <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/> <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/> <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/> @@ -66,14 +65,14 @@ <md:Organization> <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName> <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">test.scalable-learning.com</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">https://test.scalable-learning.com</md:OrganizationURL> </md:Organization> <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical"> <Company>ScalableLearning</Company> - <EmailAddress>support@scalable-learning.com</EmailAddress> + <EmailAddress>mailto:support@scalable-learning.com</EmailAddress> </md:ContactPerson> <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative"> <Company>ScalableLearning</Company> - <EmailAddress>support@scalable-learning.com</EmailAddress> + <EmailAddress>mailto:support@scalable-learning.com</EmailAddress> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml index 46fa4778..649c8f59 100644 --- a/swamid-2.0/www.scalable-learning.com.xml +++ b/swamid-2.0/www.scalable-learning.com.xml @@ -47,12 +47,13 @@ </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> + <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat> + <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/> <md:AttributeConsumingService index="0"> <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName> - <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education. </md:ServiceDescription> - <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription> + <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription> + <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription> <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/> <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/> <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/> @@ -64,14 +65,14 @@ <md:Organization> <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName> <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL> </md:Organization> <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical"> <Company>ScalableLearning</Company> - <EmailAddress>support@scalable-learning.com</EmailAddress> + <EmailAddress>mailto:support@scalable-learning.com</EmailAddress> </md:ContactPerson> <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative"> <Company>ScalableLearning</Company> - <EmailAddress>support@scalable-learning.com</EmailAddress> + <EmailAddress>mailto:support@scalable-learning.com</EmailAddress> </md:ContactPerson> </md:EntityDescriptor> |