Fix crash in localized request maps.

Add RequestMap diagnostics to status handler.

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

diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index 2be0df1..0ab5651 100644 (file)
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -818,6 +818,8 @@ void ApacheRequestMapper::getAll(map<string,const char*>& properties) const
 
     if (s)
         s->getAll(properties);
+    if (!sta)
+        return;
 
     const char* auth_type=ap_auth_type(sta->m_req);
     if (auth_type) {

diff --git a/nsapi_shib/nsapi_shib.cpp b/nsapi_shib/nsapi_shib.cpp
index 6c8618e..adf0806 100644 (file)
--- a/nsapi_shib/nsapi_shib.cpp
+++ b/nsapi_shib/nsapi_shib.cpp
@@ -569,6 +569,8 @@ void SunRequestMapper::getAll(map<string,const char*>& properties) const
     const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
     if (s)
         s->getAll(properties);
+    if (!stn)
+        return;
     properties["authType"] = "shibboleth";
     const pb_entry* entry;
     for (int i=0; i<stn->m_pb->hsize; ++i) {

diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp
index b5f3825..8ce18ec 100644 (file)
--- a/shibsp/handler/impl/StatusHandler.cpp
+++ b/shibsp/handler/impl/StatusHandler.cpp
@@ -26,6 +26,7 @@
 #include "ServiceProvider.h"
 #include "handler/AbstractHandler.h"
 #include "handler/RemotedHandler.h"
+#include "util/CGIParser.h"
 
 using namespace shibsp;
 #ifndef SHIBSP_LITE
@@ -79,6 +80,139 @@ namespace shibsp {
         return new StatusHandler(p.first, p.second);
     }
 
+#ifndef XMLTOOLING_NO_XMLSEC
+    vector<XSECCryptoX509*> g_NoCerts;
+#else
+    vector<string> g_NoCerts;
+#endif
+
+    class DummyRequest : public HTTPRequest
+    {
+    public:
+        DummyRequest(const char* url) : m_parser(NULL), m_url(url), m_scheme(NULL), m_query(NULL), m_port(0) {
+#ifdef HAVE_STRCASECMP
+            if (url && !strncasecmp(url,"http://",7)) {
+                m_scheme="http";
+                url+=7;
+            }
+            else if (url && !strncasecmp(url,"https://",8)) {
+                m_scheme="https";
+                url+=8;
+            }
+            else
+#else
+            if (url && !strnicmp(url,"http://",7)) {
+                m_scheme="http";
+                m_port = 80;
+                url+=7;
+            }
+            else if (url && !strnicmp(url,"https://",8)) {
+                m_scheme="https";
+                m_port = 443;
+                url+=8;
+            }
+            else
+#endif
+                throw exception("Target parameter was not an absolute URL.");
+
+            m_query = strchr(url,'?');
+            if (m_query)
+                m_query++;
+
+            const char* slash = strchr(url, '/');
+            const char* colon = strchr(url, ':');
+            if (colon && colon < slash) {
+                m_hostname.assign(url, colon-url);
+                string port(colon + 1, slash - colon);
+                m_port = atoi(port.c_str());
+            }
+            else {
+                m_hostname.assign(url, slash - url);
+            }
+            m_uri = slash;
+        }
+
+        ~DummyRequest() {
+            delete m_parser;
+        }
+
+        const char* getRequestURL() const {
+            return m_url;
+        }
+        const char* getScheme() const {
+            return m_scheme;
+        }
+        const char* getHostname() const {\r
+            return m_hostname.c_str();\r
+        }\r
+        int getPort() const {\r
+            return m_port;\r
+        }\r
+        const char* getRequestURI() const {\r
+            return m_uri.c_str();\r
+        }\r
+        const char* getMethod() const {\r
+            return "GET";\r
+        }\r
+        string getContentType() const {\r
+            return "";\r
+        }\r
+        long getContentLength() const {\r
+            return 0;\r
+        }\r
+        string getRemoteAddr() const {\r
+            return "";\r
+        }
+        string getRemoteUser() const {
+            return "";
+        }
+        const char* getRequestBody() const {
+            return NULL;
+        }
+        const char* getQueryString() const {
+            return m_query;
+        }
+        const char* getParameter(const char* name) const
+        {
+            if (!m_parser)
+                m_parser=new CGIParser(*this);
+            
+            pair<CGIParser::walker,CGIParser::walker> bounds=m_parser->getParameters(name);
+            return (bounds.first==bounds.second) ? NULL : bounds.first->second;
+        }
+        vector<const char*>::size_type getParameters(const char* name, vector<const char*>& values) const
+        {
+            if (!m_parser)
+                m_parser=new CGIParser(*this);
+
+            pair<CGIParser::walker,CGIParser::walker> bounds=m_parser->getParameters(name);
+            while (bounds.first!=bounds.second) {
+                values.push_back(bounds.first->second);
+                ++bounds.first;
+            }
+            return values.size();
+        }
+        string getHeader(const char* name) const {
+            return "";
+        }
+        virtual const
+#ifndef XMLTOOLING_NO_XMLSEC
+            std::vector<XSECCryptoX509*>&
+#else
+            std::vector<std::string>& 
+#endif
+            getClientCertificates() const {
+                return g_NoCerts;
+        }
+
+    private:
+        mutable CGIParser* m_parser;
+        const char* m_url;
+        const char* m_scheme;\r
+        const char* m_query;\r
+        int m_port;\r
+        string m_hostname,m_uri;\r
+    };
 };
 
 StatusHandler::StatusHandler(const DOMElement* e, const char* appId)
@@ -113,6 +247,32 @@ pair<bool,long> StatusHandler::run(SPRequest& request, bool isHandler) const
             return make_pair(true,request.sendResponse(msg, HTTPResponse::XMLTOOLING_HTTP_STATUS_FORBIDDEN));
         }
     }
