Skip to content

Commit c5853af

Browse files
andmor-andmor-
authored
Merge pull request #206 from martinhennelly/martinhennelly-patch-2
Martinhennelly patch 2
2 parents 4319b83 + 1405af9 commit c5853af

File tree

1 file changed

+86
-22
lines changed

1 file changed

+86
-22
lines changed

‎metadata/sadilar.org%2Fshibboleth.xml‎

Lines changed: 86 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -125,24 +125,88 @@ ab5T7Kvyt1YSGYAyVPdb4UJpJFwPtD5ePixiN5egQr1c6gymZ41zdFibkVM=
125125
</ds:X509Data>
126126
</ds:KeyInfo>
127127
</md:KeyDescriptor>
128-
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/POST" index="1"/>
129-
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
130-
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/ECP" index="3"/>
128+
<md:ArtifactResolutionService
129+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
130+
Location="https://repo.sadilar.org/Shibboleth.sso/Artifact/SOAP"
131+
index="1"/>
132+
<md:SingleLogoutService
133+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
134+
Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/SOAP"/>
135+
<md:SingleLogoutService
136+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
137+
Location="https://repo.sadilar.org/Shibboleth.sso/SLO/Redirect"/>
138+
<md:SingleLogoutService
139+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
140+
Location="https://repo.sadilar.org/Shibboleth.sso/SLO/POST"/>
141+
<md:SingleLogoutService
142+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
143+
Location="https://repo.sadilar.org/Shibboleth.sso/SLO/Artifact"/>
144+
<md:AssertionConsumerService
145+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
146+
Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/POST"
147+
index="1"/>
148+
<md:AssertionConsumerService
149+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
150+
Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/POST-SimpleSign"
151+
index="2"/>
152+
<md:AssertionConsumerService
153+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
154+
Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/Artifact"
155+
index="3"/>
156+
<md:AssertionConsumerService
157+
Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
158+
Location="https://repo.sadilar.org/Shibboleth.sso/SAML2/ECP"
159+
index="4"/>
131160
<md:AttributeConsumingService index="0">
132161
<!-- the ServiceName and ServiceDescription must match the mdui versions above -->
133162
<md:ServiceName xml:lang="en">SADiLaR Language Resource Repository</md:ServiceName>
134163
<md:ServiceDescription xml:lang="en">Digital repository and services of South African language resources available from SADiLaR</md:ServiceDescription>
135164
<!-- edit this list to include those attibutes you request - see https://safire.ac.za/technical/attributes/ -->
136-
<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"/>
137-
<md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
138-
<md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
165+
<md:RequestedAttribute
166+
FriendlyName="eduPersonPrincipalName"
167+
Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
168+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
169+
isRequired="true"/>
170+
<md:RequestedAttribute
171+
FriendlyName="givenName"
172+
Name="urn:oid:2.5.4.42"
173+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
174+
isRequired="true"/>
175+
<md:RequestedAttribute
176+
FriendlyName="sn"
177+
Name="urn:oid:2.5.4.4"
178+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
179+
isRequired="true"/>
139180
<!-- Added "mail" line below for Manadatory TENET RequestedAttribute -->
140-
<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"/>
141-
<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"/>
142-
<md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
143-
<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"/>
144-
<md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
145-
<md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
181+
<md:RequestedAttribute
182+
FriendlyName="mail"
183+
Name="urn:oid:0.9.2342.19200300.100.1.3"
184+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
185+
isRequired="true"/>
186+
<md:RequestedAttribute FriendlyName="displayName"
187+
Name="urn:oid:2.16.840.1.113730.3.1.241"
188+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
189+
isRequired="false"/>
190+
<md:RequestedAttribute
191+
FriendlyName="eduPersonAffiliation"
192+
Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
193+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
194+
isRequired="false"/>
195+
<md:RequestedAttribute
196+
FriendlyName="eduPersonScopedAffiliation"
197+
Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"
198+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
199+
isRequired="false"/>
200+
<md:RequestedAttribute
201+
FriendlyName="eduPersonTargetedID"
202+
Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"
203+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
204+
isRequired="false"/>
205+
<md:RequestedAttribute
206+
FriendlyName="schacHomeOrganizationType"
207+
Name="urn:oid:1.3.6.1.4.1.25178.1.2.10"
208+
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
209+
isRequired="false"/>
146210
</md:AttributeConsumingService>
147211
</md:SPSSODescriptor>
148212
<!--
@@ -157,18 +221,18 @@ ab5T7Kvyt1YSGYAyVPdb4UJpJFwPtD5ePixiN5egQr1c6gymZ41zdFibkVM=
157221
</md:Organization>
158222
<md:ContactPerson contactType="technical">
159223
<md:GivenName>Martin</md:GivenName>
160-
<md:SurName>Hennelly</md:SurName>
161-
<md:EmailAddress>mailto:martin.hennelly@nwu.ac.za</md:EmailAddress>
162-
</md:ContactPerson>
224+
<md:SurName>Hennelly</md:SurName>
225+
<md:EmailAddress>mailto:support@sadilar.org</md:EmailAddress>
226+
</md:ContactPerson>
163227
<md:ContactPerson contactType="support">
164-
<md:GivenName>Help desk</md:GivenName>
165-
<md:SurName></md:SurName>
166-
<md:EmailAddress>mailto:info@sadilar.org</md:EmailAddress><!-- role not person -->
228+
<md:GivenName>SADiLaR</md:GivenName>
229+
<md:SurName>Helpdesk</md:SurName>
230+
<md:EmailAddress>mailto:support@sadilar.org</md:EmailAddress><!-- role not person -->
167231
</md:ContactPerson>
168-
<md:ContactPerson contactType="administrative">
169-
<md:GivenName>Help desk</md:GivenName>
170-
<md:SurName></md:SurName>
232+
<md:ContactPerson contactType="administrative">
233+
<md:GivenName>SADiLaR</md:GivenName>
234+
<md:SurName>Helpdesk</md:SurName>
171235
<md:EmailAddress>mailto:info@sadilar.org</md:EmailAddress><!-- role not person -->
172-
</md:ContactPerson>
236+
</md:ContactPerson>
173237
</md:EntityDescriptor>
174238

0 commit comments

Comments
 (0)