SP provider ID argument to SAMLRequest

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

diff --git a/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java b/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java
index a501b76..12b11b9 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java
+++ b/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java
@@ -145,7 +145,7 @@ public class AttributeRequestor {
             query = 
                 new SAMLAttributeQuery(
                        subject,                 // Subject (i.e. Handle) from authentication
-                       entity.getId(),      // ID of user's Entity (i.e. IdP)
+                       appinfo.getProviderId(),  // SP Entity name
                        attributeDesignators // Attributes to request, null for everything
                        );
 

diff --git a/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java b/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
index fff3cf9..3d20bfb 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
+++ b/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
@@ -1142,6 +1142,14 @@ public class ServiceProviderConfig {
                        }
                        return false;
                }
+        
+        public String getProviderId() {
+            String entityId = this.applicationConfig.getProviderId();
+            if (entityId==null && this!=defaultApplicationInfo) {
+                entityId = defaultApplicationInfo.getProviderId();
+            }
+            return entityId;
+        }
        }