www-cgi/: Decentralize the whitelist of environment variables.

[userv-utils.git] / www-cgi / ucgi.c

diff --git a/www-cgi/ucgi.c b/www-cgi/ucgi.c
index 374fea5c0f1f03eef014f12f2ca649337ba23506..006f8ae4cd93223986d15c146967d032908eeefa 100644 (file)
--- a/www-cgi/ucgi.c
+++ b/www-cgi/ucgi.c
@@ -30,14 +30,54 @@
 
 #include "ucgi.h"
 
+static const char *const 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;
+};
+
+static void addarg(struct buildargs *args, const char *a) {
+  if (args->n > args->max) error("too many arguments");
+  args->v[args->n++]= a;
+}
+
+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;
+
+  l= strlen(ev); if (l > MAX_ENVVAR_VALUE) error("environment variable too long");
+  a= xmalloc(strlen(en)+l+6);
+  sprintf(a,"-DE_%s=%s",en,ev);
+  addarg(args, a);
+}
+
 int main(int argc, const char **argv) {
-  char *defarg, *username;
-  const char *slash2, *pathi, *ev, *en, *av;
-  const char *const *ep;
-  const char **arguments;
+  char *username;
+  const char *slash2, *pathi, *av;
   size_t usernamelen, l;
+  struct buildargs args;
   pid_t child, rchild;
-  int nargs, status;
+  int status;
 
   l= strlen(argv[0]);
   if (l>6 && !strcmp(argv[0]+l-6,"-debug")) debugmode= 1;
@@ -68,25 +108,19 @@ int main(int argc, const char **argv) {
        printf(";;   user = `%s'; tail = `%s'\n", username, slash2); )
   if (!isalpha(username[0])) error("username 1st character is not alphabetic");
   xsetenv("PATH_INFO",slash2,1);
+
+  args.n= 0; args.max= argc + MAX_ENVVARS + 10;
+  args.v= xmalloc(args.max * sizeof(*args.v));
   
-  arguments= xmalloc(sizeof(const char*)*(nenvok+argc+10));
-  nargs= 0;
-  
-  arguments[nargs++]= "userv";
-  if (debugmode) arguments[nargs++]= "-DDEBUG=1";
-  
-  for (ep= envok; (en= *ep); ep++) {
-    ev= getenv(en); if (!ev) continue;
-    l= strlen(ev); if (l > MAX_ENVVAR_VALUE) error("environment variable too long");
-    defarg= xmalloc(strlen(en)+l+6);
-    sprintf(defarg,"-DE_%s=%s",en,ev);
-    arguments[nargs++]= defarg;
-  }
+  addarg(&args, "userv");
+  if (debugmode) addarg(&args, "-DDEBUG=1");
+
+  filter_environment(FILTF_WILDCARD, "", envok, add_userv_var, &args);
 
-  arguments[nargs++]= username;
-  arguments[nargs++]= "www-cgi";
-  while ((av= (*++argv))) arguments[nargs++]= av;
-  arguments[nargs++]= 0;
+  addarg(&args, username);
+  addarg(&args, "www-cgi");
+  while ((av= (*++argv))) addarg(&args, av);
+  addarg(&args, 0);
 
   if (debugmode) {
     D( fflush(stdout); )
@@ -103,12 +137,12 @@ int main(int argc, const char **argv) {
        int i;
 
        printf(";; final command line...\n");
-       for (i = 0; arguments[i]; i++)
-        printf(";;   %s\n", arguments[i]);
+       for (i = 0; args.v[i]; i++)
+        printf(";;   %s\n", args.v[i]);
        fflush(stdout);
   } )
 
-  execvp("userv",(char*const*)arguments);
+  execvp("userv",(char*const*)args.v);
   syserror("exec userv");
   return -1;
 }