private:
pair<bool,long> processMessage(const Application& application, HTTPRequest& httpRequest, HTTPResponse& httpResponse) const;
#ifndef SHIBSP_LITE
- pair<bool,long> samlError(
- const Application& app,
- const ArtifactResolve& request,
- HTTPResponse& httpResponse,
- const EntityDescriptor* recipient,
- const XMLCh* code,
- const XMLCh* subcode=NULL,
- const char* msg=NULL
+ pair<bool,long> emptyResponse(
+ const Application& app, const ArtifactResolve& request, HTTPResponse& httpResponse, const EntityDescriptor* recipient
) const;
MessageEncoder* m_encoder;
try {
auto_ptr_char artifact(req->getArtifact() ? req->getArtifact()->getArtifact() : NULL);
if (!artifact.get() || !*artifact.get())
- return samlError(application, *req, httpResponse, entity, StatusCode::REQUESTER, NULL, "Request did not contain an artifact to resolve.");
+ return emptyResponse(application, *req, httpResponse, entity);
auto_ptr_char issuer(policy.getIssuer() ? policy.getIssuer()->getName() : NULL);
m_log.info("resolving artifact (%s) for (%s)", artifact.get(), issuer.get() ? issuer.get() : "unknown");
if (!policy.isAuthenticated()) {
m_log.error("request for artifact was unauthenticated, purging the artifact mapping");
- return samlError(application, *req, httpResponse, entity, StatusCode::REQUESTER, StatusCode::AUTHN_FAILED, "Unable to authenticate request.");
+ return emptyResponse(application, *req, httpResponse, entity);
}
m_log.debug("artifact resolved, preparing response");
return make_pair(true,ret);
}
catch (exception& ex) {
- // Trap localized errors in a SAML Response.
- m_log.error("error processing artifact request, returning SAML error: %s", ex.what());
- return samlError(application, *req, httpResponse, entity, StatusCode::RESPONDER, NULL, ex.what());
+ // Trap localized errors.
+ m_log.error("error processing artifact request: %s", ex.what());
+ return emptyResponse(application, *req, httpResponse, entity);
}
#else
return make_pair(false,0L);
}
#ifndef SHIBSP_LITE
-pair<bool,long> SAML2ArtifactResolution::samlError(
- const Application& app,
- const ArtifactResolve& request,
- HTTPResponse& httpResponse,
- const EntityDescriptor* recipient,
- const XMLCh* code,
- const XMLCh* subcode,
- const char* msg
+pair<bool,long> SAML2ArtifactResolution::emptyResponse(
+ const Application& app, const ArtifactResolve& request, HTTPResponse& httpResponse, const EntityDescriptor* recipient
) const
{
auto_ptr<ArtifactResponse> resp(ArtifactResponseBuilder::buildArtifactResponse());
resp->setInResponseTo(request.getID());
Issuer* me = IssuerBuilder::buildIssuer();
me->setName(app.getRelyingParty(recipient)->getXMLString("entityID").second);
- fillStatus(*resp.get(), code, subcode, msg);
+ fillStatus(*resp.get(), StatusCode::SUCCESS);
long ret = m_encoder->encode(httpResponse, resp.get(), NULL);
resp.release(); // freed by encoder
return make_pair(true,ret);