Renamed Domain extension to Scope, fixed AA role bug

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1270 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/IQ-sites.xml b/src/conf/IQ-sites.xml
index 501626b..4dfda17 100644 (file)
--- a/src/conf/IQ-sites.xml
+++ b/src/conf/IQ-sites.xml
@@ -16,7 +16,7 @@
        <EntityDescriptor entityID="urn:mace:inqueue:example.edu">
                <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
                        <Extensions>
-                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Domain>
+                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
                        </Extensions>
                        <KeyDescriptor use="signing">
                            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -29,7 +29,7 @@
                </IDPSSODescriptor>
                <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
                        <Extensions>
-                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Domain>
+                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
                        </Extensions>
                        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
                            Location="https://wayf.internet2.edu/shibboleth-1.2/AA"/>

diff --git a/src/edu/internet2/middleware/shibboleth/metadata/AttributeAuthorityDescriptor.java b/src/edu/internet2/middleware/shibboleth/metadata/AttributeAuthorityDescriptor.java
index 1e72876..9213a2d 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/metadata/AttributeAuthorityDescriptor.java
+++ b/src/edu/internet2/middleware/shibboleth/metadata/AttributeAuthorityDescriptor.java
@@ -33,7 +33,7 @@ import java.util.Iterator;
  * 
  * @author Scott Cantor
  */
-public interface AttributeAuthorityDescriptor extends SSODescriptor {
+public interface AttributeAuthorityDescriptor extends RoleDescriptor {
 
     public EndpointManager getAttributeServiceManager();
     

diff --git a/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java b/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
index 068c90f..145c20b 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
+++ b/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
@@ -655,7 +655,7 @@ public class XMLMetadataProvider implements Metadata {
                     if (ext1 != null && ext1.hasChildNodes())
                         sourceId=ext1.getFirstChild().getNodeValue();
                     // Save off any domain elements for later.
-                    domains = ext.getElementsByTagNameNS(edu.internet2.middleware.shibboleth.common.XML.SHIBMETA_NS,"Domain");
+                    domains = ext.getElementsByTagNameNS(edu.internet2.middleware.shibboleth.common.XML.SHIBMETA_NS,"Scope");
                 }
                 
                 int i;
@@ -765,7 +765,7 @@ public class XMLMetadataProvider implements Metadata {
         }
     }
 
-    class AARole extends SSORole implements AttributeAuthorityDescriptor, ScopedRoleDescriptor {
+    class AARole extends Role implements AttributeAuthorityDescriptor, ScopedRoleDescriptor {
         private ArrayList /* <Scope> */ scopes = new ArrayList();
         private XMLEndpointManager query = new XMLEndpointManager();
         private XMLEndpointManager idreq = new XMLEndpointManager();
@@ -784,7 +784,7 @@ public class XMLMetadataProvider implements Metadata {
                 Element ext=XML.getFirstChildElement(e,edu.internet2.middleware.shibboleth.common.XML.SAML2META_NS,"Extensions");
                 if (ext != null) {
                     // Save off any domain elements for later.
-                    domains = ext.getElementsByTagNameNS(edu.internet2.middleware.shibboleth.common.XML.SHIBMETA_NS,"Domain");
+                    domains = ext.getElementsByTagNameNS(edu.internet2.middleware.shibboleth.common.XML.SHIBMETA_NS,"Scope");
                 }
                 
                 int i;
@@ -828,6 +828,7 @@ public class XMLMetadataProvider implements Metadata {
                 protocolEnum.add(XML.SAML11_PROTOCOL_ENUM);
                 formats.add(Constants.SHIB_NAMEID_FORMAT_URI);
                 attrprofs.add(Constants.SHIB_ATTRIBUTE_NAMESPACE_URI);
+                domains = e.getElementsByTagNameNS(edu.internet2.middleware.shibboleth.common.XML.SHIB_NS,"Domain");
                 int i;
                 NodeList nlist=e.getElementsByTagNameNS(edu.internet2.middleware.shibboleth.common.XML.SHIB_NS,"AttributeAuthority");
                 for (i=0; i<nlist.getLength(); i++) {
@@ -885,6 +886,10 @@ public class XMLMetadataProvider implements Metadata {
         public Iterator getAttributes() {
             return attrs.iterator();
         }
+
+        public Iterator getNameIDFormats() {
+            return formats.iterator();
+        }
     }
     
     class SPRole extends SSORole implements SPSSODescriptor {

diff --git a/src/schemas/shibboleth-metadata-1.0.xsd b/src/schemas/shibboleth-metadata-1.0.xsd
index 824a00e..a520ca4 100644 (file)
--- a/src/schemas/shibboleth-metadata-1.0.xsd
+++ b/src/schemas/shibboleth-metadata-1.0.xsd
@@ -5,7 +5,7 @@
        attributeFormDefault="unqualified"
        version="1.0">
 
-       <element name="Domain">
+       <element name="Scope">
                <annotation>
                        <documentation>
                        SAML metadata extension used to regulate allowable attribute scopes.