sesam.uu.se added

SWAMIDOPS-7608

2 files changed, 70 insertions, 34 deletions

diff --git a/swamid-2.0/sesam.uu.se-shibboleth.xml b/swamid-2.0/sesam.uu.se-shibboleth.xml
index ed2a22d8..ff196546 100644
--- a/swamid-2.0/sesam.uu.se-shibboleth.xml
+++ b/swamid-2.0/sesam.uu.se-shibboleth.xml
@@ -1,46 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sesam.uu.se/shibboleth">
+  <md: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://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>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Uppsala University SESAM</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets SESAM</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Administrativt styrsystem för passagerättigheter</mdui:Description>
-        <mdui:Logo height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Uppsala University Sesam</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets Sesam</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Uppsala University Sesam adminstration of contactless smart card access</mdui:Description>
+        <mdui:Description xml:lang="sv">Uppsala Universitets Sesam administration av passagerättigheter</mdui:Description>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en"> https://sesam.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv"> https://sesam.uu.se</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-		      MIIE9zCCAt+gAwIBAgIJANFuvx6Bry10MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-		      BAMTEGZ1bGljYS5pdHMudXUuc2UwHhcNMTUwMTE2MTUzODU0WhcNMjUwMTEzMTUz
-		      ODU0WjAbMRkwFwYDVQQDExBmdWxpY2EuaXRzLnV1LnNlMIICIjANBgkqhkiG9w0B
-		      AQEFAAOCAg8AMIICCgKCAgEAoNLUgHY0aCIID4KZgRYqTHddaaGADL85ryWZhcZS
-		      sB03VhP0qPlTNDBr7UOzd/1nZrPNXzyh1xwa42qOiQ46idFRQEogGKVoDw42iqpe
-		      yf0erdAn9oed1aiqNqoyVN6Fcx1dmIbUD12OhqWLOpr+t1EFu6zrtU7k0y5eLsnp
-		      DdprV3GX0PfxsBwb90M6XkbcvgsONU72jwX+V6rRi/WgUrN2LPl/IDqdq/A1GdzB
-		      IZbjv4Dcm9Bl+/eVQvig/ujwiVS+F4OjLasgz1L3YrADmGmktOJPtKuqJW9pampT
-		      mJcRhugfTjR018yv300mMAkSO9wNqYBdWzKEVk7vB0mlp8baxp+et8CuD918Kke2
-		      +JN8j5sh/2lKJcuNbC/nlE2ue14L1iq1cZ2Rox1KhNJSYkicnfBG9a8HgY5i7Rzl
-		      hT1ksKrz4oiYUz8BrdDn0WfdFFbKBsyh9NOk9sPNCLDj80Cb11Eyq+uf0fwjB78/
-		      EHO51WjcdRpWdRoBwX5ORfv3UZiM/vSBc7t1VENbUlTGo0ji8I3E0c0Sm0w1YXGy
-		      6ksph5+gFvzOut3fqNSI0LeJQnwN+oRwruO3TzhqBFbrsj6JJ9zhPH2Ua8iOQ+QQ
-		      b/eSmd+a5XYEbnsjGrjhuWzgqM8POtygQ8VRTjlQmyip0Q2pIJ7WzPqk657R0yWi
-		      2eUCAwEAAaM+MDwwGwYDVR0RBBQwEoIQZnVsaWNhLml0cy51dS5zZTAdBgNVHQ4E
-		      FgQU4kfbJQwLDmcG8n+Jl1ZVwQm2UwswDQYJKoZIhvcNAQEFBQADggIBAJXkq1EB
-		      QN5q8rBFUV7V8ny7F5aw7A6iehKgubAPysf06V5i9GTHbT05wqELml+04JTLNzfd
-		      7//nXqc6ruG212Rn7MoR+005tzeogL7DEmMkWc+fmO7Nq2ISJMeFGp0dtmMSGm5b
-		      +oGlU5od/AHp7hjq3tmQOQ1Zt87iIG329jiu2aC8lzb+G9I4MX/cHTpD5lSs2Fma
-		      NYyXy/gYxuz654L+8tFPEnRCEropD9Cj69jxS6wY1maCgq8Yd7z1qZ+/jedtcM9i
-		      zpEQL2ISl90qBPZkcw6O5eXIcl9VSRyrbOJSk+Bncssvajflzl+3xVeV36icsbVv
-		      JlPY2iOGy7Tl9UveDkcW9zVYnrPY5Pv1Flk7V4/rdBNUXeeEp+ShsH83Gg0DITEz
-		      D3exx0dJgYBdvhrS2uYMjpkNcq03h0m/VyCM7HRGyq89lqmABt5PRwstqwaTNEP9
-		      qP9+nKZDd78DznCZey9DJ/iKVRZiz7367GCdpw2bywTLHcn/3zdqdgSvbT+RJ3oz
-		      BgL2RhuzJuoOgXtxUgjR9X+SV8fN9kgL32WAjzJ1OKLFuw49K/giEjgHt60a2qmw
-		      yzi8XEw+u5PDiDDgV0aLkJ4roVn+JdUv41qCxlkmcRALNsugohcVYI2LVdZYlScs
-		      rBDU1v+DFFWPDc91FirMozeUwyW1wprVD4Ss
+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
+LQJlnVOqqIVDe1xL1JWaoQgfkMA6Ag==
         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -49,9 +84,9 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesam.uu.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesam.uu.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sesam.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a7286279..60ffe2ef 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -362,4 +362,5 @@
   <xi:include href="swamid-2.0/jira-test.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.hj.se.xml"/>
   <xi:include href="swamid-2.0/www.cvt.ar.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/sesam.uu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>