#include "ucgi.h"
+static const char *const default_envok[] = {
+ "AUTH_TYPE",
+ "CONTENT_TYPE",
+ "CONTENT_LENGTH",
+ "DOCUMENT_ROOT",
+ "GATEWAY_INTERFACE",
+ "HTTP_*",
+ "HTTPS",
+ "PATH_INFO",
+ "PATH_TRANSLATED",
+ "QUERY_STRING",
+ "REMOTE_*",
+ "REQUEST_METHOD",
+ "REQUEST_URI",
+ "SCRIPT_*",
+ "SERVER_*",
+ 0
+};
+
struct buildargs {
const char **v;
int n, max;
args->v[args->n++]= a;
}
-static void add_userv_var(const char *en, const char *ev,
- struct buildargs *args) {
+static void add_userv_var(const char *fulln,
+ const char *en, const char *ev, void *p) {
+ struct buildargs *args= p;
size_t l;
char *a;
int main(int argc, const char **argv) {
char *username;
- const char *slash2, *pathi, *ev, *en, *av;
- const char *const *ep;
+ const char *slash2, *pathi, *ev, *av;
+ const char *const *envok;
size_t usernamelen, l;
struct buildargs args;
pid_t child, rchild;
if (argc > MAX_ARGS) error("too many arguments");
+ ev= getenv("UCGI_ENV_FILTER");
+ if (ev)
+ envok= load_filters(LOADF_MUST, ev, LF_END);
+ else {
+ envok= load_filters(0, "/etc/userv/ucgi.env-filter", LF_END);
+ if (!envok) envok= default_envok;
+ }
+
pathi= getenv("PATH_INFO");
if (!pathi) error("PATH_INFO not found");
D( if (debugmode) {
if (!isalpha(username[0])) error("username 1st character is not alphabetic");
xsetenv("PATH_INFO",slash2,1);
- args.n= 0; args.max= argc + nenvok + 10;
+ args.n= 0; args.max= argc + MAX_ENVVARS + 10;
args.v= xmalloc(args.max * sizeof(*args.v));
addarg(&args, "userv");
if (debugmode) addarg(&args, "-DDEBUG=1");
- for (ep= envok; (en= *ep); ep++) {
- ev= getenv(en); if (!ev) continue;
- add_userv_var(en, ev, &args);
- }
+ filter_environment(FILTF_WILDCARD, "", envok, add_userv_var, &args);
addarg(&args, username);
addarg(&args, "www-cgi");