1 files changed, 125 insertions, 70 deletions
diff --git a/swamid-interfederations-2.0/idp.inpa.gov.br.xml b/swamid-interfederations-2.0/idp.inpa.gov.br.xml
index e78a803b..78ea51fa 100644
--- a/swamid-interfederations-2.0/idp.inpa.gov.br.xml
+++ b/swamid-interfederations-2.0/idp.inpa.gov.br.xml
@@ -1,72 +1,127 @@
 <?xml version="1.0"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.inpa.gov.br/idp/shibboleth">
-<Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2012-03-21T00:00:00Z">
-<mdrpi:RegistrationPolicy xml:lang="pt-br">http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</Extensions>
-<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-<Extensions>
-<shibmd:Scope regexp="false">gov.br</shibmd:Scope>
-  <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-  <mdui:DisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-  <mdui:DisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-  <mdui:Description xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-  <mdui:Description xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-  <mdui:InformationURL xml:lang="pt-br">http://www.inpa.gov.br/</mdui:InformationURL>
-  <mdui:InformationURL xml:lang="en">http://www.inpa.gov.br/</mdui:InformationURL>
-  </mdui:UIInfo>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA 5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6 bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX 7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3 oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-<NameIDFormat>
-urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-</NameIDFormat>
-<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.br/idp/profile/SAML2/Redirect/SSO"/>
-</IDPSSODescriptor>
-<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-<Extensions>
-<shibmd:Scope regexp="false">gov.br</shibmd:Scope>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA 5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6 bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX 7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3 oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-<NameIDFormat>
-urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-</NameIDFormat>
-</AttributeAuthorityDescriptor>
-<Organization>
-<OrganizationName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
-<OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
-<OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
-<OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
-<OrganizationURL xml:lang="en">http://www.inpa.gov.br/</OrganizationURL>
-<OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</OrganizationURL>
-</Organization>
-<ContactPerson contactType="technical">
-<SurName>Paulo Henrique Cardoso Maia</SurName>
-<EmailAddress>paulo.maia@inpa.gov.br</EmailAddress>
-</ContactPerson>
-</EntityDescriptor>
+    <Extensions>
+
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+                              <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </Extensions>
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <Extensions>
+        <shibmd:Scope regexp="false">gov.br</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
+          <mdui:Description xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
+          <mdui:Description xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
+          <mdui:InformationURL xml:lang="en">http://www.inpa.gov.br/</mdui:InformationURL>
+          <mdui:InformationURL xml:lang="pt-br">http://www.inpa.gov.br/</mdui:InformationURL>
+        </mdui:UIInfo>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo>
+          <ds:X509Data>
+            <ds:X509Certificate>
+    MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
+BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
+MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
+DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
+MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
+cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
+em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
+5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
+bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
+7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
+OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
+fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
+oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
+QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
+BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
+fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
+ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
+            </ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+      <Extensions>
+        <shibmd:Scope regexp="false">gov.br</shibmd:Scope>
+      </Extensions>
+
+      <KeyDescriptor>
+        <ds:KeyInfo>
+          <ds:X509Data>
+            <ds:X509Certificate>
+      
+MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
+BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
+MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
+DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
+MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
+cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
+em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
+5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
+bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
+7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
+OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
+fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
+oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
+QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
+BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
+fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
+ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
+
+                    
+            </ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+    </AttributeAuthorityDescriptor>
+
+    <Organization>
+      <OrganizationName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
+      <OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
+      <OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
+      <OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
+      <OrganizationURL xml:lang="en">http://www.inpa.gov.br/</OrganizationURL>
+      <OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</OrganizationURL>
+    </Organization>
+
+    <ContactPerson contactType="technical">
+      <SurName>Paulo Henrique Cardoso Maia</SurName>
+      <EmailAddress>paulo.maia@inpa.gov.br</EmailAddress>
+    </ContactPerson>
+
+  </EntityDescriptor>