Moved URLEncoder down to tooling lib, added exception->querystring method.

diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp
index 1965cc8..4d5b404 100644 (file)
--- a/shibsp/handler/impl/AbstractHandler.cpp
+++ b/shibsp/handler/impl/AbstractHandler.cpp
@@ -26,11 +26,11 @@
 #include "SPRequest.h"
 #include "handler/AbstractHandler.h"
 
-#include <saml/SAMLConfig.h>
-#include <saml/binding/URLEncoder.h>
 #include <saml/saml1/core/Protocols.h>
 #include <saml/saml2/core/Protocols.h>
 #include <saml/util/SAMLConstants.h>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/util/URLEncoder.h>
 
 using namespace shibsp;
 using namespace samlconstants;
@@ -109,7 +109,7 @@ void AbstractHandler::recoverRelayState(HTTPRequest& httpRequest, string& relayS
     SPConfig& conf = SPConfig::getConfig();
     if (conf.isEnabled(SPConfig::OutOfProcess)) {
         // Out of process, we look for StorageService-backed state.
-        // TODO
+        // TODO: something like ss:SSID:key?
     }
     
     if (conf.isEnabled(SPConfig::InProcess)) {
@@ -122,7 +122,7 @@ void AbstractHandler::recoverRelayState(HTTPRequest& httpRequest, string& relayS
             if (state && *state) {
                 // URL-decode the value.
                 char* rscopy=strdup(state);
-                SAMLConfig::getConfig().getURLEncoder()->decode(rscopy);
+                XMLToolingConfig::getConfig().getURLEncoder()->decode(rscopy);
                 relayState = rscopy;
                 free(rscopy);
                 

diff --git a/shibsp/handler/impl/AssertionConsumerService.cpp b/shibsp/handler/impl/AssertionConsumerService.cpp
index a8f55e1..e89ecfc 100644 (file)
--- a/shibsp/handler/impl/AssertionConsumerService.cpp
+++ b/shibsp/handler/impl/AssertionConsumerService.cpp
@@ -30,7 +30,6 @@
 #include "util/SPConstants.h"
 
 #include <saml/SAMLConfig.h>
-#include <saml/binding/URLEncoder.h>
 #include <saml/saml1/core/Assertions.h>
 #include <saml/util/CommonDomainCookie.h>