code cleanup

[mod-proxy-fdpass.git] / mod_proxy_fdpass.c

diff --git a/mod_proxy_fdpass.c b/mod_proxy_fdpass.c
index ff7ddbc..34ee2fe 100644 (file)
--- a/mod_proxy_fdpass.c
+++ b/mod_proxy_fdpass.c
@@ -270,6 +270,63 @@ static int headers_builder(void *rec, const char *key, const char *value)
     sprintf(s, "%s%s:%s\n", s, key, value);
 }
 
+#define CTRL_BUFF_MAX_SZ (8*1024)
+
+#define DEFAULT_ENCTYPE "application/x-www-form-urlencoded"
+
+int util_read(request_rec *r, const char **rbuf)
+{
+    int rc;
+
+    if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK) {
+        return rc;
+    }
+
+    if (ap_should_client_block(r)) {
+        char argsbuffer[HUGE_STRING_LEN];
+        int rsize, len_read, rpos=0;
+        long length = r->remaining;
+        *rbuf = (char *)apr_pcalloc(r->pool, length +1);
+
+        while ((len_read = ap_get_client_block(r, argsbuffer,
+sizeof(argsbuffer))) > 0) {
+            if ((rpos + len_read) > length) {
+                rsize = length - rpos;
+            } else {
+                rsize = len_read;
+            }
+
+            memcpy((char *)*rbuf + rpos, argsbuffer, rsize);
+            rpos += rsize;
+        }
+
+    }
+
+    return rc;
+}
+
+int read_post(request_rec *r, const char **data)
+{
+    const char *type;
+    int rc = OK;
+
+    if (r->method_number != M_POST) {
+        return rc;
+    }
+
+    type = apr_table_get(r->headers_in, "Content-Type");
+    if (strcasecmp(type, DEFAULT_ENCTYPE) != 0) {
+        return DECLINED;
+    }
+
+    if ((rc = util_read(r, data)) != OK) {
+        return rc;
+    }
+
+    return OK;
+}
+
+
 // TODO: sanitize calloc
 static int proxy_fdpass_handler(request_rec *r, proxy_worker *worker,
                               proxy_server_conf *conf,
@@ -283,11 +340,35 @@ static int proxy_fdpass_handler(request_rec *r, proxy_worker *worker,
     char *headers_out = NULL;
     int ctrlrawsock[2];
     apr_socket_t *ctrlsock = NULL, *clientctrlsock = NULL;
+    apr_size_t wrlen;
+    const char *post_data = NULL;
 
-    if ((headers_out = calloc(8*1024, 1)) != NULL) {
-        apr_table_do(headers_builder, headers_out, r->headers_in, NULL);
+    ap_filter_t *f;
+    ap_filter_rec_t *fg;
+
+    fg = ap_get_output_filter_handle("HTTP_HEADER");
+
+
+    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                  "proxy: FD: filter fg: %lx  func %lx", fg, ap_http_header_filter);
+
+
+    for (f = r->output_filters ; f != NULL ; f = f->next) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "proxy: FD: filter loop: %lx", f->frec);
+        if (f->frec == fg) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                          "proxy: FD: filter found, remove it");
+            ap_remove_output_filter(f);
+            break;
+        }
     }
 
+    if ((headers_out = calloc(CTRL_BUFF_MAX_SZ, 1)) != NULL) {
+        sprintf(headers_out, "The-Request:%s\n", r->the_request);
+        apr_table_do(headers_builder, headers_out, r->headers_in, NULL);
+    }
+    read_post(r, &post_data);
 
     {
         int mop_fd;
@@ -300,10 +381,6 @@ static int proxy_fdpass_handler(request_rec *r, proxy_worker *worker,
         close(mop_fd);
 
     }
-    /*
-    if (headers_out)
-        free(headers_out);
-    */
     if (strncasecmp(url, "fd://", 5) == 0) {
         url += 5;
     }
@@ -375,6 +452,26 @@ static int proxy_fdpass_handler(request_rec *r, proxy_worker *worker,
                       "proxy: FD: send_socket failed:");
         return HTTP_INTERNAL_SERVER_ERROR;
     }
+    strcat(headers_out, "\n");
+    wrlen = strlen(headers_out);
+    rv = apr_socket_send(ctrlsock, headers_out, &wrlen);
+    if (rv != APR_SUCCESS) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                      "proxy: FD: send headers failed");
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+    if (post_data) {
+        wrlen = strlen(post_data);
+        rv = apr_socket_send(ctrlsock, post_data, &wrlen);
+        if (rv != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "proxy: FD: send post failed");
+            return HTTP_INTERNAL_SERVER_ERROR;
+        }
+    }
+    apr_socket_shutdown(ctrlsock, APR_SHUTDOWN_READWRITE);
+    if (headers_out)
+        free(headers_out);
 
     {
         apr_socket_t *dummy;
@@ -405,8 +502,7 @@ static int standard_flush(request_rec *r)
 
     r->connection->keepalive = AP_CONN_CLOSE;
     /* MOP NOTE: set here the content type */
-    // ap_set_content_type(r, apr_pstrdup(p, "text/plain"));
-
+    // ap_set_content_type(r, apr_pstrdup(p, NO_CONTENT_TYPE));
     bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
     e = apr_bucket_flush_create(r->connection->bucket_alloc);