#include "ServiceProvider.h"
#include "SessionCache.h"
#include "SPRequest.h"
+#include "attribute/Attribute.h"
#include "util/TemplateParameters.h"
#include <fstream>
#include <saml/saml2/metadata/Metadata.h>
#include <saml/util/SAMLConstants.h>
#include <xmltooling/XMLToolingConfig.h>
-#include <xmltooling/util/NDC.h>\r
-#include <xmltooling/util/XMLHelper.h>\r
+#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/XMLHelper.h>
using namespace shibsp;
using namespace opensaml::saml2md;
void SHIBSP_DLLLOCAL clearHeaders(SPRequest& request) {
// Clear invariant stuff.
- request.clearHeader("Shib-Origin-Site");
request.clearHeader("Shib-Identity-Provider");
request.clearHeader("Shib-Authentication-Method");
- request.clearHeader("Shib-NameIdentifier-Format");
+ request.clearHeader("Shib-AuthnContext-Class");
+ request.clearHeader("Shib-AuthnContext-Decl");
request.clearHeader("Shib-Attributes");
request.clearHeader("Shib-Application-ID");
// Clear out the list of mapped attributes
- /* TODO: port
+ /* TODO: need some kind of master attribute list via the new resolver
Iterator<IAAP*> provs=dynamic_cast<const IApplication&>(getApplication()).getAAPProviders();
while (provs.hasNext()) {
IAAP* aap=provs.next();
*/
}
- static const XMLCh SessionInitiator[] = UNICODE_LITERAL_16(S,e,s,s,i,o,n,I,n,i,t,i,a,t,o,r);\r
+ static const XMLCh SessionInitiator[] = UNICODE_LITERAL_16(S,e,s,s,i,o,n,I,n,i,t,i,a,t,o,r);
};
void SHIBSP_API shibsp::registerServiceProviders()
pair<bool,long> ServiceProvider::doAuthentication(SPRequest& request, bool handler) const
{
-#ifdef _DEBUG\r
- xmltooling::NDC ndc("doAuthentication");\r
-#endif\r
-\r
- const Application* app=NULL;\r
- const char* procState = "Request Processing Error";\r
- string targetURL = request.getRequestURL();\r
-\r
- try {\r
- RequestMapper::Settings settings = request.getRequestSettings();\r
- app = &(request.getApplication());\r
-\r
- // If not SSL, check to see if we should block or redirect it.\r
- if (!request.isSecure()) {\r
- pair<bool,const char*> redirectToSSL = settings.first->getString("redirectToSSL");\r
- if (redirectToSSL.first) {\r
-#ifdef HAVE_STRCASECMP\r
- if (!strcasecmp("GET",request.getMethod()) || !strcasecmp("HEAD",request.getMethod())) {\r
-#else\r
- if (!stricmp("GET",request.getMethod()) || !stricmp("HEAD",request.getMethod())) {\r
-#endif\r
- // Compute the new target URL\r
- string redirectURL = string("https://") + request.getHostname();\r
- if (strcmp(redirectToSSL.second,"443")) {\r
- redirectURL = redirectURL + ':' + redirectToSSL.second;\r
- }\r
- redirectURL += request.getRequestURI();\r
- return make_pair(true, request.sendRedirect(redirectURL.c_str()));\r
- }\r
- else {\r
- TemplateParameters tp;\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "ssl", tp));\r
- }\r
- }\r
- }\r
- \r
- const char* handlerURL=request.getHandlerURL(targetURL.c_str());\r
- if (!handlerURL)\r
- throw ConfigurationException("Cannot determine handler from resource URL, check configuration.");\r
-\r
- // If the request URL contains the handler base URL for this application, either dispatch\r
- // directly (mainly Apache 2.0) or just pass back control.\r
- if (strstr(targetURL.c_str(),handlerURL)) {\r
- if (handler)\r
- return doHandler(request);\r
- else\r
- return make_pair(true, request.returnOK());\r
- }\r
-\r
- // Three settings dictate how to proceed.\r
- pair<bool,const char*> authType = settings.first->getString("authType");\r
- pair<bool,bool> requireSession = settings.first->getBool("requireSession");\r
- pair<bool,const char*> requireSessionWith = settings.first->getString("requireSessionWith");\r
-\r
- // If no session is required AND the AuthType (an Apache-derived concept) isn't shibboleth,\r
- // then we ignore this request and consider it unprotected. Apache might lie to us if\r
- // ShibBasicHijack is on, but that's up to it.\r
- if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first &&\r
-#ifdef HAVE_STRCASECMP\r
- (!authType.first || strcasecmp(authType.second,"shibboleth")))\r
-#else\r
- (!authType.first || _stricmp(authType.second,"shibboleth")))\r
-#endif\r
- return make_pair(true,request.returnDecline());\r
-\r
- // Fix for secadv 20050901\r
- clearHeaders(request);\r
-\r
- pair<string,const char*> shib_cookie = app->getCookieNameProps("_shibsession_");\r
- const char* session_id = request.getCookie(shib_cookie.first.c_str());\r
- if (!session_id || !*session_id) {\r
- // No session. Maybe that's acceptable?\r
- if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first)\r
- return make_pair(true,request.returnOK());\r
-\r
- // No cookie, but we require a session. Initiate a new session using the indicated method.\r
- procState = "Session Initiator Error";\r
- const Handler* initiator=NULL;\r
- if (requireSessionWith.first) {\r
- initiator=app->getSessionInitiatorById(requireSessionWith.second);\r
- if (!initiator)\r
- throw ConfigurationException(\r
- "No session initiator found with id ($1), check requireSessionWith command.",\r
- params(1,requireSessionWith.second)\r
- );\r
- }\r
- else {\r
- initiator=app->getDefaultSessionInitiator();\r
- if (!initiator)\r
- throw ConfigurationException("No default session initiator found, check configuration.");\r
- }\r
-\r
- return initiator->run(request,false);\r
- }\r
-\r
- procState = "Session Processing Error";\r
- const Session* session=NULL;\r
- try {\r
- session=request.getSession();\r
- // Make a localized exception throw if the session isn't valid.\r
- if (!session)\r
- throw RetryableProfileException("Session no longer valid.");\r
- }\r
- catch (exception& e) {\r
- request.log(SPRequest::SPWarn, string("session processing failed: ") + e.what());\r
-\r
- // If no session is required, bail now.\r
- if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first)\r
- // Has to be OK because DECLINED will just cause Apache\r
- // to fail when it can't locate anything to process the\r
- // AuthType. No session plus requireSession false means\r
- // do not authenticate the user at this time.\r
- return make_pair(true, request.returnOK());\r
-\r
- // Try and cast down.\r
- exception* base = &e;\r
- RetryableProfileException* trycast=dynamic_cast<RetryableProfileException*>(base);\r
- if (trycast) {\r
- // Session is invalid but we can retry -- initiate a new session.\r
- procState = "Session Initiator Error";\r
- const Handler* initiator=NULL;\r
- if (requireSessionWith.first) {\r
- initiator=app->getSessionInitiatorById(requireSessionWith.second);\r
- if (!initiator)\r
- throw ConfigurationException(\r
- "No session initiator found with id ($1), check requireSessionWith command.",\r
- params(1,requireSessionWith.second)\r
- );\r
- }\r
- else {\r
- initiator=app->getDefaultSessionInitiator();\r
- if (!initiator)\r
- throw ConfigurationException("No default session initiator found, check configuration.");\r
- }\r
- return initiator->run(request,false);\r
- }\r
- throw; // send it to the outer handler\r
- }\r
-\r
- // We're done. Everything is okay. Nothing to report. Nothing to do..\r
- // Let the caller decide how to proceed.\r
- request.log(SPRequest::SPDebug, "doAuthentication succeeded");\r
- return make_pair(false,0);\r
- }\r
- catch (XMLToolingException& e) {\r
- TemplateParameters tp;\r
- tp.m_map["errorType"] = procState;\r
- tp.m_map["errorText"] = e.what();\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "session", tp, &e));\r
- }\r
- catch (exception& e) {\r
- TemplateParameters tp;\r
- tp.m_map["errorType"] = procState;\r
- tp.m_map["errorText"] = e.what();\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "session", tp));\r
- }\r
-#ifndef _DEBUG\r
- catch (...) {\r
- TemplateParameters tp;\r
- tp.m_map["errorType"] = procState;\r
- tp.m_map["errorText"] = "Caught an unknown exception.";\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "session", tp));\r
- }\r
-#endif\r
+#ifdef _DEBUG
+ xmltooling::NDC ndc("doAuthentication");
+#endif
+
+ const Application* app=NULL;
+ const char* procState = "Request Processing Error";
+ string targetURL = request.getRequestURL();
+
+ try {
+ RequestMapper::Settings settings = request.getRequestSettings();
+ app = &(request.getApplication());
+
+ // If not SSL, check to see if we should block or redirect it.
+ if (!request.isSecure()) {
+ pair<bool,const char*> redirectToSSL = settings.first->getString("redirectToSSL");
+ if (redirectToSSL.first) {
+#ifdef HAVE_STRCASECMP
+ if (!strcasecmp("GET",request.getMethod()) || !strcasecmp("HEAD",request.getMethod())) {
+#else
+ if (!stricmp("GET",request.getMethod()) || !stricmp("HEAD",request.getMethod())) {
+#endif
+ // Compute the new target URL
+ string redirectURL = string("https://") + request.getHostname();
+ if (strcmp(redirectToSSL.second,"443")) {
+ redirectURL = redirectURL + ':' + redirectToSSL.second;
+ }
+ redirectURL += request.getRequestURI();
+ return make_pair(true, request.sendRedirect(redirectURL.c_str()));
+ }
+ else {
+ TemplateParameters tp;
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "ssl", tp));
+ }
+ }
+ }
+
+ const char* handlerURL=request.getHandlerURL(targetURL.c_str());
+ if (!handlerURL)
+ throw ConfigurationException("Cannot determine handler from resource URL, check configuration.");
+
+ // If the request URL contains the handler base URL for this application, either dispatch
+ // directly (mainly Apache 2.0) or just pass back control.
+ if (strstr(targetURL.c_str(),handlerURL)) {
+ if (handler)
+ return doHandler(request);
+ else
+ return make_pair(true, request.returnOK());
+ }
+
+ // Three settings dictate how to proceed.
+ pair<bool,const char*> authType = settings.first->getString("authType");
+ pair<bool,bool> requireSession = settings.first->getBool("requireSession");
+ pair<bool,const char*> requireSessionWith = settings.first->getString("requireSessionWith");
+
+ // If no session is required AND the AuthType (an Apache-derived concept) isn't shibboleth,
+ // then we ignore this request and consider it unprotected. Apache might lie to us if
+ // ShibBasicHijack is on, but that's up to it.
+ if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first &&
+#ifdef HAVE_STRCASECMP
+ (!authType.first || strcasecmp(authType.second,"shibboleth")))
+#else
+ (!authType.first || _stricmp(authType.second,"shibboleth")))
+#endif
+ return make_pair(true,request.returnDecline());
+
+ // Fix for secadv 20050901
+ clearHeaders(request);
+
+ procState = "Session Processing Error";
+
+ Session* session = NULL;
+ try {
+ session = request.getSession();
+ }
+ catch (exception& e) {
+ request.log(SPRequest::SPWarn, string("error during session lookup: ") + e.what());
+ // If it's not a retryable session failure, we throw to the outer handler for reporting.
+ if (dynamic_cast<RetryableProfileException*>(&e)==NULL)
+ throw;
+ }
+
+ if (!session) {
+ // No session. Maybe that's acceptable?
+ if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first)
+ return make_pair(true,request.returnOK());
+
+ // No session, but we require one. Initiate a new session using the indicated method.
+ procState = "Session Initiator Error";
+ const Handler* initiator=NULL;
+ if (requireSessionWith.first) {
+ initiator=app->getSessionInitiatorById(requireSessionWith.second);
+ if (!initiator)
+ throw ConfigurationException(
+ "No session initiator found with id ($1), check requireSessionWith command.",
+ params(1,requireSessionWith.second)
+ );
+ }
+ else {
+ initiator=app->getDefaultSessionInitiator();
+ if (!initiator)
+ throw ConfigurationException("No default session initiator found, check configuration.");
+ }
+
+ return initiator->run(request,false);
+ }
+
+ // We're done. Everything is okay. Nothing to report. Nothing to do..
+ // Let the caller decide how to proceed.
+ request.log(SPRequest::SPDebug, "doAuthentication succeeded");
+ return make_pair(false,0);
+ }
+ catch (XMLToolingException& e) {
+ TemplateParameters tp;
+ tp.m_map["errorType"] = procState;
+ tp.m_map["errorText"] = e.what();
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "session", tp, &e));
+ }
+ catch (exception& e) {
+ TemplateParameters tp;
+ tp.m_map["errorType"] = procState;
+ tp.m_map["errorText"] = e.what();
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "session", tp));
+ }
+#ifndef _DEBUG
+ catch (...) {
+ TemplateParameters tp;
+ tp.m_map["errorType"] = procState;
+ tp.m_map["errorText"] = "Caught an unknown exception.";
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "session", tp));
+ }
+#endif
}
pair<bool,long> ServiceProvider::doAuthorization(SPRequest& request) const
{
-#ifdef _DEBUG\r
- xmltooling::NDC ndc("doAuthorization");\r
-#endif\r
-\r
- const Application* app=NULL;\r
- const char* procState = "Authorization Processing Error";\r
- string targetURL = request.getRequestURL();\r
-\r
- try {\r
- RequestMapper::Settings settings = request.getRequestSettings();\r
- app = &(request.getApplication());\r
-\r
- // Three settings dictate how to proceed.\r
- pair<bool,const char*> authType = settings.first->getString("authType");\r
- pair<bool,bool> requireSession = settings.first->getBool("requireSession");\r
- pair<bool,const char*> requireSessionWith = settings.first->getString("requireSessionWith");\r
-\r
- // If no session is required AND the AuthType (an Apache-derived concept) isn't shibboleth,\r
- // then we ignore this request and consider it unprotected. Apache might lie to us if\r
- // ShibBasicHijack is on, but that's up to it.\r
- if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first &&\r
-#ifdef HAVE_STRCASECMP\r
- (!authType.first || strcasecmp(authType.second,"shibboleth")))\r
-#else\r
- (!authType.first || _stricmp(authType.second,"shibboleth")))\r
-#endif\r
- return make_pair(true,request.returnDecline());\r
-\r
- // Do we have an access control plugin?\r
- if (settings.second) {\r
- const Session* session =NULL;\r
- pair<string,const char*> shib_cookie=app->getCookieNameProps("_shibsession_");\r
- const char *session_id = request.getCookie(shib_cookie.first.c_str());\r
- try {\r
- if (session_id && *session_id) {\r
- session = request.getSession();\r
- }\r
- }\r
- catch (exception&) {\r
- request.log(SPRequest::SPWarn, "unable to obtain session information to pass to access control provider");\r
- }\r
- \r
- Locker acllock(settings.second);\r
- if (settings.second->authorized(request,session)) {\r
- // Let the caller decide how to proceed.\r
- request.log(SPRequest::SPDebug, "access control provider granted access");\r
- return make_pair(false,0);\r
- }\r
- else {\r
- request.log(SPRequest::SPWarn, "access control provider denied access");\r
- TemplateParameters tp;\r
- tp.m_map["requestURL"] = targetURL;\r
- return make_pair(true,sendError(request, app, "access", tp));\r
- }\r
- return make_pair(false,0);\r
- }\r
- else\r
- return make_pair(true,request.returnDecline());\r
- }\r
+#ifdef _DEBUG
+ xmltooling::NDC ndc("doAuthorization");
+#endif
+
+ const Application* app=NULL;
+ const char* procState = "Authorization Processing Error";
+ string targetURL = request.getRequestURL();
+
+ try {
+ RequestMapper::Settings settings = request.getRequestSettings();
+ app = &(request.getApplication());
+
+ // Three settings dictate how to proceed.
+ pair<bool,const char*> authType = settings.first->getString("authType");
+ pair<bool,bool> requireSession = settings.first->getBool("requireSession");
+ pair<bool,const char*> requireSessionWith = settings.first->getString("requireSessionWith");
+
+ // If no session is required AND the AuthType (an Apache-derived concept) isn't shibboleth,
+ // then we ignore this request and consider it unprotected. Apache might lie to us if
+ // ShibBasicHijack is on, but that's up to it.
+ if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first &&
+#ifdef HAVE_STRCASECMP
+ (!authType.first || strcasecmp(authType.second,"shibboleth")))
+#else
+ (!authType.first || _stricmp(authType.second,"shibboleth")))
+#endif
+ return make_pair(true,request.returnDecline());
+
+ // Do we have an access control plugin?
+ if (settings.second) {
+ const Session* session = NULL;
+ try {
+ session = request.getSession();
+ }
+ catch (exception& e) {
+ request.log(SPRequest::SPWarn, string("unable to obtain session to pass to access control provider: ") + e.what());
+ }
+
+ Locker acllock(settings.second);
+ if (settings.second->authorized(request,session)) {
+ // Let the caller decide how to proceed.
+ request.log(SPRequest::SPDebug, "access control provider granted access");
+ return make_pair(false,0);
+ }
+ else {
+ request.log(SPRequest::SPWarn, "access control provider denied access");
+ TemplateParameters tp;
+ tp.m_map["requestURL"] = targetURL;
+ return make_pair(true,sendError(request, app, "access", tp));
+ }
+ return make_pair(false,0);
+ }
+ else
+ return make_pair(true,request.returnDecline());
+ }
catch (XMLToolingException& e) {
TemplateParameters tp;
tp.m_map["errorType"] = procState;
tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
return make_pair(true,sendError(request, app, "session", tp, &e));
}
- catch (exception& e) {\r
- TemplateParameters tp;\r
- tp.m_map["errorType"] = procState;\r
- tp.m_map["errorText"] = e.what();\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "access", tp));\r
- }\r
-#ifndef _DEBUG\r
- catch (...) {\r
- TemplateParameters tp;\r
- tp.m_map["errorType"] = procState;\r
- tp.m_map["errorText"] = "Caught an unknown exception.";\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "access", tp));\r
- }\r
-#endif\r
+ catch (exception& e) {
+ TemplateParameters tp;
+ tp.m_map["errorType"] = procState;
+ tp.m_map["errorText"] = e.what();
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "access", tp));
+ }
+#ifndef _DEBUG
+ catch (...) {
+ TemplateParameters tp;
+ tp.m_map["errorType"] = procState;
+ tp.m_map["errorText"] = "Caught an unknown exception.";
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "access", tp));
+ }
+#endif
}
pair<bool,long> ServiceProvider::doExport(SPRequest& request, bool requireSession) const
{
-#ifdef _DEBUG\r
- xmltooling::NDC ndc("doExport");\r
-#endif\r
-\r
- const Application* app=NULL;\r
- const char* procState = "Attribute Processing Error";\r
- string targetURL = request.getRequestURL();\r
-\r
- try {\r
+#ifdef _DEBUG
+ xmltooling::NDC ndc("doExport");
+#endif
+
+ const Application* app=NULL;
+ const char* procState = "Attribute Processing Error";
+ string targetURL = request.getRequestURL();
+
+ try {
RequestMapper::Settings settings = request.getRequestSettings();
app = &(request.getApplication());
-\r
- const Session* session=NULL;\r
- pair<string,const char*> shib_cookie=app->getCookieNameProps("_shibsession_");\r
- const char *session_id = request.getCookie(shib_cookie.first.c_str());\r
- try {\r
- if (session_id && *session_id) {\r
- session = request.getSession();\r
- }\r
- }\r
- catch (exception&) {\r
- request.log(SPRequest::SPWarn, "unable to obtain session information to export into request headers");\r
- // If we have to have a session, then this is a fatal error.\r
- if (requireSession)\r
- throw;\r
- }\r
-\r
- // Still no data?\r
- if (!session) {\r
- if (requireSession)\r
- throw RetryableProfileException("Unable to obtain session information for request.");\r
- else\r
- return make_pair(false,0); // just bail silently\r
- }\r
- \r
- /*\r
- TODO: port to new cache API\r
- // Extract data from session.\r
- pair<const char*,const SAMLSubject*> sub=m_cacheEntry->getSubject(false,true);\r
- pair<const char*,const SAMLResponse*> unfiltered=m_cacheEntry->getTokens(true,false);\r
- pair<const char*,const SAMLResponse*> filtered=m_cacheEntry->getTokens(false,true);\r
-\r
- // Maybe export the tokens.\r
- pair<bool,bool> exp=m_settings.first->getBool("exportAssertion");\r
- if (exp.first && exp.second && unfiltered.first && *unfiltered.first) {\r
- unsigned int outlen;\r
- XMLByte* serialized =\r
- Base64::encode(reinterpret_cast<XMLByte*>((char*)unfiltered.first), XMLString::stringLen(unfiltered.first), &outlen);\r
- XMLByte *pos, *pos2;\r
- for (pos=serialized, pos2=serialized; *pos2; pos2++)\r
- if (isgraph(*pos2))\r
- *pos++=*pos2;\r
- *pos=0;\r
- setHeader("Shib-Attributes", reinterpret_cast<char*>(serialized));\r
- XMLString::release(&serialized);\r
- }\r
-\r
- // Export the SAML AuthnMethod and the origin site name, and possibly the NameIdentifier.\r
- setHeader("Shib-Origin-Site", m_cacheEntry->getProviderId());\r
- setHeader("Shib-Identity-Provider", m_cacheEntry->getProviderId());\r
- setHeader("Shib-Authentication-Method", m_cacheEntry->getAuthnContext());\r
- \r
- // Get the AAP providers, which contain the attribute policy info.\r
- Iterator<IAAP*> provs=m_app->getAAPProviders();\r
-\r
- // Export NameID?\r
- while (provs.hasNext()) {\r
- IAAP* aap=provs.next();\r
- xmltooling::Locker locker(aap);\r
- const XMLCh* format = sub.second->getNameIdentifier()->getFormat();\r
- const IAttributeRule* rule=aap->lookup(format ? format : SAMLNameIdentifier::UNSPECIFIED);\r
- if (rule && rule->getHeader()) {\r
- auto_ptr_char form(format ? format : SAMLNameIdentifier::UNSPECIFIED);\r
- auto_ptr_char nameid(sub.second->getNameIdentifier()->getName());\r
- setHeader("Shib-NameIdentifier-Format", form.get());\r
- if (!strcmp(rule->getHeader(),"REMOTE_USER"))\r
- setRemoteUser(nameid.get());\r
- else\r
- setHeader(rule->getHeader(), nameid.get());\r
- }\r
- }\r
- \r
- setHeader("Shib-Application-ID", m_app->getId());\r
- \r
- // Export the attributes.\r
- Iterator<SAMLAssertion*> a_iter(filtered.second ? filtered.second->getAssertions() : EMPTY(SAMLAssertion*));\r
- while (a_iter.hasNext()) {\r
- SAMLAssertion* assert=a_iter.next();\r
- Iterator<SAMLStatement*> statements=assert->getStatements();\r
- while (statements.hasNext()) {\r
- SAMLAttributeStatement* astate=dynamic_cast<SAMLAttributeStatement*>(statements.next());\r
- if (!astate)\r
- continue;\r
- Iterator<SAMLAttribute*> attrs=astate->getAttributes();\r
- while (attrs.hasNext()) {\r
- SAMLAttribute* attr=attrs.next();\r
- \r
- // Are we supposed to export it?\r
- provs.reset();\r
- while (provs.hasNext()) {\r
- IAAP* aap=provs.next();\r
- xmltooling::Locker locker(aap);\r
- const IAttributeRule* rule=aap->lookup(attr->getName(),attr->getNamespace());\r
- if (!rule || !rule->getHeader())\r
- continue;\r
- \r
- Iterator<string> vals=attr->getSingleByteValues();\r
- if (!strcmp(rule->getHeader(),"REMOTE_USER") && vals.hasNext())\r
- setRemoteUser(vals.next().c_str());\r
- else {\r
- int it=0;\r
- string header = getSecureHeader(rule->getHeader());\r
- if (!header.empty())\r
- it++;\r
- for (; vals.hasNext(); it++) {\r
- string value = vals.next();\r
- for (string::size_type pos = value.find_first_of(";", string::size_type(0));\r
- pos != string::npos;\r
- pos = value.find_first_of(";", pos)) {\r
- value.insert(pos, "\\");\r
- pos += 2;\r
- }\r
- if (it)\r
- header += ";";\r
- header += value;\r
- }\r
- setHeader(rule->getHeader(), header.c_str());\r
- }\r
- }\r
- }\r
- }\r
- }\r
- */\r
- \r
- return make_pair(false,0);\r
- }\r
- catch (XMLToolingException& e) {\r
+
+ const Session* session = NULL;
+ try {
+ session = request.getSession();
+ }
+ catch (exception& e) {
+ request.log(SPRequest::SPWarn, string("unable to obtain session to export to request: ") + e.what());
+ // If we have to have a session, then this is a fatal error.
+ if (requireSession)
+ throw;
+ }
+
+ // Still no data?
+ if (!session) {
+ if (requireSession)
+ throw RetryableProfileException("Unable to obtain session to export to request.");
+ else
+ return make_pair(false,0); // just bail silently
+ }
+
+ request.setHeader("Shib-Application-ID", app->getId());
+
+ // Export the IdP name and Authn method/context info.
+ const char* hval = session->getEntityID();
+ if (hval)
+ request.setHeader("Shib-Identity-Provider", hval);
+ hval = session->getAuthnContextClassRef();
+ if (hval) {
+ request.setHeader("Shib-Authentication-Method", hval);
+ request.setHeader("Shib-AuthnContext-Class", hval);
+ }
+ hval = session->getAuthnContextDeclRef();
+ if (hval)
+ request.setHeader("Shib-AuthnContext-Decl", hval);
+
+ // Maybe export the assertion keys.
+ pair<bool,bool> exp=settings.first->getBool("exportAssertion");
+ if (exp.first && exp.second) {
+ //setHeader("Shib-Attributes", reinterpret_cast<char*>(serialized));
+ // TODO: export lookup URLs to access assertions by ID
+ const vector<const char*>& tokens = session->getAssertionIDs();
+ }
+
+ // Export the attributes.
+ const map<string,const Attribute*>& attributes = session->getAttributes();
+ for (map<string,const Attribute*>::const_iterator a = attributes.begin(); a!=attributes.end(); ++a) {
+ const vector<string>& vals = a->second->getSerializedValues();
+ if (!strcmp(a->second->getId(), "REMOTE_USER") && !vals.empty())
+ request.setRemoteUser(vals.front().c_str());
+ else {
+ string header(request.getSecureHeader(a->second->getId()));
+ for (vector<string>::const_iterator v = vals.begin(); v!=vals.end(); ++v) {
+ if (!header.empty())
+ header += ";";
+ string::size_type pos = v->find_first_of(';',string::size_type(0));
+ if (pos!=string::npos) {
+ string value(*v);
+ for (; pos != string::npos; pos = value.find_first_of(';',pos)) {
+ value.insert(pos, "\\");
+ pos += 2;
+ }
+ header += value;
+ }
+ else {
+ header += (*v);
+ }
+ }
+ request.setHeader(a->second->getId(), header.c_str());
+ }
+ }
+
+ return make_pair(false,0);
+ }
+ catch (XMLToolingException& e) {
TemplateParameters tp;
- tp.m_map["errorType"] = procState;\r
- tp.m_map["errorText"] = e.what();\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "rm", tp, &e));\r
- }\r
+ tp.m_map["errorType"] = procState;
+ tp.m_map["errorText"] = e.what();
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "rm", tp, &e));
+ }
catch (exception& e) {
TemplateParameters tp;
tp.m_map["errorType"] = procState;
tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
return make_pair(true,sendError(request, app, "rm", tp));
}
-#ifndef _DEBUG\r
- catch (...) {\r
+#ifndef _DEBUG
+ catch (...) {
TemplateParameters tp;
- tp.m_map["errorType"] = procState;\r
- tp.m_map["errorText"] = "Caught an unknown exception.";\r
- tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));\r
- return make_pair(true,sendError(request, app, "rm", tp));\r
- }\r
-#endif\r
+ tp.m_map["errorType"] = procState;
+ tp.m_map["errorText"] = "Caught an unknown exception.";
+ tp.m_map["requestURL"] = targetURL.substr(0,targetURL.find('?'));
+ return make_pair(true,sendError(request, app, "rm", tp));
+ }
+#endif
}
pair<bool,long> ServiceProvider::doHandler(SPRequest& request) const
pair<bool,bool> handlerSSL=sessionProps->getBool("handlerSSL");
// Make sure this is SSL, if it should be
- if ((!handlerSSL.first || handlerSSL.second) && strcmp(request.getScheme(),"https"))
+ if ((!handlerSSL.first || handlerSSL.second) && !request.isSecure())
throw FatalProfileException("Blocked non-SSL access to Shibboleth handler.");
// We dispatch based on our path info. We know the request URL begins with or equals the handler URL,
projects / shibboleth / sp.git / commitdiff