Merge branch 'master' of md-master.swamid.se:swamid-metadata

11 files changed, 21 insertions, 0 deletions

diff --git a/swamid-1.0/account.liu.se-shibboleth-sp.xml b/swamid-1.0/account.liu.se-shibboleth-sp.xml
index c0c08af6..0f649aa2 100644
--- a/swamid-1.0/account.liu.se-shibboleth-sp.xml
+++ b/swamid-1.0/account.liu.se-shibboleth-sp.xml
@@ -4,6 +4,8 @@
     <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-1.0/account.mdh.se-shibboleth.xml b/swamid-1.0/account.mdh.se-shibboleth.xml
index d5233268..be1a41ba 100644
--- a/swamid-1.0/account.mdh.se-shibboleth.xml
+++ b/swamid-1.0/account.mdh.se-shibboleth.xml
@@ -5,6 +5,8 @@
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://account.mdh.se/Shibboleth.sso/DS" index="1"/>
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-1.0/accountcheckout.lnu.se.xml b/swamid-1.0/accountcheckout.lnu.se.xml
index 36b3550f..80fb7751 100644
--- a/swamid-1.0/accountcheckout.lnu.se.xml
+++ b/swamid-1.0/accountcheckout.lnu.se.xml
@@ -4,6 +4,8 @@
     <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml b/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml
index eea4de7f..90fc3138 100644
--- a/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml
+++ b/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml
@@ -5,6 +5,8 @@
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nyainloggning.slu.se/Shibboleth.sso/DS" index="1"/>
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-1.0/registrera.hb.se-shibboleth.xml b/swamid-1.0/registrera.hb.se-shibboleth.xml
index 81a5cdda..d95e079b 100644
--- a/swamid-1.0/registrera.hb.se-shibboleth.xml
+++ b/swamid-1.0/registrera.hb.se-shibboleth.xml
@@ -4,6 +4,8 @@
     <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-1.0/sp.it.gu.se-shibboleth.xml b/swamid-1.0/sp.it.gu.se-shibboleth.xml
index 54867f75..4274a15b 100644
--- a/swamid-1.0/sp.it.gu.se-shibboleth.xml
+++ b/swamid-1.0/sp.it.gu.se-shibboleth.xml
@@ -5,6 +5,8 @@
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.it.gu.se/Shibboleth.sso/DS" index="1"/>
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-1.0/www.antagning.se-aws-sp.xml b/swamid-1.0/www.antagning.se-aws-sp.xml
index db931547..27260537 100644
--- a/swamid-1.0/www.antagning.se-aws-sp.xml
+++ b/swamid-1.0/www.antagning.se-aws-sp.xml
@@ -5,6 +5,8 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.antagning.se/Shibboleth.sso/Login"/>
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml
index dd1f32ed..336a4074 100644
--- a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml
@@ -5,6 +5,8 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.universityadmissions.se/Shibboleth.sso/Login"/>
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml
index 0f4ec206..087626ac 100644
--- a/swamid-2.0/aktivera.ki.se-shibboleth.xml
+++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml
@@ -14,6 +14,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml
index 29db4337..16425ab8 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml
@@ -31,6 +31,8 @@ and do *NOT* provide it in real time to your partners.
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://selfservice.hb.se/Shibboleth.sso/Login" index="2"/>
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
diff --git a/swamid-2.0/wiki.edugain.org-shibboleth.xml b/swamid-2.0/wiki.edugain.org-shibboleth.xml
index 6a56482f..bd359e97 100644
--- a/swamid-2.0/wiki.edugain.org-shibboleth.xml
+++ b/swamid-2.0/wiki.edugain.org-shibboleth.xml
@@ -36,6 +36,7 @@ nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST"/>