#include <shibsp/exceptions.h>
#include <shibsp/SPRequest.h>
-#include <saml/util/CGIParser.h>
+#include <shibsp/util/CGIParser.h>
namespace shibsp {
+#if defined (_MSC_VER)
+ #pragma warning( push )
+ #pragma warning( disable : 4251 )
+#endif
+
/**
* Abstract base for SPRequest implementations
*/
class SHIBSP_API AbstractSPRequest : public virtual SPRequest
{
protected:
- AbstractSPRequest();
+ /**
+ * Constructor.
+ *
+ * @param category logging category to use
+ */
+ AbstractSPRequest(const char* category);
+ /**
+ * Stores a normalized request URI to ensure it contains no %-encoded characters
+ * or other undesirable artifacts, such as ;jsessionid appendage.
+ *
+ * @param uri the request URI as obtained from the client
+ */
+ void setRequestURI(const char* uri);
+
public:
virtual ~AbstractSPRequest();
const Application& getApplication() const;
- Session* getSession() const;
+ Session* getSession(bool checkTimeout=true, bool ignoreAddress=false, bool cache=true) const;
+
+ const char* getRequestURI() const {
+ return m_uri.c_str();
+ }
const char* getRequestURL() const;
std::vector<const char*>::size_type getParameters(const char* name, std::vector<const char*>& values) const;
- const char* getCookie(const char* name) const;
-
const char* getHandlerURL(const char* resource=NULL) const;
void log(SPLogLevel level, const std::string& msg) const;
mutable const Application* m_app;
mutable bool m_sessionTried;
mutable Session* m_session;
+ std::string m_uri;
mutable std::string m_url;
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)
+ #pragma warning( pop )
+#endif
+
};
#endif /* __shibsp_abstreq_h__ */