Fixed before sending out mail and complaing :-)

2 files changed, 25 insertions, 3 deletions

diff --git a/swamid-2.0/edusign.sunet.se-shibboleth.xml b/swamid-2.0/edusign.sunet.se-shibboleth.xml
index 02f246c1..bcaf3f48 100644
--- a/swamid-2.0/edusign.sunet.se-shibboleth.xml
+++ b/swamid-2.0/edusign.sunet.se-shibboleth.xml
@@ -22,9 +22,9 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -39,6 +39,8 @@
         <mdui:Description xml:lang="sv">SUNET eduSIGN gör det enkelt att arbeta med e-signaturer</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -120,6 +122,14 @@ q6i3w8KKR5Zi4g5QHRTk1QFroyidLA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edusign.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edusign.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edusign.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SUNET eduSIGN Service</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SUNET eduSIGN - tjänst för e-signaturer</md:ServiceName>
+      <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
@@ -141,4 +151,13 @@ q6i3w8KKR5Zi4g5QHRTk1QFroyidLA==
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 20 78 60</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SUNET</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SUNET CERT</md:GivenName>
+    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml b/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
index 78fdd13e..6e118b46 100644
--- a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
@@ -119,7 +119,6 @@ TkzG7ocEUA==
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Sunet Outscan proxy</md:ServiceName>
       <md:ServiceName xml:lang="sv">Sunet Outscan proxy</md:ServiceName>
@@ -134,6 +133,10 @@ TkzG7ocEUA==
     <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sunet NOC</md:GivenName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>