/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "mod_suexec.h"
#include "../filters/mod_include.h"
+#include "mod_core.h"
+
+
/* ### should be tossed in favor of APR */
#include <sys/stat.h>
#include <sys/un.h> /* for sockaddr_un */
module AP_MODULE_DECLARE_DATA cgid_module;
-static void cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *main_server);
+static int cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *main_server);
static int handle_exec(include_ctx_t *ctx, apr_bucket_brigade **bb, request_rec *r,
ap_filter_t *f, apr_bucket *head_ptr, apr_bucket **inserted_head);
#define DEFAULT_BUFBYTES 1024
#define DEFAULT_SOCKET "logs/cgisock"
-#define SHELL_PATH "/bin/sh"
-
#define CGI_REQ 1
#define SSI_REQ 2
return av;
}
+#if APR_HAS_OTHER_CHILD
static void cgid_maint(int reason, void *data, apr_wait_t status)
{
-#if APR_HAS_OTHER_CHILD
pid_t *sd = data;
+
switch (reason) {
case APR_OC_REASON_DEATH:
+ /* don't do anything; server is stopping or restarting */
+ break;
case APR_OC_REASON_LOST:
- /* stop gap to make sure everything else works. In the end,
- * we'll just restart the cgid server. */
- apr_pool_destroy(pcgi);
- kill(getppid(), SIGWINCH);
+ /* it would be better to restart just the cgid child
+ * process but for now we'll gracefully restart the entire
+ * server by sending AP_SIG_GRACEFUL to ourself, the httpd
+ * parent process
+ */
+ kill(getpid(), AP_SIG_GRACEFUL);
break;
case APR_OC_REASON_RESTART:
+ apr_proc_other_child_unregister(data);
+ break;
case APR_OC_REASON_UNREGISTER:
- apr_pool_destroy(pcgi);
+ /* we get here when pcgi is cleaned up; pcgi gets cleaned
+ * up when pconf gets cleaned up
+ */
kill(*sd, SIGHUP);
break;
}
-#endif
}
+#endif
-static void get_req(int fd, request_rec *r, char **filename, char **argv0, char ***env, int *req_type)
+static void get_req(int fd, request_rec *r, char **argv0, char ***env, int *req_type)
{
int i, len, j;
unsigned char *data;
dconf[i] = (void *)suexec_cfg;
}
- r->per_dir_config = dconf;
+ r->per_dir_config = (ap_conf_vector_t *)dconf;
#if 0
#ifdef RLIMIT_CPU
read(fd, &j, sizeof(int));
int sd, sd2, rc, req_type;
mode_t omask;
apr_socklen_t len;
+ apr_pool_t *ptrans;
server_rec *main_server = data;
- cgid_server_conf *sconf = (cgid_server_conf *)ap_get_module_config(
- main_server->module_config, &cgid_module);
+ cgid_server_conf *sconf = ap_get_module_config(main_server->module_config,
+ &cgid_module);
+
+ apr_pool_create(&ptrans, pcgi);
apr_signal(SIGCHLD, SIG_IGN);
if (unlink(sconf->sockname) < 0 && errno != ENOENT) {
while (1) {
int errfileno = STDERR_FILENO;
char *argv0;
- char *filename;
char **env;
const char * const *argv;
- apr_int32_t in_pipe = APR_CHILD_BLOCK;
- apr_int32_t out_pipe = APR_CHILD_BLOCK;
- apr_int32_t err_pipe = APR_CHILD_BLOCK;
- apr_cmdtype_e cmd_type = APR_PROGRAM;
- apr_pool_t *p;
- request_rec *r;
+ apr_int32_t in_pipe;
+ apr_int32_t out_pipe;
+ apr_int32_t err_pipe;
+ apr_cmdtype_e cmd_type;
+ request_rec *r;
apr_procattr_t *procattr = NULL;
apr_proc_t *procnew = NULL;
apr_file_t *inout;
+ apr_pool_clear(ptrans);
len = sizeof(unix_addr);
sd2 = accept(sd, (struct sockaddr *)&unix_addr, &len);
if (errno != EINTR) {
ap_log_error(APLOG_MARK, APLOG_ERR, errno,
(server_rec *)data,
- "Error accepting on cgid socket.");
+ "Error accepting on cgid socket");
}
continue;
}
- apr_pool_create(&p, pcgi);
-
- r = apr_pcalloc(p, sizeof(request_rec));
- procnew = apr_pcalloc(p, sizeof(*procnew));
- r->pool = p;
- get_req(sd2, r, &filename, &argv0, &env, &req_type);
+ r = apr_pcalloc(ptrans, sizeof(request_rec));
+ procnew = apr_pcalloc(ptrans, sizeof(*procnew));
+ r->pool = ptrans;
+ get_req(sd2, r, &argv0, &env, &req_type);
apr_os_file_put(&r->server->error_log, &errfileno, r->pool);
apr_os_file_put(&inout, &sd2, r->pool);
err_pipe = APR_NO_PIPE;
cmd_type = APR_SHELLCMD;
}
+ else {
+ in_pipe = APR_CHILD_BLOCK;
+ out_pipe = APR_CHILD_BLOCK;
+ err_pipe = APR_CHILD_BLOCK;
+ cmd_type = APR_PROGRAM;
+ }
- if (((rc = apr_procattr_create(&procattr, p)) != APR_SUCCESS) ||
+ if (((rc = apr_procattr_create(&procattr, ptrans)) != APR_SUCCESS) ||
((req_type == CGI_REQ) &&
(((rc = apr_procattr_io_set(procattr,
in_pipe,
out_pipe,
err_pipe)) != APR_SUCCESS) ||
+ /* XXX apr_procattr_child_*_set() is creating an unnecessary
+ * pipe between this process and the child being created...
+ * It is cleaned up with the temporary pool for this request.
+ */
((rc = apr_procattr_child_err_set(procattr, r->server->error_log, NULL)) != APR_SUCCESS) ||
((rc = apr_procattr_child_in_set(procattr, inout, NULL)) != APR_SUCCESS))) ||
((rc = apr_procattr_child_out_set(procattr, inout, NULL)) != APR_SUCCESS) ||
}
else {
argv = (const char * const *)create_argv(r->pool, NULL, NULL, NULL, argv0, r->args);
+
+ /* We want to close sd2 for the new CGI process too.
+ * If it is left open it'll make ap_pass_brigade() block
+ * waiting for EOF if CGI forked something running long.
+ * close(sd2) here should be okay, as CGI channel
+ * is already dup()ed by apr_procattr_child_{in,out}_set()
+ * above.
+ */
+ close(sd2);
+
rc = ap_os_create_privileged_process(r, procnew, argv0, argv,
(const char * const *)env,
- procattr, p);
+ procattr, ptrans);
- close(sd2);
if (rc != APR_SUCCESS) {
/* Bad things happened. Everyone should have cleaned up. */
ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
return -1;
}
-static void cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
+static int cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
server_rec *main_server)
{
pid_t pid;
}
if (!first_time) {
- apr_pool_create(&pcgi, p);
-
total_modules = 0;
for (m = ap_preloaded_modules; *m != NULL; m++)
total_modules++;
-
if ((pid = fork()) < 0) {
ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server,
"Couldn't spawn cgid daemon process");
+ /* XXX should we return a failure here ? */
}
else if (pid == 0) {
+ apr_pool_create(&pcgi, p);
cgid_server(main_server);
exit(-1);
}
cgid_pfn_reg_with_ssi("exec", handle_exec);
}
}
+ return OK;
}
static void *create_cgid_config(apr_pool_t *p, server_rec *s)
static const char *set_scriptlog(cmd_parms *cmd, void *dummy, const char *arg)
{
server_rec *s = cmd->server;
- cgid_server_conf *conf =
- (cgid_server_conf *) ap_get_module_config(s->module_config, &cgid_module);
+ cgid_server_conf *conf = ap_get_module_config(s->module_config,
+ &cgid_module);
- conf->logname = arg;
+ conf->logname = ap_server_root_relative(cmd->pool, arg);
return NULL;
}
static const char *set_scriptlog_length(cmd_parms *cmd, void *dummy, const char *arg)
{
server_rec *s = cmd->server;
- cgid_server_conf *conf =
- (cgid_server_conf *) ap_get_module_config(s->module_config, &cgid_module);
+ cgid_server_conf *conf = ap_get_module_config(s->module_config,
+ &cgid_module);
conf->logbytes = atol(arg);
return NULL;
static const char *set_scriptlog_buffer(cmd_parms *cmd, void *dummy, const char *arg)
{
server_rec *s = cmd->server;
- cgid_server_conf *conf =
- (cgid_server_conf *) ap_get_module_config(s->module_config, &cgid_module);
+ cgid_server_conf *conf = ap_get_module_config(s->module_config,
+ &cgid_module);
conf->bufbytes = atoi(arg);
return NULL;
static const char *set_script_socket(cmd_parms *cmd, void *dummy, const char *arg)
{
server_rec *s = cmd->server;
- cgid_server_conf *conf =
- (cgid_server_conf *) ap_get_module_config(s->module_config, &cgid_module);
+ cgid_server_conf *conf = ap_get_module_config(s->module_config,
+ &cgid_module);
conf->sockname = ap_server_root_relative(cmd->pool, arg);
return NULL;
ap_log_rerror(APLOG_MARK, log_flags, rv, r,
"%s: %s", error, r->filename);
+ /* XXX Very expensive mainline case! Open, then getfileinfo! */
if (!conf->logname ||
- ((stat(ap_server_root_relative(r->pool, conf->logname), &finfo) == 0)
+ ((stat(conf->logname, &finfo) == 0)
&& (finfo.st_size > conf->logbytes)) ||
- (apr_file_open(&f, ap_server_root_relative(r->pool, conf->logname),
+ (apr_file_open(&f, conf->logname,
APR_APPEND|APR_WRITE|APR_CREATE, APR_OS_DEFAULT, r->pool) != APR_SUCCESS)) {
return ret;
}
static int log_script(request_rec *r, cgid_server_conf * conf, int ret,
char *dbuf, const char *sbuf, apr_file_t *script_in, apr_file_t *script_err)
{
- apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in);
- apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts;
+ const apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in);
+ const apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts;
char argsbuffer[HUGE_STRING_LEN];
apr_file_t *f = NULL;
int i;
struct stat finfo;
char time_str[APR_CTIME_LEN];
+ /* XXX Very expensive mainline case! Open, then getfileinfo! */
if (!conf->logname ||
- ((stat(ap_server_root_relative(r->pool, conf->logname), &finfo) == 0)
+ ((stat(conf->logname, &finfo) == 0)
&& (finfo.st_size > conf->logbytes)) ||
- (apr_file_open(&f, ap_server_root_relative(r->pool, conf->logname),
+ (apr_file_open(&f, conf->logname,
APR_APPEND|APR_WRITE|APR_CREATE, APR_OS_DEFAULT, r->pool) != APR_SUCCESS)) {
/* Soak up script output */
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == 0)
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_in) == APR_SUCCESS)
continue;
if (script_err) {
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_err) == 0)
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_err) == APR_SUCCESS)
continue;
}
return ret;
apr_file_puts("%response\n", f);
hdrs_arr = apr_table_elts(r->err_headers_out);
- hdrs = (apr_table_entry_t *) hdrs_arr->elts;
+ hdrs = (const apr_table_entry_t *) hdrs_arr->elts;
for (i = 0; i < hdrs_arr->nelts; ++i) {
if (!hdrs[i].key)
if (sbuf && *sbuf)
apr_file_printf(f, "%s\n", sbuf);
- if (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == 0) {
+ if (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == APR_SUCCESS) {
apr_file_puts("%stdout\n", f);
apr_file_puts(argsbuffer, f);
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == 0)
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_in) == APR_SUCCESS)
apr_file_puts(argsbuffer, f);
apr_file_puts("\n", f);
}
if (script_err) {
- if (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_err) == 0) {
+ if (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_err) == APR_SUCCESS) {
apr_file_puts("%stderr\n", f);
apr_file_puts(argsbuffer, f);
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_err) == 0)
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_err) == APR_SUCCESS)
apr_file_puts(argsbuffer, f);
apr_file_puts("\n", f);
}
apr_bucket_brigade *bb;
apr_bucket *b;
char argsbuffer[HUGE_STRING_LEN];
- void *sconf;
cgid_server_conf *conf;
int is_included;
int sd;
if (r->method_number == M_OPTIONS) {
/* 99 out of 100 cgid scripts, this is all they support */
- r->allowed |= (1 << M_GET);
- r->allowed |= (1 << M_POST);
+ r->allowed |= (AP_METHOD_BIT << M_GET);
+ r->allowed |= (AP_METHOD_BIT << M_POST);
return DECLINED;
}
- sconf = r->server->module_config;
- conf = (cgid_server_conf *) ap_get_module_config(sconf, &cgid_module);
+ conf = ap_get_module_config(r->server->module_config, &cgid_module);
is_included = !strcmp(r->protocol, "INCLUDED");
if ((argv0 = strrchr(r->filename, '/')) != NULL)
break;
}
}
- shutdown(sd, 1); /* done writing; force EOF on child's stdin */
}
+ /* we're done writing, or maybe we didn't write at all;
+ * force EOF on child's stdin so that the cgi detects end (or
+ * absence) of data
+ */
+ shutdown(sd, 1);
/* Handle script return... */
if (!nph) {
if (location && location[0] == '/' && r->status == 200) {
/* Soak up all the script output */
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, tempsock) > 0) {
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ tempsock) == APR_SUCCESS) {
continue;
}
/* This redirect needs to be a GET no matter what the original
return HTTP_MOVED_TEMPORARILY;
}
- ap_send_http_header(r);
if (!r->header_only) {
bb = apr_brigade_create(r->pool);
- b = apr_bucket_pipe_creat(tempsock);
+ b = apr_bucket_pipe_create(tempsock);
APR_BRIGADE_INSERT_TAIL(bb, b);
b = apr_bucket_eos_create();
APR_BRIGADE_INSERT_TAIL(bb, b);
if (nph) {
bb = apr_brigade_create(r->pool);
- b = apr_bucket_pipe_creat(tempsock);
+ b = apr_bucket_pipe_create(tempsock);
APR_BRIGADE_INSERT_TAIL(bb, b);
b = apr_bucket_eos_create();
APR_BRIGADE_INSERT_TAIL(bb, b);
apr_bucket *tmp_buck, *tmp2_buck;
if (rr->status != HTTP_OK) {
+ ap_destroy_sub_req(rr);
return -1;
}
/* No hardwired path info or query allowed */
if ((rr->path_info && rr->path_info[0]) || rr->args) {
+ ap_destroy_sub_req(rr);
return -1;
}
- if (rr->finfo.protection == 0) {
+ if (rr->finfo.filetype != APR_REG) {
+ ap_destroy_sub_req(rr);
return -1;
}
rr_status = ap_run_sub_req(rr);
if (ap_is_HTTP_REDIRECT(rr_status)) {
- apr_size_t len_loc, h_wrt;
+ apr_size_t len_loc;
const char *location = apr_table_get(rr->headers_out, "Location");
location = ap_escape_html(rr->pool, location);
len_loc = strlen(location);
+ /* XXX: if most of this stuff is going to get copied anyway,
+ * it'd be more efficient to pstrcat it into a single pool buffer
+ * and a single pool bucket */
+
tmp_buck = apr_bucket_immortal_create("<A HREF=\"", sizeof("<A HREF=\""));
APR_BUCKET_INSERT_BEFORE(head_ptr, tmp_buck);
- tmp2_buck = apr_bucket_heap_create(location, len_loc, 1, &h_wrt);
+ tmp2_buck = apr_bucket_heap_create(location, len_loc, 1);
APR_BUCKET_INSERT_BEFORE(head_ptr, tmp2_buck);
+ /* XXX: this looks like a bug: should be sizeof - 1 */
tmp2_buck = apr_bucket_immortal_create("\">", sizeof("\">"));
APR_BUCKET_INSERT_BEFORE(head_ptr, tmp2_buck);
- tmp2_buck = apr_bucket_heap_create(location, len_loc, 1, &h_wrt);
+ tmp2_buck = apr_bucket_heap_create(location, len_loc, 1);
APR_BUCKET_INSERT_BEFORE(head_ptr, tmp2_buck);
+ /* XXX: this looks like a bug: should be sizeof - 1 */
tmp2_buck = apr_bucket_immortal_create("</A>", sizeof("</A>"));
APR_BUCKET_INSERT_BEFORE(head_ptr, tmp2_buck);
apr_table_setn(e, "PATH_TRANSLATED",
apr_pstrcat(r->pool, pa_req->filename, pa_req->path_info, NULL));
}
+ ap_destroy_sub_req(pa_req);
}
if (r->args) {
char **env;
const char *location;
int sd;
- int retval;
+ apr_status_t rc = APR_SUCCESS;
+ int retval;
apr_bucket_brigade *bcgi;
apr_bucket *b;
struct sockaddr_un unix_addr;
apr_file_t *tempsock = NULL;
- void *sconf = r->server->module_config;
- cgid_server_conf *conf = (cgid_server_conf *) ap_get_module_config(sconf, &cgid_module);
+ cgid_server_conf *conf = ap_get_module_config(r->server->module_config,
+ &cgid_module);
add_ssi_vars(r, f->next);
env = ap_create_environment(r->pool, r->subprocess_env);
"unable to connect to cgi daemon");
}
- SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
+ SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next, rc);
+ if (rc != APR_SUCCESS) {
+ return rc;
+ }
send_req(sd, r, command, env, SSI_REQ);
char argsbuffer[HUGE_STRING_LEN];
/* Soak up all the script output */
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, tempsock) > 0) {
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ tempsock) == APR_SUCCESS) {
continue;
}
/* This redirect needs to be a GET no matter what the original
return HTTP_MOVED_TEMPORARILY;
}
- ap_send_http_header(r);
if (!r->header_only) {
bcgi = apr_brigade_create(r->pool);
- b = apr_bucket_pipe_creat(tempsock);
+ b = apr_bucket_pipe_create(tempsock);
APR_BRIGADE_INSERT_TAIL(bcgi, b);
ap_pass_brigade(f->next, bcgi);
}
/* just in case some stooge changed directories */
}
else if (!strcmp(tag, "cgi")) {
+ apr_status_t retval = APR_SUCCESS;
+
cgid_pfn_ps(r, tag_val, parsed_string, sizeof(parsed_string), 0);
- SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
+ SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next, retval);
+ if (retval != APR_SUCCESS) {
+ return retval;
+ }
+
if (include_cgi(parsed_string, r, f->next, head_ptr, inserted_head) == -1) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"invalid CGI ref \"%s\" in %s", tag_val, file);
projects / apache / blobdiff