+
+    const char* target = request.getParameter("target");
+    if (target) {
+        // RequestMap query, so handle it inproc.
+        DummyRequest dummy(target);
+        RequestMapper::Settings settings = request.getApplication().getServiceProvider().getRequestMapper()->getSettings(dummy);
+        map<string,const char*> props;
+        settings.first->getAll(props);
+
+        request.setContentType("text/xml");
+        stringstream msg;
+        msg << "<StatusHandler>";
+            msg << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
+#ifndef SHIBSP_LITE
+                << "' XML-Security-C='" << XSEC_FULLVERSIONDOT
+                << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+#endif
+                << "' Shibboleth='" << PACKAGE_VERSION << "'/>";
+            msg << "<RequestSettings";
+            for (map<string,const char*>::const_iterator p = props.begin(); p != props.end(); ++p)
+                msg << ' ' << p->first << "='" << p->second << "'";
+            msg << '>' << target << "</RequestSettings>";
+            msg << "<Status><OK/></Status>";
+        msg << "</StatusHandler>";
+        return make_pair(true,request.sendResponse(msg));
+    }
     
     try {
         if (conf.isEnabled(SPConfig::OutOfProcess)) {
@@ -199,7 +359,8 @@ pair<bool,long> StatusHandler::processMessage(
         << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
         << "' Shibboleth='" << PACKAGE_VERSION << "'/>";
 
-    if (false) {
+    const char* param = NULL;
+    if (param) {
     }
     else {
         // General configuration and status report.
@@ -236,10 +397,10 @@ pair<bool,long> StatusHandler::processMessage(
         s << "</Handlers>";
 
         const PropertySet* relyingParty=NULL;
-        const char* entityID=httpRequest.getParameter("entityID");
-        if (entityID) {
+        param=httpRequest.getParameter("entityID");
+        if (param) {
             Locker mlock(application.getMetadataProvider());
-            relyingParty = application.getRelyingParty(application.getMetadataProvider()->getEntityDescriptor(entityID));
+            relyingParty = application.getRelyingParty(application.getMetadataProvider()->getEntityDescriptor(param));
         }
         if (!relyingParty)
             relyingParty = application.getRelyingParty(NULL);
@@ -277,7 +438,6 @@ pair<bool,long> StatusHandler::processMessage(
                 }
             }
         }
-
     }
 
     s << "<Status>" << status << "</Status></StatusHandler>";