http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 26 insertions, 32 deletions

diff --git a/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
index f9340424..003d5042 100644
--- a/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
@@ -1,46 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.georgikon.hu/idp/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>georgikon</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-test</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgikon.hu</shibmd:Scope>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>193.224.81.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:46.75190,17.2404</mdui:GeolocationHint>
       </mdui:DiscoHints>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="hu">Pannon Egyetem Georgikon Kar</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Pannonia Georgikon Faculty</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Georgikon - Pannon Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Georgikon - University of Pannonia</mdui:Description>
+        <mdui:DisplayName xml:lang="hu">Georgikon - Pannon Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Georgikon - University of Pannonia</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Pannon Egyetem Georgikon Kar</mdui:Description>
+        <mdui:Description xml:lang="en">University of Pannonia Georgikon Faculty</mdui:Description>
       </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgikon.hu</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAPFqC/HfYvfScTLOiI/sKofsx6MWMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5nZW9yZ2lrb24uaHUwHhcNMDkxMDAyMDgwMTA3
-WhcNMjkxMDAyMDgwMTA3WjAbMRkwFwYDVQQDExBpZHAuZ2Vvcmdpa29uLmh1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgR/NrpE25snvbNy6ICQJHqjt
-GmFkHIXkVeQPso1xTGO/K0uyNSGuUMWObwm5zAhxINLd+8u52noWtXPcngiFQXp8
-x1+k1PPZKrhlw7Lsmt5/WYFDkPxdZ90PCpQkpRgRQwBvmnwSdlqGmp/ts7ADTzh6
-ih++pvHI0jgyy3mMyJg/w3psv6VwNF4YuYY8rUQuPhNYVS7EMrebWlPOttqetcuX
-yTgZrx9O8W4GpsepmIJHBTlqY85W0H4zFXfUk2+t7IeUkDuxE474JPU5IszmVIfm
-5suEh1rwDnwKP+wRi5htuxdrbs1ceDrRxkbpDinoLcudn5XGq6LvokUI9HwQHQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuZ2Vvcmdpa29uLmh1hidodHRwczovL2lk
-cC5nZW9yZ2lrb24uaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZzriItWOd2
-JgNAOtHivus73YOBMA0GCSqGSIb3DQEBBQUAA4IBAQBDovq/Xvd+cFB8KbgCF0Pr
-d3WqhQx+8StGsxZLr3vVwxZYJucnpIpvKXJHj/9kQx2MwunTxlq9zvuyPbHIdnAt
-46x1tbYVRlyBaQXJQYRfaXeKRBNoO1lm1matIaXT8zaeBncF13S4vL0GcjKAR5bb
-vCVvdjjrTh9AH1p2g70k58PoW5rbGMshlgZs5Ibcp8EH6BXg3uqOJcZe1kQ6gt3i
-o6iWRRKvaNNdcnqfBFpyP1OXwX64+APWbcGYw+RDMvzoDKi6rikDz6f67v3bI4H+
-X05T9d9Ijs2cKnI3l6aT1EgTD7EKbo7UkoRIe15g8kZ1Gq+ItOJsNOG820hN1UTJ
-                                            </ds:X509Certificate>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPFqC/HfYvfScTLOiI/sKofsx6MWMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEGlkcC5nZW9yZ2lrb24uaHUwHhcNMDkxMDAyMDgwMTA3WhcNMjkxMDAyMDgwMTA3WjAbMRkwFwYDVQQDExBpZHAuZ2Vvcmdpa29uLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgR/NrpE25snvbNy6ICQJHqjtGmFkHIXkVeQPso1xTGO/K0uyNSGuUMWObwm5zAhxINLd+8u52noWtXPcngiFQXp8x1+k1PPZKrhlw7Lsmt5/WYFDkPxdZ90PCpQkpRgRQwBvmnwSdlqGmp/ts7ADTzh6ih++pvHI0jgyy3mMyJg/w3psv6VwNF4YuYY8rUQuPhNYVS7EMrebWlPOttqetcuXyTgZrx9O8W4GpsepmIJHBTlqY85W0H4zFXfUk2+t7IeUkDuxE474JPU5IszmVIfm5suEh1rwDnwKP+wRi5htuxdrbs1ceDrRxkbpDinoLcudn5XGq6LvokUI9HwQHQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAuZ2Vvcmdpa29uLmh1hidodHRwczovL2lkcC5nZW9yZ2lrb24uaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZzriItWOd2JgNAOtHivus73YOBMA0GCSqGSIb3DQEBBQUAA4IBAQBDovq/Xvd+cFB8KbgCF0Prd3WqhQx+8StGsxZLr3vVwxZYJucnpIpvKXJHj/9kQx2MwunTxlq9zvuyPbHIdnAt46x1tbYVRlyBaQXJQYRfaXeKRBNoO1lm1matIaXT8zaeBncF13S4vL0GcjKAR5bbvCVvdjjrTh9AH1p2g70k58PoW5rbGMshlgZs5Ibcp8EH6BXg3uqOJcZe1kQ6gt3io6iWRRKvaNNdcnqfBFpyP1OXwX64+APWbcGYw+RDMvzoDKi6rikDz6f67v3bI4H+X05T9d9Ijs2cKnI3l6aT1EgTD7EKbo7UkoRIe15g8kZ1Gq+ItOJsNOG820hN1UTJ</ds:X509Certificate>
         </ds:X509Data>
         <ds:KeyName>idp.georgikon.hu</ds:KeyName>
       </ds:KeyInfo>
@@ -51,12 +45,12 @@ X05T9d9Ijs2cKnI3l6aT1EgTD7EKbo7UkoRIe15g8kZ1Gq+ItOJsNOG820hN1UTJ
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="hu">Pannon Egyetem Georgikon Kar</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Pannonia Georgikon Faculty</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">Georgikon - Pannon Egyetem</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Georgikon - University of Pannonia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.georgikon.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.georgikon.hu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="hu">Georgikon Keszthely</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Pannonia Georgikon Faculty of Agriculture</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Georgikon Keszthely</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Pannonia Georgikon Faculty of Agriculture</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.georgikon.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.georgikon.hu/English/folap.aspx</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Héder Miklós</md:SurName>