properly populate outbound message issuer ID

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

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java
index ba5de11..69fdfa1 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java
@@ -186,6 +186,7 @@ public class ArtifactResolution extends AbstractSAML1ProfileHandler {
 
             String assertingPartyId = requestContext.getRelyingPartyConfiguration().getProviderId();
             requestContext.setLocalEntityId(assertingPartyId);
+            requestContext.setOutboundMessageIssuer(assertingPartyId);
             try {
                 EntityDescriptor localEntityDescriptor = metadataProvider.getEntityDescriptor(assertingPartyId);
                 if (localEntityDescriptor != null) {
@@ -231,11 +232,11 @@ public class ArtifactResolution extends AbstractSAML1ProfileHandler {
     }
 
     /**
-     * Derferences the artifacts within the incomming request and stores them in the request context.
+     * Derferences the artifacts within the incoming request and stores them in the request context.
      * 
      * @param requestContext current request context
      * 
-     * @throws ProfileException thrown if the incomming request does not contain any {@link AssertionArtifact}s.
+     * @throws ProfileException thrown if the incoming request does not contain any {@link AssertionArtifact}s.
      */
     protected void derferenceArtifacts(ArtifactResolutionRequestContext requestContext) throws ProfileException {
         Request request = requestContext.getInboundSAMLMessage();
@@ -291,7 +292,7 @@ public class ArtifactResolution extends AbstractSAML1ProfileHandler {
         return samlResponse;
     }
 
-    /** Represents the internal state of a SAML 1 Artiface resolver request while it's being processed by the IdP. */
+    /** Represents the internal state of a SAML 1 Artifact resolver request while it's being processed by the IdP. */
     public class ArtifactResolutionRequestContext extends
             BaseSAML1ProfileRequestContext<Request, Response, ArtifactResolutionConfiguration> implements
             SAML1ArtifactMessageContext<Request, Response, NameIdentifier> {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
index 11d8e57..146fcf4 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
@@ -202,6 +202,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML1ProfileHandler {
 
             String assertingPartyId = requestContext.getRelyingPartyConfiguration().getProviderId();
             requestContext.setLocalEntityId(assertingPartyId);
+            requestContext.setOutboundMessageIssuer(assertingPartyId);
             try {
                 EntityDescriptor localEntityDescriptor = metadataProvider.getEntityDescriptor(assertingPartyId);
                 if (localEntityDescriptor != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
index 348c21e..acfc0bd 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
@@ -339,6 +339,7 @@ public class ShibbolethSSOProfileHandler extends AbstractSAML1ProfileHandler {
 
         String assertingPartyId = rpConfig.getProviderId();
         requestContext.setLocalEntityId(assertingPartyId);
+        requestContext.setOutboundMessageIssuer(assertingPartyId);
         try {
             EntityDescriptor localEntityDescriptor = metadataProvider.getEntityDescriptor(assertingPartyId);
             if (localEntityDescriptor != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
index bc948a3..3824df3 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
@@ -206,6 +206,7 @@ public class ArtifactResolution extends AbstractSAML2ProfileHandler {
 
             String assertingPartyId = requestContext.getRelyingPartyConfiguration().getProviderId();
             requestContext.setLocalEntityId(assertingPartyId);
+            requestContext.setOutboundMessageIssuer(assertingPartyId);
             try {
                 EntityDescriptor localEntityDescriptor = metadataProvider.getEntityDescriptor(assertingPartyId);
                 if (localEntityDescriptor != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
index 00fa3b3..65c93f1 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
@@ -199,6 +199,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML2ProfileHandler {
 
             String assertingPartyId = requestContext.getRelyingPartyConfiguration().getProviderId();
             requestContext.setLocalEntityId(assertingPartyId);
+            requestContext.setOutboundMessageIssuer(assertingPartyId);
             try {
                 EntityDescriptor localEntityDescriptor = metadataProvider.getEntityDescriptor(assertingPartyId);
                 if (localEntityDescriptor != null) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
index 05f1e0e..63e94e2 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
@@ -402,7 +402,7 @@ public class SSOProfileHandler extends AbstractSAML2ProfileHandler {
 
         String assertingPartyId = rpConfig.getProviderId();
         requestContext.setLocalEntityId(assertingPartyId);
-
+        requestContext.setOutboundMessageIssuer(assertingPartyId);
         try {
             EntityDescriptor localEntityDescriptor = metadataProvider.getEntityDescriptor(assertingPartyId);
             if (localEntityDescriptor != null) {