#include <vector>
#include <fstream>
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/util/PathResolver.h>
#include <xmltooling/util/URLEncoder.h>
using namespace samlconstants;
using namespace xmltooling;
using namespace xercesc;
+using namespace boost;
using namespace std;
namespace shibsp {
-
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory SAML1ConsumerFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory SAML2ConsumerFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory SAML2ArtifactResolutionFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory SAML2LogoutFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory SAML2NameIDMgmtFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory AssertionLookupFactory;
+ SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory AttributeCheckerFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory DiscoveryFeedFactory;
+ SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory ExternalAuthFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory MetadataGeneratorFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory StatusHandlerFactory;
SHIBSP_DLLLOCAL PluginManager< Handler,string,pair<const DOMElement*,const char*> >::Factory SessionHandlerFactory;
- void SHIBSP_DLLLOCAL absolutize(const HTTPRequest& request, string& url) {
- if (url.empty())
- url = '/';
- if (url[0] == '/') {
- // Compute a URL to the root of the site.
- int port = request.getPort();
- const char* scheme = request.getScheme();
- string root = string(scheme) + "://" + request.getHostname();
- if ((!strcmp(scheme,"http") && port!=80) || (!strcmp(scheme,"https") && port!=443)) {
- ostringstream portstr;
- portstr << port;
- root += ":" + portstr.str();
- }
- url = root + url;
- }
- }
void SHIBSP_DLLLOCAL generateRandomHex(std::string& buf, unsigned int len) {
static char DIGITS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
buf += (DIGITS[0x0F & b2]);
}
}
-
- void SHIBSP_DLLLOCAL limitRelayState(
- Category& log, const Application& application, const HTTPRequest& httpRequest, const char* relayState
- ) {
- const PropertySet* sessionProps = application.getPropertySet("Sessions");
- if (sessionProps) {
- pair<bool,const char*> relayStateLimit = sessionProps->getString("relayStateLimit");
- if (relayStateLimit.first && strcmp(relayStateLimit.second, "none")) {
- vector<string> whitelist;
- if (!strcmp(relayStateLimit.second, "exact")) {
- // Scheme and hostname have to match.
- if (!strcmp(httpRequest.getScheme(), "https") && httpRequest.getPort() == 443) {
- whitelist.push_back(string("https://") + httpRequest.getHostname() + '/');
- }
- else if (!strcmp(httpRequest.getScheme(), "http") && httpRequest.getPort() == 80) {
- whitelist.push_back(string("http://") + httpRequest.getHostname() + '/');
- }
- ostringstream portstr;
- portstr << httpRequest.getPort();
- whitelist.push_back(string(httpRequest.getScheme()) + "://" + httpRequest.getHostname() + ':' + portstr.str() + '/');
- }
- else if (!strcmp(relayStateLimit.second, "host")) {
- // Allow any scheme or port.
- whitelist.push_back(string("https://") + httpRequest.getHostname() + '/');
- whitelist.push_back(string("http://") + httpRequest.getHostname() + '/');
- whitelist.push_back(string("https://") + httpRequest.getHostname() + ':');
- whitelist.push_back(string("http://") + httpRequest.getHostname() + ':');
- }
- else if (!strcmp(relayStateLimit.second, "whitelist")) {
- // Literal set of comparisons to use.
- pair<bool,const char*> whitelistval = sessionProps->getString("relayStateWhitelist");
- if (whitelistval.first) {
-#ifdef HAVE_STRTOK_R
- char* pos=nullptr;
- const char* token = strtok_r(const_cast<char*>(whitelistval.second), " ", &pos);
-#else
- const char* token = strtok(const_cast<char*>(whitelistval.second), " ");
-#endif
- while (token) {
- whitelist.push_back(token);
-#ifdef HAVE_STRTOK_R
- token = strtok_r(nullptr, " ", &pos);
-#else
- token = strtok(nullptr, " ");
-#endif
- }
- }
- }
- else {
- log.warn("unrecognized relayStateLimit policy (%s), blocked redirect to (%s)", relayStateLimit.second, relayState);
- throw opensaml::SecurityPolicyException("Unrecognized relayStateLimit setting.");
- }
-
- for (vector<string>::const_iterator w = whitelist.begin(); w != whitelist.end(); ++w) {
- if (XMLString::startsWithI(relayState, w->c_str())) {
- return;
- }
- }
-
- log.warn("relayStateLimit policy (%s), blocked redirect to (%s)", relayStateLimit.second, relayState);
- throw opensaml::SecurityPolicyException("Blocked unacceptable redirect location.");
- }
- }
- }
};
void SHIBSP_API shibsp::registerHandlers()
conf.ArtifactResolutionServiceManager.registerFactory(SAML20_BINDING_SOAP, SAML2ArtifactResolutionFactory);
conf.HandlerManager.registerFactory(SAML20_BINDING_URI, AssertionLookupFactory);
+ conf.HandlerManager.registerFactory(ATTR_CHECKER_HANDLER, AttributeCheckerFactory);
conf.HandlerManager.registerFactory(DISCOVERY_FEED_HANDLER, DiscoveryFeedFactory);
+ conf.HandlerManager.registerFactory(EXTERNAL_AUTH_HANDLER, ExternalAuthFactory);
conf.HandlerManager.registerFactory(METADATA_GENERATOR_HANDLER, MetadataGeneratorFactory);
conf.HandlerManager.registerFactory(STATUS_HANDLER, StatusHandlerFactory);
conf.HandlerManager.registerFactory(SESSION_HANDLER, SessionHandlerFactory);
);
}
+void Handler::cleanRelayState(
+ const Application& application, const xmltooling::HTTPRequest& request, xmltooling::HTTPResponse& response
+ ) const
+{
+ // Only cookie-based relay state requires cleaning.
+ pair<bool,const char*> mech = getString("relayState");
+ if (!mech.first) {
+ // Check for setting on Sessions element.
+ const PropertySet* sessionprop = application.getPropertySet("Sessions");
+ if (sessionprop)
+ mech = sessionprop->getString("relayState");
+ }
+ if (!mech.first || !mech.second || strncmp(mech.second, "cookie", 6))
+ return;
+
+ int maxCookies = 25,purgedCookies = 0;
+ mech.second += 6;
+ if (*mech.second == ':' && isdigit(*(++mech.second))) {
+ maxCookies = atoi(mech.second);
+ if (maxCookies == 0)
+ maxCookies = 25;
+ }
+
+ string exp;
+
+ // Walk the list of cookies backwards by name.
+ const map<string,string>& cookies = request.getCookies();
+ for (map<string,string>::const_reverse_iterator i = cookies.rbegin(); i != cookies.rend(); ++i) {
+ // Process relay state cookies only.
+ if (starts_with(i->first, "_shibstate_")) {
+ if (maxCookies > 0) {
+ // Keep it, but count it against the limit.
+ --maxCookies;
+ }
+ else {
+ // We're over the limit, so everything here and older gets cleaned up.
+ if (exp.empty())
+ exp = string(application.getCookieNameProps("_shibstate_").second) + "; expires=Mon, 01 Jan 2001 00:00:00 GMT";
+ response.setCookie(i->first.c_str(), exp.c_str());
+ ++purgedCookies;
+ }
+ }
+ }
+
+ if (purgedCookies > 0)
+ log(SPRequest::SPDebug, string("purged ") + lexical_cast<string>(purgedCookies) + " stale relay state cookie(s) from client");
+}
+
void Handler::preserveRelayState(const Application& application, HTTPResponse& response, string& relayState) const
{
// The empty string implies no state to deal with.
if (!mech.first || !mech.second || !*mech.second)
return;
- if (!strcmp(mech.second, "cookie")) {
+ if (!strncmp(mech.second, "cookie", 6)) {
// Here we store the state in a cookie and send a fixed
// value so we can recognize it on the way back.
- if (relayState.find("cookie:") != 0) {
- const URLEncoder* urlenc = XMLToolingConfig::getConfig().getURLEncoder();
- pair<string,const char*> shib_cookie=application.getCookieNameProps("_shibstate_");
- string stateval = urlenc->encode(relayState.c_str()) + shib_cookie.second;
+ if (relayState.find("cookie:") != 0 && relayState.find("ss:") != 0) {
+ pair<string,const char*> shib_cookie = application.getCookieNameProps("_shibstate_");
+ string stateval = XMLToolingConfig::getConfig().getURLEncoder()->encode(relayState.c_str()) + shib_cookie.second;
// Generate a random key for the cookie name instead of the fixed name.
string rsKey;
- generateRandomHex(rsKey,5);
+ generateRandomHex(rsKey, 4);
+ rsKey = lexical_cast<string>(time(nullptr)) + '_' + rsKey;
shib_cookie.first = "_shibstate_" + rsKey;
- response.setCookie(shib_cookie.first.c_str(),stateval.c_str());
+ response.setCookie(shib_cookie.first.c_str(), stateval.c_str());
relayState = "cookie:" + rsKey;
}
}
- else if (strstr(mech.second,"ss:")==mech.second) {
- if (relayState.find("ss:") != 0) {
+ else if (!strncmp(mech.second, "ss:", 3)) {
+ if (relayState.find("cookie:") != 0 && relayState.find("ss:") != 0) {
mech.second+=3;
if (*mech.second) {
if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) {
}
}
}
- else
+ else {
throw ConfigurationException("Unsupported relayState mechanism ($1).", params(1,mech.second));
+ }
}
void Handler::recoverRelayState(
// Look for StorageService-backed state of the form "ss:SSID:key".
const char* state = relayState.c_str();
- if (strstr(state,"ss:")==state) {
+ if (strstr(state,"ss:") == state) {
state += 3;
const char* key = strchr(state,':');
if (key) {
if (storage->readString("RelayState",ssid.c_str(),&relayState) > 0) {
if (clear)
storage->deleteString("RelayState",ssid.c_str());
- absolutize(request, relayState);
+ request.absolutize(relayState);
return;
}
else if (storage->readText("RelayState",ssid.c_str(),&relayState) > 0) {
if (clear)
storage->deleteText("RelayState",ssid.c_str());
- absolutize(request, relayState);
+ request.absolutize(relayState);
return;
}
else {
}
else {
relayState = out.string();
- absolutize(request, relayState);
+ request.absolutize(relayState);
return;
}
}
}
}
- // Look for cookie-backed state of the form "cookie:key".
- if (strstr(state,"cookie:")==state) {
+ // Look for cookie-backed state of the form "cookie:timestamp_key".
+ state = relayState.c_str();
+ if (strstr(state,"cookie:") == state) {
state += 7;
if (*state) {
// Pull the value from the "relay state" cookie.
state = request.getCookie(relay_cookie.first.c_str());
if (state && *state) {
// URL-decode the value.
- char* rscopy=strdup(state);
+ char* rscopy = strdup(state);
XMLToolingConfig::getConfig().getURLEncoder()->decode(rscopy);
relayState = rscopy;
free(rscopy);
-
if (clear) {
string exp(relay_cookie.second);
exp += "; expires=Mon, 01 Jan 2001 00:00:00 GMT";
response.setCookie(relay_cookie.first.c_str(), exp.c_str());
}
- absolutize(request, relayState);
+ request.absolutize(relayState);
return;
}
}
relayState = '/';
}
- absolutize(request, relayState);
+ request.absolutize(relayState);
}
AbstractHandler::AbstractHandler(
const DOMElement* e, Category& log, DOMNodeFilter* filter, const map<string,string>* remapper
) : m_log(log), m_configNS(shibspconstants::SHIB2SPCONFIG_NS) {
- load(e,nullptr,filter,remapper);
+ load(e, nullptr, filter, remapper);
}
AbstractHandler::~AbstractHandler()
const xmltooling::QName* code = sc ? sc->getValue() : nullptr;
if (code && *code != saml1p::StatusCode::SUCCESS) {
FatalProfileException ex("SAML response contained an error.");
- ex.addProperty("statusCode", code->toString().c_str());
- if (sc->getStatusCode()) {
- code = sc->getStatusCode()->getValue();
- if (code)
- ex.addProperty("statusCode2", code->toString().c_str());
- }
- if (status->getStatusMessage()) {
- auto_ptr_char msg(status->getStatusMessage()->getMessage());
- if (msg.get() && *msg.get())
- ex.addProperty("statusMessage", msg.get());
- }
- ex.raise();
+ annotateException(&ex, role, status); // throws it
}
}
}
const EntityDescriptor* entity = role ? dynamic_cast<const EntityDescriptor*>(role->getParent()) : nullptr;
const PropertySet* relyingParty = application.getRelyingParty(entity);
pair<bool,const char*> flag = signIfPossible ? make_pair(true,(const char*)"true") : relyingParty->getString("signing");
- if (role && flag.first &&
- (!strcmp(flag.second, "true") ||
- (encoder.isUserAgentPresent() && !strcmp(flag.second, "front")) ||
- (!encoder.isUserAgentPresent() && !strcmp(flag.second, "back")))) {
- CredentialResolver* credResolver=application.getCredentialResolver();
+ if (flag.first && (!strcmp(flag.second, "true") ||
+ (encoder.isUserAgentPresent() && !strcmp(flag.second, "front")) ||
+ (!encoder.isUserAgentPresent() && !strcmp(flag.second, "back")))) {
+ CredentialResolver* credResolver = application.getCredentialResolver();
if (credResolver) {
Locker credLocker(credResolver);
const Credential* cred = nullptr;
if (storage) {
// Use a random key
string rsKey;
- SAMLConfig::getConfig().generateRandomBytes(rsKey,32);
+ SAMLConfig::getConfig().generateRandomBytes(rsKey, 32);
rsKey = SAMLArtifact::toHex(rsKey);
ostringstream out;
out << postData;
{
string contentType = request.getContentType();
if (contentType.find("application/x-www-form-urlencoded") != string::npos) {
- const PropertySet* props=application.getPropertySet("Sessions");
+ const PropertySet* props = application.getPropertySet("Sessions");
pair<bool,unsigned int> plimit = props ? props->getUnsignedInt("postLimit") : pair<bool,unsigned int>(false,0);
if (!plimit.first)
plimit.second = 1024 * 1024;
{
if (type & HANDLER_PROPERTY_REQUEST) {
const char* param = request.getParameter(name);
- if (param && *param)
- return pair<bool,unsigned int>(true, strtol(param,nullptr,10));
+ if (param && *param) {
+ try {
+ return pair<bool,unsigned int>(true, lexical_cast<unsigned int>(param));
+ }
+ catch (bad_lexical_cast&) {
+ return pair<bool,unsigned int>(false,0);
+ }
+ }
}
if (type & HANDLER_PROPERTY_MAP) {