Include providerId parameter in audience of unauthenticated requests.

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

diff --git a/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java b/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java
index 2e8ec6a..90d2dcf 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java
@@ -295,6 +295,11 @@ public class SAMLv1_AttributeQueryHandler extends BaseServiceHandler implements
                                if (relyingParty.getName() != null && !relyingParty.getName().equals(relyingParty.getProviderId())) {
                                        audiences.add(relyingParty.getName());
                                }
+                               //String remoteProviderId = request.getParameter("providerId");
+                               if (attributeQuery.getResource() != null && !attributeQuery.getResource().equals("") && !audiences.contains(attributeQuery.getResource())) {
+                                       audiences.add(attributeQuery.getResource());
+                               }
+                               
                                SAMLCondition condition = new SAMLAudienceRestrictionCondition(audiences);
 
                                // Put all attributes into an assertion