Lionshare protocol handler needs access to some protocol support internals.

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

diff --git a/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java b/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java
index 80588d8..25d6414 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java
@@ -1,16 +1,9 @@
 /*
- * Copyright [2005] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * Copyright [2005] [University Corporation for Advanced Internet Development, Inc.] Licensed under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in
+ * writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
@@ -45,8 +38,8 @@ import edu.internet2.middleware.shibboleth.common.NameMapper;
 import edu.internet2.middleware.shibboleth.common.RelyingParty;
 import edu.internet2.middleware.shibboleth.common.ServiceProviderMapper;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
-import edu.internet2.middleware.shibboleth.common.provider.ShibbolethTrust;
 import edu.internet2.middleware.shibboleth.common.Trust;
+import edu.internet2.middleware.shibboleth.common.provider.ShibbolethTrust;
 import edu.internet2.middleware.shibboleth.metadata.EntitiesDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.EntityDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.Metadata;
@@ -205,21 +198,25 @@ public class IdPProtocolSupport implements Metadata {
        }
 
        public EntityDescriptor lookup(String id) {
-               return lookup(id,true);
+
+               return lookup(id, true);
        }
 
        public EntityDescriptor lookup(Artifact artifact) {
-               return lookup(artifact,true);
+
+               return lookup(artifact, true);
        }
 
        public EntityDescriptor getRootEntity() {
+
                return null;
        }
 
        public EntitiesDescriptor getRootEntities() {
+
                return null;
        }
-       
+
        public SAMLAttribute[] getReleaseAttributes(Principal principal, RelyingParty relyingParty, String requester,
                        URL resource) throws AAException {
 
@@ -266,7 +263,7 @@ public class IdPProtocolSupport implements Metadata {
                }
        }
 
-       private SAMLAttribute[] resolveAttributes(Principal principal, String requester, String responder, URL resource,
+       public SAMLAttribute[] resolveAttributes(Principal principal, String requester, String responder, URL resource,
                        AAAttributeSet attributeSet) throws ArpProcessingException {
 
                resolver.resolveAttributes(principal, requester, responder, attributeSet);
@@ -274,6 +271,14 @@ public class IdPProtocolSupport implements Metadata {
                return attributeSet.getAttributes();
        }
 
+       public SAMLAttribute[] resolveAttributesNoPolicies(Principal principal, String requester, String responder,
+                       URL resource, AAAttributeSet attributeSet) throws ArpProcessingException {
+
+               resolver.resolveAttributes(principal, requester, responder, attributeSet);
+               arpEngine.filterAttributes(attributeSet, principal, requester, resource);
+               return attributeSet.getAttributes();
+       }
+
        /**
         * Cleanup resources that won't be released when this object is garbage-collected
         */