import org.opensaml.common.binding.decoding.SAMLMessageDecoder;
import org.opensaml.common.xml.SAMLConstants;
import org.opensaml.saml1.core.AttributeQuery;
+import org.opensaml.saml1.core.AttributeStatement;
import org.opensaml.saml1.core.Request;
import org.opensaml.saml1.core.Response;
import org.opensaml.saml1.core.Statement;
import org.opensaml.saml1.core.StatusCode;
+import org.opensaml.saml1.core.Subject;
import org.opensaml.saml2.metadata.AssertionConsumerService;
import org.opensaml.saml2.metadata.AttributeAuthorityDescriptor;
import org.opensaml.saml2.metadata.Endpoint;
+import org.opensaml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml2.metadata.SPSSODescriptor;
import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProviderException;
import org.opensaml.ws.message.decoder.MessageDecodingException;
-import org.opensaml.ws.security.SecurityPolicyException;
import org.opensaml.ws.transport.http.HTTPInTransport;
import org.opensaml.ws.transport.http.HTTPOutTransport;
+import org.opensaml.xml.security.SecurityException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import edu.internet2.middleware.shibboleth.common.profile.ProfileException;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
+import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.AttributeQueryConfiguration;
+import edu.internet2.middleware.shibboleth.idp.session.AuthenticationMethodInformation;
+import edu.internet2.middleware.shibboleth.idp.session.Session;
/**
* SAML 1 Attribute Query profile handler.
/** {@inheritDoc} */
public String getProfileId() {
- return "urn:mace:shibboleth:2.0:idp:profiles:saml1:query:attribute";
+ return AttributeQueryConfiguration.PROFILE_ID;
}
/** {@inheritDoc} */
public void processRequest(HTTPInTransport inTransport, HTTPOutTransport outTransport) throws ProfileException {
- AttributeQueryContext requestContext = decodeRequest(inTransport, outTransport);
-
+ AttributeQueryContext requestContext = null;
Response samlResponse;
try {
+ requestContext = decodeRequest(inTransport, outTransport);
+
if (requestContext.getProfileConfiguration() == null) {
log.error("SAML 1 Attribute Query profile is not configured for relying party "
+ requestContext.getInboundMessageIssuer());
"SAML 1 Attribute Query profile is not configured for relying party "
+ requestContext.getInboundMessageIssuer()));
samlResponse = buildErrorResponse(requestContext);
- }else{
+ } else {
resolvePrincipal(requestContext);
+
+ Session idpSession = getSessionManager().getSession(requestContext.getPrincipalName());
+ if (idpSession != null) {
+ AuthenticationMethodInformation authnInfo = idpSession.getAuthenticationMethods().get(
+ requestContext.getInboundMessageIssuer());
+ if (authnInfo != null) {
+ requestContext.setPrincipalAuthenticationMethod(authnInfo.getAuthenticationMethod());
+ }
+ }
+
resolveAttributes(requestContext);
- requestContext.setReleasedAttributes(requestContext.getPrincipalAttributes().keySet());
-
+ requestContext.setReleasedAttributes(requestContext.getAttributes().keySet());
+
ArrayList<Statement> statements = new ArrayList<Statement>();
- statements.add(buildAttributeStatement(requestContext,
- "urn:oasis:names:tc:SAML:1.0:cm:sender-vouches"));
-
+ AttributeStatement attributeStatement = buildAttributeStatement(requestContext,
+ "urn:oasis:names:tc:SAML:1.0:cm:sender-vouches");
+ if (attributeStatement != null) {
+ statements.add(attributeStatement);
+ }
+
samlResponse = buildResponse(requestContext, statements);
}
} catch (ProfileException e) {
*/
protected AttributeQueryContext decodeRequest(HTTPInTransport inTransport, HTTPOutTransport outTransport)
throws ProfileException {
- log.debug("Decoding incomming request");
-
- MetadataProvider metadataProvider = getMetadataProvider();
+ log.debug("Decoding message with decoder binding {}", getInboundBinding());
AttributeQueryContext requestContext = new AttributeQueryContext();
+ requestContext.setCommunicationProfileId(getProfileId());
+
+ MetadataProvider metadataProvider = getMetadataProvider();
requestContext.setMetadataProvider(metadataProvider);
requestContext.setInboundMessageTransport(inTransport);
requestContext.setInboundSAMLProtocol(SAMLConstants.SAML11P_NS);
+ requestContext.setSecurityPolicyResolver(getSecurityPolicyResolver());
requestContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
requestContext.setOutboundMessageTransport(outTransport);
requestContext.setMessageDecoder(decoder);
decoder.decode(requestContext);
log.debug("Decoded request");
+
+ Request request = requestContext.getInboundSAMLMessage();
+ if (request == null || !(request instanceof Request) || request.getAttributeQuery() == null) {
+ log.error("Incoming message was not an Attribute request");
+ requestContext.setFailureStatus(buildStatus(StatusCode.REQUESTER, null,
+ "Invalid SAML Attribute Request message."));
+ throw new ProfileException("Invalid SAML Attribute Request message.");
+ }
+
return requestContext;
} catch (MessageDecodingException e) {
log.error("Error decoding attribute query message", e);
requestContext.setFailureStatus(buildStatus(StatusCode.RESPONDER, null, "Error decoding message"));
throw new ProfileException("Error decoding attribute query message");
- } catch (SecurityPolicyException e) {
- log.error("Message did not meet security policy requirements", e);
+ } catch (SecurityException e) {
+ log.error("Message did not meet security requirements", e);
requestContext.setFailureStatus(buildStatus(StatusCode.RESPONDER, StatusCode.REQUEST_DENIED,
- "Message did not meet security policy requirements"));
+ "Message did not meet security requirements"));
throw new ProfileException("Message did not meet security policy requirements", e);
} finally {
// Set as much information as can be retrieved from the decoded message
- try {
- Request request = requestContext.getInboundSAMLMessage();
- AttributeQuery query = request.getAttributeQuery();
- requestContext.setSubjectNameIdentifier(query.getSubject().getNameIdentifier());
-
- String relyingPartyId = requestContext.getInboundMessageIssuer();
- RelyingPartyConfiguration rpConfig = getRelyingPartyConfiguration(relyingPartyId);
- requestContext.setRelyingPartyConfiguration(rpConfig);
- requestContext.setPeerEntityEndpoint(selectEndpoint(requestContext));
-
- String assertingPartyId = requestContext.getRelyingPartyConfiguration().getProviderId();
- requestContext.setLocalEntityId(assertingPartyId);
- requestContext.setLocalEntityMetadata(metadataProvider.getEntityDescriptor(assertingPartyId));
- requestContext.setLocalEntityRole(AttributeAuthorityDescriptor.DEFAULT_ELEMENT_NAME);
- requestContext.setLocalEntityRoleMetadata(requestContext.getLocalEntityMetadata()
- .getAttributeAuthorityDescriptor(SAMLConstants.SAML11P_NS));
-
- AttributeQueryConfiguration profileConfig = (AttributeQueryConfiguration) rpConfig
- .getProfileConfiguration(AttributeQueryConfiguration.PROFILE_ID);
- if (profileConfig != null) {
- requestContext.setProfileConfiguration(profileConfig);
- requestContext.setOutboundMessageArtifactType(profileConfig.getOutboundArtifactType());
- if (profileConfig.getSigningCredential() != null) {
- requestContext.setOutboundSAMLMessageSigningCredential(profileConfig.getSigningCredential());
- } else if (rpConfig.getDefaultSigningCredential() != null) {
- requestContext.setOutboundSAMLMessageSigningCredential(rpConfig.getDefaultSigningCredential());
- }
- }
+ populateRequestContext(requestContext);
+ }
+ }
+
+ /** {@inheritDoc} */
+ protected void populateRelyingPartyInformation(BaseSAMLProfileRequestContext requestContext)
+ throws ProfileException {
+ super.populateRelyingPartyInformation(requestContext);
+
+ EntityDescriptor relyingPartyMetadata = requestContext.getPeerEntityMetadata();
+ if (relyingPartyMetadata != null) {
+ requestContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
+ requestContext.setPeerEntityRoleMetadata(relyingPartyMetadata.getSPSSODescriptor(SAMLConstants.SAML11P_NS));
+ }
+ }
+
+ /** {@inheritDoc} */
+ protected void populateAssertingPartyInformation(BaseSAMLProfileRequestContext requestContext)
+ throws ProfileException {
+ super.populateAssertingPartyInformation(requestContext);
+
+ EntityDescriptor localEntityDescriptor = requestContext.getLocalEntityMetadata();
+ if (localEntityDescriptor != null) {
+ requestContext.setLocalEntityRole(AttributeAuthorityDescriptor.DEFAULT_ELEMENT_NAME);
+ requestContext.setLocalEntityRoleMetadata(localEntityDescriptor
+ .getAttributeAuthorityDescriptor(SAMLConstants.SAML11P_NS));
+ }
+ }
+
+ /**
+ * Populates the request context with information from the inbound SAML message.
+ *
+ * This method requires the the following request context properties to be populated: inbound saml message
+ *
+ * This methods populates the following request context properties: subject name identifier
+ *
+ * @param requestContext current request context
+ *
+ * @throws ProfileException thrown if the inbound SAML message or subject identifier is null
+ */
+ protected void populateSAMLMessageInformation(BaseSAMLProfileRequestContext requestContext) throws ProfileException {
+ Request request = (Request) requestContext.getInboundSAMLMessage();
+ if (request == null) {
+ log.error("Decoder did not contain an attribute query, an error occured decoding the message");
+ throw new ProfileException("Unable to decode message.");
+ }
- } catch (MetadataProviderException e) {
- log.error("Unable to locate metadata for asserting or relying party");
- requestContext
- .setFailureStatus(buildStatus(StatusCode.RESPONDER, null, "Error locating party metadata"));
- throw new ProfileException("Error locating party metadata");
+ AttributeQuery query = request.getAttributeQuery();
+ if (query != null) {
+ Subject subject = query.getSubject();
+ if (subject == null) {
+ log.error("Attribute query did not contain a proper subject");
+ ((AttributeQueryContext) requestContext).setFailureStatus(buildStatus(StatusCode.REQUESTER, null,
+ "Attribute query did not contain a proper subject"));
+ throw new ProfileException("Attribute query did not contain a proper subject");
}
+ requestContext.setSubjectNameIdentifier(subject.getNameIdentifier());
}
}
*
* @return Endpoint selected from the information provided in the request context
*/
- protected Endpoint selectEndpoint(AttributeQueryContext requestContext) {
+ protected Endpoint selectEndpoint(BaseSAMLProfileRequestContext requestContext) {
Endpoint endpoint;
if (getInboundBinding().equals(SAMLConstants.SAML1_SOAP11_BINDING_URI)) {
projects / java-idp.git / blobdiff