Fix filter cgi does not relay session close MP-577
[metaproxy-moved-to-github.git] / src / filter_cgi.cpp
index e0b1411..2b38877 100644 (file)
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -44,8 +44,11 @@ namespace metaproxy_1 {
         class CGI::Rep {
             friend class CGI;
             std::list<CGI::Exec> exec_map;
+            std::map<std::string,std::string> env_map;
             std::map<pid_t,pid_t> children;
             boost::mutex m_mutex;
+            std::string documentroot;
+            void child(Z_HTTP_Request *, const CGI::Exec *);
         public:
             ~Rep();
         };
@@ -70,64 +73,127 @@ yf::CGI::~CGI()
 {
 }
 
+void yf::CGI::Rep::child(Z_HTTP_Request *hreq, const CGI::Exec *it)
+{
+    const char *path_cstr = hreq->path;
+    std::string path(path_cstr);
+    const char *program_cstr = it->program.c_str();
+    std::string script_name(path, 0, it->path.length());
+    std::string rest(path, it->path.length());
+    std::string query_string;
+    std::string path_info;
+    size_t qpos = rest.find('?');
+    if (qpos == std::string::npos)
+        path_info = rest;
+    else
+    {
+        query_string.assign(rest, qpos + 1, std::string::npos);
+        path_info.assign(rest, 0, qpos);
+    }
+    setenv("REQUEST_METHOD", hreq->method, 1);
+    setenv("REQUEST_URI", path_cstr, 1);
+    setenv("SCRIPT_NAME", script_name.c_str(), 1);
+    setenv("PATH_INFO", path_info.c_str(), 1);
+    setenv("QUERY_STRING", query_string.c_str(), 1);
+    const char *v;
+    v = z_HTTP_header_lookup(hreq->headers, "Cookie");
+    if (v)
+        setenv("HTTP_COOKIE", v, 1);
+    v = z_HTTP_header_lookup(hreq->headers, "User-Agent");
+    if (v)
+        setenv("HTTP_USER_AGENT", v, 1);
+    v = z_HTTP_header_lookup(hreq->headers, "Accept");
+    if (v)
+        setenv("HTTP_ACCEPT", v, 1);
+    v = z_HTTP_header_lookup(hreq->headers, "Accept-Encoding");
+    if (v)
+        setenv("HTTP_ACCEPT_ENCODING", v, 1);
+    setenv("DOCUMENT_ROOT", documentroot.c_str(), 1);
+    setenv("GATEWAY_INTERFACE", "CGI/1.1", 1);
+    // apply user-defined environment
+    std::map<std::string,std::string>::const_iterator it_e;
+    for (it_e = env_map.begin();
+         it_e != env_map.end(); it_e++)
+        setenv(it_e->first.c_str(), it_e->second.c_str(), 1);
+    // change directory to configuration root
+    // then to CGI program directory (could be relative)
+    chdir(documentroot.c_str());
+    char *program = xstrdup(program_cstr);
+    char *cp = strrchr(program, '/');
+    if (cp)
+    {
+        *cp++ = '\0';
+        chdir(program);
+    }
+    else
+        cp = program;
+    int r = execl(cp, cp, (char *) 0);
+    if (r == -1)
+        exit(1);
+    exit(0);
+}
+
 void yf::CGI::process(mp::Package &package) const
 {
     Z_GDU *zgdu_req = package.request().get();
     Z_GDU *zgdu_res = 0;
 
-    if (!zgdu_req)
-        return;
-
-    if (zgdu_req->which != Z_GDU_HTTP_Request)
+    if (!zgdu_req || zgdu_req->which != Z_GDU_HTTP_Request)
     {
         package.move();
         return;
     }
-    std::string path_info;
-    std::string query_string;
-    const char *path = zgdu_req->u.HTTP_Request->path;
-    yaz_log(YLOG_LOG, "path=%s", path);
-    const char *p_cp = strchr(path, '?');
-    if (p_cp)
-    {
-        path_info.assign(path, p_cp - path);
-        query_string.assign(p_cp+1);
-    }
-    else
-        path_info.assign(path);
-
     std::list<CGI::Exec>::const_iterator it;
     metaproxy_1::odr odr;
+    Z_HTTP_Request *hreq = zgdu_req->u.HTTP_Request;
+    const char *path_cstr = hreq->path;
     for (it = m_p->exec_map.begin(); it != m_p->exec_map.end(); it++)
     {
-        if (it->path.compare(path_info) == 0)
+        if (strncmp(it->path.c_str(), path_cstr, it->path.length()) == 0)
         {
-            int r;
-            pid_t pid;
+            int fds[2];
+            int r = pipe(fds);
+            if (r == -1)
+            {
+                zgdu_res = odr.create_HTTP_Response(
+                    package.session(), hreq, 400);
+                package.response() = zgdu_res;
+                continue;
+            }
             int status;
-
-            pid = ::fork();
+            pid_t pid = ::fork();
             switch (pid)
             {
             case 0: /* child */
-                setenv("PATH_INFO", path_info.c_str(), 1);
-                setenv("QUERY_STRING", query_string.c_str(), 1);
-                r = execl(it->program.c_str(), it->program.c_str(), (char *) 0);
-                if (r == -1)
-                    exit(1);
-                exit(0);
+                close(1);
+                dup(fds[1]);
+                m_p->child(hreq, &(*it));
                 break;
             case -1: /* error */
+                close(fds[0]);
+                close(fds[1]);
                 zgdu_res = odr.create_HTTP_Response(
-                    package.session(), zgdu_req->u.HTTP_Request, 400);
+                    package.session(), hreq, 400);
                 package.response() = zgdu_res;
                 break;
             default: /* parent */
+                close(fds[1]);
                 if (pid)
                 {
                     boost::mutex::scoped_lock lock(m_p->m_mutex);
                     m_p->children[pid] = pid;
                 }
+                WRBUF w = wrbuf_alloc();
+                wrbuf_puts(w, "HTTP/1.1 200 OK\r\n");
+                while (1)
+                {
+                    char buf[512];
+                    ssize_t rd = read(fds[0], buf, sizeof buf);
+                    if (rd <= 0)
+                        break;
+                    wrbuf_write(w, buf, rd);
+                }
+                close(fds[0]);
                 waitpid(pid, &status, 0);
 
                 if (pid)
@@ -135,9 +201,27 @@ void yf::CGI::process(mp::Package &package) const
                     boost::mutex::scoped_lock lock(m_p->m_mutex);
                     m_p->children.erase(pid);
                 }
-                zgdu_res = odr.create_HTTP_Response(
-                    package.session(), zgdu_req->u.HTTP_Request, 200);
+                ODR dec = odr_createmem(ODR_DECODE);
+                odr_setbuf(dec, wrbuf_buf(w), wrbuf_len(w), 0);
+                r = z_GDU(dec, &zgdu_res, 0, 0);
+                if (r && zgdu_res)
+                {
+                    package.response() = zgdu_res;
+                }
+                else
+                {
+                    zgdu_res = odr.create_HTTP_Response(
+                        package.session(), zgdu_req->u.HTTP_Request, 400);
+                    Z_HTTP_Response *hres = zgdu_res->u.HTTP_Response;
+                    z_HTTP_header_add(odr, &hres->headers,
+                                      "Content-Type", "text/plain");
+                    hres->content_buf =
+                        odr_strdup(odr, "Invalid script from script");
+                    hres->content_len = strlen(hres->content_buf);
+                }
                 package.response() = zgdu_res;
+                odr_destroy(dec);
+                wrbuf_destroy(w);
                 break;
             }
             return;
@@ -148,6 +232,7 @@ void yf::CGI::process(mp::Package &package) const
 
 void yf::CGI::configure(const xmlNode *ptr, bool test_only, const char *path)
 {
+    yaz_log(YLOG_LOG, "cgi::configure path=%s", path);
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
         if (ptr->type != XML_ELEMENT_NODE)
@@ -171,6 +256,30 @@ void yf::CGI::configure(const xmlNode *ptr, bool test_only, const char *path)
             }
             m_p->exec_map.push_back(exec);
         }
+        else if (!strcmp((const char *) ptr->name, "env"))
+        {
+            std::string name, value;
+
+            const struct _xmlAttr *attr;
+            for (attr = ptr->properties; attr; attr = attr->next)
+            {
+                if (!strcmp((const char *) attr->name,  "name"))
+                    name = mp::xml::get_text(attr->children);
+                else if (!strcmp((const char *) attr->name, "value"))
+                    value = mp::xml::get_text(attr->children);
+                else
+                    throw mp::filter::FilterException
+                        ("Bad attribute "
+                         + std::string((const char *) attr->name)
+                         + " in cgi section");
+            }
+            if (name.length() > 0)
+                m_p->env_map[name] = value;
+        }
+        else if (!strcmp((const char *) ptr->name, "documentroot"))
+        {
+            m_p->documentroot = path;
+        }
         else
         {
             throw mp::filter::FilterException("Bad element "
@@ -178,6 +287,8 @@ void yf::CGI::configure(const xmlNode *ptr, bool test_only, const char *path)
                                                              ptr->name));
         }
     }
+    if (m_p->documentroot.length() == 0)
+        m_p->documentroot = ".";
 }
 
 static mp::filter::Base* filter_creator()