cgi: reads stdin part of MP-564

[metaproxy-moved-to-github.git] / src / filter_cgi.cpp

diff --git a/src/filter_cgi.cpp b/src/filter_cgi.cpp
index b4d12a6..30e3e17 100644 (file)
--- a/src/filter_cgi.cpp
+++ b/src/filter_cgi.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 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
@@ -54,14 +54,14 @@ namespace metaproxy_1 {
 
 yf::CGI::CGI() : m_p(new Rep)
 {
-    
+
 }
 
 yf::CGI::Rep::~Rep()
 {
     std::map<pid_t,pid_t>::const_iterator it;
     boost::mutex::scoped_lock lock(m_mutex);
-    
+
     for (it = children.begin(); it != children.end(); it++)
         kill(it->second, SIGTERM);
 }
@@ -74,10 +74,10 @@ 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)
     {
         package.move();
@@ -105,11 +105,22 @@ void yf::CGI::process(mp::Package &package) const
             int r;
             pid_t pid;
             int status;
-            
+            int fds[2];
+
+            r = pipe(fds);
+            if (r == -1)
+            {
+                zgdu_res = odr.create_HTTP_Response(
+                    package.session(), zgdu_req->u.HTTP_Request, 400);
+                package.response() = zgdu_res;
+                continue;
+            }
             pid = ::fork();
             switch (pid)
             {
             case 0: /* child */
+                close(1);
+                dup(fds[1]);
                 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);
@@ -118,16 +129,30 @@ void yf::CGI::process(mp::Package &package) const
                 exit(0);
                 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.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 +160,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;
@@ -165,7 +208,7 @@ void yf::CGI::configure(const xmlNode *ptr, bool test_only, const char *path)
                     exec.program = mp::xml::get_text(attr->children);
                 else
                     throw mp::filter::FilterException
-                        ("Bad attribute " 
+                        ("Bad attribute "
                          + std::string((const char *) attr->name)
                          + " in cgi section");
             }
@@ -173,7 +216,7 @@ void yf::CGI::configure(const xmlNode *ptr, bool test_only, const char *path)
         }
         else
         {
-            throw mp::filter::FilterException("Bad element " 
+            throw mp::filter::FilterException("Bad element "
                                                + std::string((const char *)
                                                              ptr->name));
         }