Adjust logging categories.

[shibboleth/sp.git] / fastcgi / shibresponder.cpp

diff --git a/fastcgi/shibresponder.cpp b/fastcgi/shibresponder.cpp
index 4cab35d..940ebe3 100644 (file)
--- a/fastcgi/shibresponder.cpp
+++ b/fastcgi/shibresponder.cpp
@@ -36,6 +36,7 @@
 #include <xmltooling/util/XMLHelper.h>\r
 #include <xercesc/util/XMLUniDefs.hpp>\r
 \r
+#include <stdexcept>\r
 #include <stdlib.h>\r
 #ifdef HAVE_UNISTD_H\r
 # include <unistd.h>\r
@@ -67,7 +68,7 @@ class ShibTargetFCGI : public AbstractSPRequest
 \r
 public:\r
     ShibTargetFCGI(FCGX_Request* req, char* post_data, const char* scheme=NULL, const char* hostname=NULL, int port=0)\r
-        : m_req(req), m_body(post_data) {\r
+        : AbstractSPRequest(SHIBSP_LOGCAT".FastCGI"), m_req(req), m_body(post_data) {\r
 \r
         const char* server_name_str = hostname;\r
         if (!server_name_str || !*server_name_str)\r
@@ -80,7 +81,7 @@ public:
             m_port = strtol(server_port_str, &server_port_str, 10);\r
             if (*server_port_str) {\r
                 cerr << "can't parse SERVER_PORT (" << FCGX_GetParam("SERVER_PORT", req->envp) << ")" << endl;\r
-                throw exception("Unable to determine server port.");\r
+                throw runtime_error("Unable to determine server port.");\r
             }\r
         }\r
 \r
@@ -88,6 +89,8 @@ public:
         if (!server_scheme_str || !*server_scheme_str)\r
             server_scheme_str = (m_port == 443 || m_port == 8443) ? "https" : "http";\r
         m_scheme = server_scheme_str;\r
+\r
+        setRequestURI(FCGX_GetParam("REQUEST_URI", m_req->envp));\r
     }\r
 \r
     ~ShibTargetFCGI() { }\r
@@ -101,9 +104,6 @@ public:
     int getPort() const {\r
         return m_port;\r
     }\r
-    const char* getRequestURI() const {\r
-        return FCGX_GetParam("REQUEST_URI", m_req->envp);\r
-    }\r
     const char* getMethod() const {\r
         return FCGX_GetParam("REQUEST_METHOD", m_req->envp);\r
     }\r
@@ -164,9 +164,10 @@ public:
 \r
         const char* codestr="Status: 200 OK";\r
         switch (status) {\r
-            case XMLTOOLING_HTTP_STATUS_ERROR:    codestr="Status: 500 Server Error"; break;\r
-            case XMLTOOLING_HTTP_STATUS_FORBIDDEN:codestr="Status: 403 Forbidden"; break;\r
-            case XMLTOOLING_HTTP_STATUS_NOTFOUND: codestr="Status: 404 Not Found"; break;\r
+            case XMLTOOLING_HTTP_STATUS_ERROR:          codestr="Status: 500 Server Error"; break;\r
+            case XMLTOOLING_HTTP_STATUS_UNAUTHORIZED:   codestr="Status: 401 Authorization Required"; break;\r
+            case XMLTOOLING_HTTP_STATUS_FORBIDDEN:      codestr="Status: 403 Forbidden"; break;\r
+            case XMLTOOLING_HTTP_STATUS_NOTFOUND:       codestr="Status: 404 Not Found"; break;\r
         }\r
         cout << codestr << "\r\n" << hdr << "\r\n";\r
         char buf[1024];\r
@@ -206,15 +207,15 @@ public:
     // Not used in the extension.\r
 \r
     virtual void clearHeader(const char* rawname, const char* cginame) {\r
-        throw exception("clearHeader not implemented by FastCGI responder.");\r
+        throw runtime_error("clearHeader not implemented by FastCGI responder.");\r
     }\r
   \r
     virtual void setHeader(const char* name, const char* value) {\r
-        throw exception("setHeader not implemented by FastCGI responder.");\r
+        throw runtime_error("setHeader not implemented by FastCGI responder.");\r
     }\r
 \r
     virtual void setRemoteUser(const char* user) {\r
-        throw exception("setRemoteUser not implemented by FastCGI responder.");\r
+        throw runtime_error("setRemoteUser not implemented by FastCGI responder.");\r
     }\r
 };\r
 \r