Browse Source

[mod_fastcgi,mod_scgi] use temp buffer for cgi_env

personal/stbuehler/mod-csrf
Glenn Strauss 5 years ago
parent
commit
81b8fffd31
  1. 18
      src/mod_fastcgi.c
  2. 26
      src/mod_scgi.c

18
src/mod_fastcgi.c

@ -307,8 +307,6 @@ typedef struct {
typedef struct {
PLUGIN_DATA;
buffer *fcgi_env;
plugin_config **config_storage;
plugin_config conf; /* this is only used as long as no handler_ctx is setup */
@ -761,8 +759,6 @@ INIT_FUNC(mod_fastcgi_init) {
p = calloc(1, sizeof(*p));
p->fcgi_env = buffer_init();
return p;
}
@ -772,8 +768,6 @@ FREE_FUNC(mod_fastcgi_free) {
UNUSED(srv);
buffer_free(p->fcgi_env);
if (p->config_storage) {
size_t i, j, n;
for (i = 0; i < srv->config_context->used; i++) {
@ -1826,7 +1820,7 @@ static int fcgi_create_env(server *srv, handler_ctx *hctx) {
FCGI_Header header;
int request_id;
plugin_data *p = hctx->plugin_data;
buffer *fcgi_env = buffer_init();
fcgi_extension_host *host= hctx->host;
connection *con = hctx->remote_conn;
@ -1855,19 +1849,21 @@ static int fcgi_create_env(server *srv, handler_ctx *hctx) {
memset(beginRecord.body.reserved, 0, sizeof(beginRecord.body.reserved));
/* send FCGI_PARAMS */
buffer_string_prepare_copy(p->fcgi_env, 1023);
buffer_string_prepare_copy(fcgi_env, 1023);
if (0 != http_cgi_headers(srv, con, &opts, fcgi_env_add, p->fcgi_env)) {
if (0 != http_cgi_headers(srv, con, &opts, fcgi_env_add, fcgi_env)) {
con->http_status = 400;
buffer_free(fcgi_env);
return -1;
} else {
buffer *b = buffer_init();
buffer_copy_string_len(b, (const char *)&beginRecord, sizeof(beginRecord));
fcgi_header(&(header), FCGI_PARAMS, request_id, buffer_string_length(p->fcgi_env), 0);
fcgi_header(&(header), FCGI_PARAMS, request_id, buffer_string_length(fcgi_env), 0);
buffer_append_string_len(b, (const char *)&header, sizeof(header));
buffer_append_string_buffer(b, p->fcgi_env);
buffer_append_string_buffer(b, fcgi_env);
buffer_free(fcgi_env);
fcgi_header(&(header), FCGI_PARAMS, request_id, 0, 0);
buffer_append_string_len(b, (const char *)&header, sizeof(header));

26
src/mod_scgi.c

@ -296,8 +296,6 @@ typedef struct {
typedef struct {
PLUGIN_DATA;
buffer *scgi_env;
plugin_config **config_storage;
plugin_config conf; /* this is only used as long as no handler_ctx is setup */
@ -645,8 +643,6 @@ INIT_FUNC(mod_scgi_init) {
p = calloc(1, sizeof(*p));
force_assert(p);
p->scgi_env = buffer_init();
return p;
}
@ -656,8 +652,6 @@ FREE_FUNC(mod_scgi_free) {
UNUSED(srv);
buffer_free(p->scgi_env);
if (p->config_storage) {
size_t i, j, n;
for (i = 0; i < srv->config_context->used; i++) {
@ -1525,7 +1519,7 @@ static int scgi_establish_connection(server *srv, handler_ctx *hctx) {
static int scgi_create_env(server *srv, handler_ctx *hctx) {
buffer *b;
plugin_data *p = hctx->plugin_data;
buffer *scgi_env = buffer_init();
scgi_extension_host *host= hctx->host;
connection *con = hctx->remote_conn;
@ -1536,25 +1530,28 @@ static int scgi_create_env(server *srv, handler_ctx *hctx) {
? scgi_env_add_scgi
: scgi_env_add_uwsgi;
buffer_string_prepare_copy(p->scgi_env, 1023);
buffer_string_prepare_copy(scgi_env, 1023);
if (0 != http_cgi_headers(srv, con, &opts, scgi_env_add, p->scgi_env)) {
if (0 != http_cgi_headers(srv, con, &opts, scgi_env_add, scgi_env)) {
buffer_free(scgi_env);
con->http_status = 400;
return -1;
}
if (hctx->conf.proto == LI_PROTOCOL_SCGI) {
scgi_env_add(p->scgi_env, CONST_STR_LEN("SCGI"), CONST_STR_LEN("1"));
scgi_env_add(scgi_env, CONST_STR_LEN("SCGI"), CONST_STR_LEN("1"));
b = buffer_init();
buffer_append_int(b, buffer_string_length(p->scgi_env));
buffer_append_int(b, buffer_string_length(scgi_env));
buffer_append_string_len(b, CONST_STR_LEN(":"));
buffer_append_string_buffer(b, p->scgi_env);
buffer_append_string_buffer(b, scgi_env);
buffer_append_string_len(b, CONST_STR_LEN(","));
buffer_free(scgi_env);
} else { /* LI_PROTOCOL_UWSGI */
/* http://uwsgi-docs.readthedocs.io/en/latest/Protocol.html */
size_t len = buffer_string_length(p->scgi_env);
size_t len = buffer_string_length(scgi_env);
uint32_t uwsgi_header;
if (len > USHRT_MAX) {
buffer_free(scgi_env);
con->http_status = 431; /* Request Header Fields Too Large */
con->mode = DIRECT;
return -1; /* trigger return of HANDLER_FINISHED */
@ -1564,7 +1561,8 @@ static int scgi_create_env(server *srv, handler_ctx *hctx) {
uwsgi_header = ((uint32_t)uwsgi_htole16((uint16_t)len)) << 8;
memcpy(b->ptr, (char *)&uwsgi_header, 4);
buffer_commit(b, 4);
buffer_append_string_buffer(b, p->scgi_env);
buffer_append_string_buffer(b, scgi_env);
buffer_free(scgi_env);
}
hctx->wb_reqlen = buffer_string_length(b);

Loading…
Cancel
Save