gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: fcgi-app: Add FCGI application and filter

Browse Source 
The FCGI application handles all the configuration parameters used to format
requests sent to an application. The configuration of an application is grouped
in a dedicated section (fcgi-app <name>) and referenced in a backend to be used
(use-fcgi-app <name>). To be valid, a FCGI application must at least define a
document root. But it is also possible to set the default index, a regex to
split the script name and the path-info from the request URI, parameters to set
or unset...  In addition, this patch also adds a FCGI filter, responsible for
all processing on a stream.
This commit is contained in:
Christopher Faulet 2019-08-11 23:11:03 +02:00
parent 63bbf284a1
commit 78fbb9f991
7 changed files with 1296 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -787,7 +787,7 @@ OBJS = src/http_ana.o src/cfgparse-listen.o src/stream.o \
src/protocol.o src/arg.o src/hpack-huff.o src/base64.o src/ring.o \
src/hash.o src/mailers.o src/activity.o src/version.o src/trace.o \
src/mworker.o src/mworker-prog.o src/debug.o src/wdt.o src/dict.o \
src/xprt_handshake.o src/h1_htx.o src/fcgi.o
src/xprt_handshake.o src/h1_htx.o src/fcgi.o src/fcgi-app.o
EBTREE_OBJS = $(EBTREE_DIR)/ebtree.o $(EBTREE_DIR)/eb32sctree.o \
$(EBTREE_DIR)/eb32tree.o $(EBTREE_DIR)/eb64tree.o \

44
include/proto/fcgi-app.h Normal file
View File

@ -0,0 +1,44 @@
/*
* include/proto/fcgi-app.h
* This file defines function prototypes for FCGI applications.
*
* Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, version 2.1
* exclusively.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_HTTP_FCGI_H
#define _PROTO_HTTP_FCGI_H
#include <common/htx.h>
#include <types/fcgi-app.h>
#include <types/proxy.h>
#include <types/stream.h>
struct fcgi_app *fcgi_app_find_by_name(const char *name);
struct fcgi_flt_conf *find_px_fcgi_conf(struct proxy *px);
struct fcgi_flt_ctx *find_strm_fcgi_ctx(struct stream *s);
struct fcgi_app *get_px_fcgi_app(struct proxy *px);
struct fcgi_app *get_strm_fcgi_app(struct stream *s);
#endif /* _PROTO_HTTP_FCGI_H */
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/

1
include/proto/filters.h
View File

@ -33,6 +33,7 @@ extern const char *trace_flt_id;
extern const char *http_comp_flt_id;
extern const char *cache_store_flt_id;
extern const char *spoe_filter_id;
extern const char *fcgi_flt_id;
#define FLT_ID(flt) (flt)->config->id
#define FLT_CONF(flt) (flt)->config->conf

124
include/types/fcgi-app.h Normal file
View File

@ -0,0 +1,124 @@
/*
* include/types/fcgi-app.h
* This file defines everything related to FCGI applications.
*
* Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, version 2.1
* exclusively.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_HTTP_FCGI_H
#define _TYPES_HTTP_FCGI_H
#include <common/config.h>
#include <common/ist.h>
#include <common/fcgi.h>
#include <common/mini-clist.h>
#include <common/regex.h>
#include <ebistree.h>
#include <types/acl.h>
#include <types/filters.h>
#define FCGI_APP_FL_KEEP_CONN 0x00000001 /* Keep the connection alive */
#define FCGI_APP_FL_GET_VALUES 0x00000002 /* Retrieve FCGI variables on connection establishment */
#define FCGI_APP_FL_MPXS_CONNS 0x00000004 /* FCGI APP supports connection multiplexing */
enum fcgi_rule_type {
FCGI_RULE_SET_PARAM = 0,
FCGI_RULE_UNSET_PARAM,
FCGI_RULE_PASS_HDR,
FCGI_RULE_HIDE_HDR,
};
/* Used during configuration parsing only and converted into fcgi_rule when
* filter is created.
*/
struct fcgi_rule_conf {
enum fcgi_rule_type type;
char *name;
char *value;
struct acl_cond *cond; /* acl condition to set/unset the param */
struct list list;
};
/* parameter rule evaluated during request analyzis */
struct fcgi_rule {
enum fcgi_rule_type type;
struct ist name; /* name of the parameter/header */
struct list value; /* log-format compatible expression, may be empty */
struct acl_cond *cond; /* acl condition to set the param */
struct list list;
};
/* parameter rule to set/unset a param at the end of the analyzis */
struct fcgi_param_rule {
struct ist name;
struct list *value; /* if empty , unset the parameter */
struct ebpt_node node;
};
/* header rule to pass/hide a header at the end of the analyzis */
struct fcgi_hdr_rule {
struct ist name;
int pass; /* 1 to pass the header, 0 Otherwise */
struct ebpt_node node;
};
struct fcgi_app {
char *name; /* name to identify this set of params */
struct ist docroot; /* FCGI docroot */
struct ist index; /* filename to append to URI ending by a '/' */
struct my_regex *pathinfo_re; /* Regex to use to split scriptname and path-info */
unsigned int flags; /* FCGI_APP_FL_* */
struct list logsrvs; /* log servers */
unsigned int maxreqs; /* maximum number of concurrent requests */
struct list acls; /* list of acls declared for this application */
struct {
char *file; /* file where the section appears */
int line; /* line where the section appears */
struct list rules; /* list of rules used during config parsing */
struct arg_list args; /* sample arg list that need to be resolved */
} conf; /* config information */
struct fcgi_app *next; /* used to chain fcgi-app */
};
/* FCGI config attached to backend proxies */
struct fcgi_flt_conf {
char *name; /* fcgi-app name used during config parsing */
struct fcgi_app *app; /* configuration of the fcgi application */
struct list param_rules; /* list of set/unset rules */
struct list hdr_rules; /* list of pass/add rules */
};
/* FCGI context attached to streames */
struct fcgi_flt_ctx {
struct filter *filter;
struct fcgi_app *app;
};
#endif /* _TYPES_HTTP_FCGI_H */
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/

4
src/cache.c
View File

@ -181,9 +181,11 @@ cache_store_check(struct proxy *px, struct flt_conf *fconf)
}
else if (f->id == http_comp_flt_id)
comp = 1;
else if (f->id == fcgi_flt_id)
continue;
else if ((f->id != fconf->id) && (cconf->flags & CACHE_FLT_F_IMPLICIT_DECL)) {
/* Implicit declaration is only allowed with the
* compression. For other filters, an implicit
* compression and fcgi. For other filters, an implicit
* declaration is required. */
ha_alert("config: %s '%s': require an explicit filter declaration "
"to use the cache '%s'.\n", proxy_type_str(px), px->id, cache->id);

1121
src/fcgi-app.c Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/flt_http_comp.c
View File

@ -739,6 +739,8 @@ check_implicit_http_comp_flt(struct proxy *proxy)
goto end;
}
}
else if (fconf->id == fcgi_flt_id)
continue;
else
explicit = 1;
}