Moved CGI parser into SP library.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2271 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibsp/AbstractSPRequest.h b/shibsp/AbstractSPRequest.h
index 4f9226d..3dc1c68 100644 (file)
--- a/shibsp/AbstractSPRequest.h
+++ b/shibsp/AbstractSPRequest.h
@@ -25,11 +25,7 @@
 
 #include <shibsp/exceptions.h>
 #include <shibsp/SPRequest.h>
-#ifndef SHIBSP_LITE
-# include <saml/util/CGIParser.h>
-#else
-# include <shibsp/lite/CGIParser.h>
-#endif
+#include <shibsp/util/CGIParser.h>
 
 namespace shibsp {
     
@@ -84,7 +80,7 @@ namespace shibsp {
         void* m_log; // declared void* to avoid log4cpp header conflicts in Apache
         mutable std::string m_handlerURL;
         mutable std::map<std::string,std::string> m_cookieMap;
-        mutable opensaml::CGIParser* m_parser;
+        mutable CGIParser* m_parser;
     };
 
 #if defined (_MSC_VER)

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index b35e327..541860b 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -69,7 +69,6 @@ handinclude_HEADERS = \
        handler/SessionInitiator.h
 
 liteinclude_HEADERS = \
-       lite/CGIParser.h \
        lite/CommonDomainCookie.h \
        lite/SAMLConstants.h
 
@@ -85,6 +84,7 @@ secinclude_HEADERS = \
        security/SecurityPolicy.h
 
 utilinclude_HEADERS = \
+       util/CGIParser.h \
        util/DOMPropertySet.h \
        util/PropertySet.h \
        util/SPConstants.h \
@@ -122,6 +122,7 @@ common_sources = \
        remoting/impl/SocketListener.cpp \
        remoting/impl/TCPListener.cpp \
        remoting/impl/UnixListener.cpp \
+       util/CGIParser.cpp \
        util/DOMPropertySet.cpp \
        util/SPConstants.cpp \
        util/TemplateParameters.cpp
@@ -129,7 +130,6 @@ common_sources = \
 libshibsp_lite_la_SOURCES = \
        ${common_sources} \
        impl/RemotedSessionCache.cpp \
-       lite/CGIParser.cpp \
        lite/CommonDomainCookie.cpp \
        lite/SAMLConstants.cpp
 

diff --git a/shibsp/handler/impl/RemotedHandler.cpp b/shibsp/handler/impl/RemotedHandler.cpp
index 477bdd7..a10eb2f 100644 (file)
--- a/shibsp/handler/impl/RemotedHandler.cpp
+++ b/shibsp/handler/impl/RemotedHandler.cpp
@@ -31,7 +31,7 @@
 #include <xmltooling/unicode.h>
 
 #ifndef SHIBSP_LITE
-# include <saml/util/CGIParser.h>
+# include "util/CGIParser.h"
 # include <xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp>
 # include <xsec/enc/XSECCryptoException.hpp>
 # include <xsec/framework/XSECException.hpp>

diff --git a/shibsp/shibsp-lite.vcproj b/shibsp/shibsp-lite.vcproj
index 2b49d94..4064d67 100644 (file)
--- a/shibsp/shibsp-lite.vcproj
+++ b/shibsp/shibsp-lite.vcproj
@@ -207,6 +207,10 @@
                                Name="util"\r
                                >\r
                                <File\r
+                                       RelativePath=".\util\CGIParser.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\util\DOMPropertySet.cpp"\r
                                        >\r
                                </File>\r
@@ -339,10 +343,6 @@
                                Name="lite"\r
                                >\r
                                <File\r
-                                       RelativePath=".\lite\CGIParser.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
                                        RelativePath=".\lite\CommonDomainCookie.cpp"\r
                                        >\r
                                </File>\r
@@ -413,6 +413,10 @@
                                Name="util"\r
                                >\r
                                <File\r
+                                       RelativePath=".\util\CGIParser.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\util\DOMPropertySet.h"\r
                                        >\r
                                </File>\r
@@ -489,10 +493,6 @@
                                Name="lite"\r
                                >\r
                                <File\r
-                                       RelativePath=".\lite\CGIParser.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
                                        RelativePath=".\lite\CommonDomainCookie.h"\r
                                        >\r
                                </File>\r

diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index ac0b337..6970ed6 100644 (file)
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -207,6 +207,10 @@
                                Name="util"\r
                                >\r
                                <File\r
+                                       RelativePath=".\util\CGIParser.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\util\DOMPropertySet.cpp"\r
                                        >\r
                                </File>\r
@@ -569,6 +573,10 @@
                                Name="util"\r
                                >\r
                                <File\r
+                                       RelativePath=".\util\CGIParser.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\util\DOMPropertySet.h"\r
                                        >\r
                                </File>\r

diff --git a/shibsp/lite/CGIParser.cpp b/shibsp/util/CGIParser.cpp
similarity index 98%
rename from shibsp/lite/CGIParser.cpp
rename to shibsp/util/CGIParser.cpp
index 5c90eda..1011351 100644 (file)
--- a/shibsp/lite/CGIParser.cpp
+++ b/shibsp/util/CGIParser.cpp
@@ -21,12 +21,12 @@
  */
 
 #include "internal.h"
-#include "lite/CGIParser.h"
+#include "util/CGIParser.h"
 
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/util/URLEncoder.h>
 
-using namespace opensaml;
+using namespace shibsp;
 using namespace xmltooling;
 using namespace std;
 

diff --git a/shibsp/lite/CGIParser.h b/shibsp/util/CGIParser.h
similarity index 93%
rename from shibsp/lite/CGIParser.h
rename to shibsp/util/CGIParser.h
index 4788b42..b76953d 100644 (file)
--- a/shibsp/lite/CGIParser.h
+++ b/shibsp/util/CGIParser.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file shibsp/lite/CGIParser.h
+ * @file shibsp/util/CGIParser.h
  * 
  * CGI GET/POST parameter parsing
  */
@@ -26,7 +26,7 @@
 #include <shibsp/base.h>
 #include <xmltooling/io/HTTPRequest.h>
 
-namespace opensaml {
+namespace shibsp {
 
 #if defined (_MSC_VER)
     #pragma warning( push )
@@ -61,7 +61,7 @@ namespace opensaml {
         std::pair<walker,walker> getParameters(const char* name) const;
         
     private:
-        char* fmakeword(char stop, unsigned int *cl, const char** ppch);
+        char* fmakeword(char stop, size_t *cl, const char** ppch);
         char* makeword(char *line, char stop);
         void plustospace(char *str);