https://bugs.internet2.edu/jira/browse/SIDP-360

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

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index cb515fa..c621d8a 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -1,7 +1,7 @@
 Changes in Release 2.2.0
 =============================================
 [SIDP-362] - Only log exception message without stack trace for expired SAML messages
-
+[SIDP-360] - Session isn't being set within the attribute request context during a SAML1 attribute query
 
 Changes in Release 2.1.5
 =============================================

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
index 94cf704..9c3a991 100644 (file)
--- a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
+++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
@@ -91,6 +91,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML1ProfileHandler {
 
                 Session idpSession = getSessionManager().getSession(requestContext.getPrincipalName());
                 if (idpSession != null) {
+                    requestContext.setUserSession(idpSession);
                     AuthenticationMethodInformation authnInfo = idpSession.getAuthenticationMethods().get(
                             requestContext.getInboundMessageIssuer());
                     if (authnInfo != null) {

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
index bb825da..bf9000b 100644 (file)
--- a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
+++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
@@ -106,6 +106,7 @@ public class AttributeQueryProfileHandler extends AbstractSAML2ProfileHandler {
 
                 Session idpSession = getSessionManager().getSession(requestContext.getPrincipalName());
                 if (idpSession != null) {
+                    requestContext.setUserSession(idpSession);
                     AuthenticationMethodInformation authnInfo = idpSession.getAuthenticationMethods().get(
                             requestContext.getInboundMessageIssuer());
                     if (authnInfo != null) {