Changeset 506

Timestamp:

08/08/2005 10:00:24 AM (3 years ago)

Author:

moo

Message:

include_shell option support in configuration

Location:

trunk

Files:

• doc/configuration.txt (modified) (2 diffs)
• doc/lighttpd.conf (modified) (1 diff)
• src/.cvsignore (modified) (1 diff)
• src/Makefile.am (modified) (4 diffs)
• src/configfile.c (modified) (20 diffs)
• src/configfile.h (modified) (1 diff)
• src/configparser.y (modified) (5 diffs)
• src/plugin.c (modified) (1 diff)
• src/plugin.h (modified) (1 diff)
• src/proc_open.c (added)
• src/proc_open.h (added)
• tests/core-var-include.t (modified) (3 diffs)
• tests/var-include-sub.conf (modified) (1 diff)

trunk/doc/configuration.txt

@@ -36 +36 @@
   <array>  : "(" [ <string> "=>" ] <value> [, [ <string> "=>" ] <value> ]* ")"
   INCLUDE  : "include" VALUE
+  INCLUDE_SHELL : "include_shell" STRING_VALUE
   
 Example
@@ -57 +58 @@
   # include, relative to dirname of main config file
   include "mime.types.conf"
+
+  # read configuration from output of a command
+  include_shell "/usr/local/bin/confmimetype /etc/mime.types"
 
 

trunk/doc/lighttpd.conf

@@ -299 +299 @@
 ## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
 #include "lighttpd-inc.conf"
+
+#### include_shell
+#include_shell "echo var.a=1"
+## the above is same as:
+#var.a=1

trunk/src/.cvsignore

@@ -10 +10 @@
 .libs
 array
+proc_open
+regex
 mod_ssi_exprparser.c
 mod_ssi_exprparser.h

trunk/src/Makefile.am

@@ -1 @@
-noinst_PROGRAMS=array lemon # simple-fcgi #graphic evalo bench ajp ssl error_test adserver gen-license
+noinst_PROGRAMS=array proc_open lemon # simple-fcgi #graphic evalo bench ajp ssl error_test adserver gen-license
 sbin_PROGRAMS=lighttpd 
 bin_PROGRAMS=spawn-fcgi
@@ -43 +43 @@
       network_freebsd_sendfile.c network_writev.c \
       network_solaris_sendfilev.c network_openssl.c \
-      network_send.c network-glue.c fdevent-glue.c
+      network_send.c network-glue.c fdevent-glue.c \
+      proc_open.c
 
 src = server.c response.c connections.c configfile.c configparser.c \
@@ -226 +227 @@
       sys-mmap.h sys-socket.h file_descr.h \
       file_cache_funcs.h file_descr_funcs.h \
-      chunk_funcs.h
+      chunk_funcs.h proc_open.h
       
 
@@ -238 +239 @@
 array_CPPFLAGS= -DDEBUG_ARRAY
 
+proc_open_SOURCES = proc_open.c buffer.c
+proc_open_CPPFLAGS= -DDEBUG_PROC_OPEN
+
 #gen_license_SOURCES = license.c md5.c buffer.c gen_license.c
 

trunk/src/configfile.c

@@ -20 +20 @@
 #include "configparser.h"
 #include "configfile.h"
+#include "proc_open.h"
 
 
@@ -292 +293 @@
 }
 #undef PATCH
+
 typedef struct {
         int foo;
         int bar;
         
-        buffer *file;
-        stream s;
+        const buffer *source;
         const char *input;
         size_t offset;
@@ -309 +310 @@
         int in_cond;
 } tokenizer_t;
-
-static int tokenizer_open(server *srv, tokenizer_t *t, buffer *basedir, const char *fn) {
-        if (buffer_is_empty(basedir) &&
-                        (fn[0] == '/' || fn[0] == '\\') &&
-                        (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) {
-                t->file = buffer_init_string(fn);
-        }
-        else {
-                t->file = buffer_init_buffer(basedir);
-                buffer_append_string(t->file, fn);
-        }
-
-        if (0 != stream_open(&(t->s), t->file)) {
-                log_error_write(srv, __FILE__, __LINE__, "sbss", 
-                                "opening configfile ", t->file, "failed:", strerror(errno));
-                buffer_free(t->file);
-                return -1;
-        }
-
-        t->input = t->s.start;
-        t->offset = 0;
-        t->size = t->s.size;
-        t->line = 1;
-        t->line_pos = 1;
-        
-        t->in_key = 1;
-        t->in_brace = 0;
-        t->in_cond = 0;
-        return 0;
-}
-
-static int tokenizer_close(server *srv, tokenizer_t *t) {
-        UNUSED(srv);
-
-        buffer_free(t->file);
-        return stream_close(&(t->s));
-}
 
 static int config_skip_newline(tokenizer_t *t) {
@@ -387 +351 @@
                                 } else {
                                         log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                        "file:", t->file,
+                                                        "source:", t->source,
                                                         "line:", t->line, "pos:", t->line_pos, 
                                                         "use => for assignments in arrays");
@@ -407 +371 @@
                                 } else {
                                         log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                        "file:", t->file,
+                                                        "source:", t->source,
                                                         "line:", t->line, "pos:", t->line_pos, 
                                                         "only =~ and == are allow in the condition");
@@ -423 +387 @@
                         } else {
                                 log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                "file:", t->file,
+                                                "source:", t->source,
                                                 "line:", t->line, "pos:", t->line_pos, 
                                                 "unexpected equal-sign: =");
@@ -446 +410 @@
                                 } else {
                                         log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                        "file:", t->file,
+                                                        "source:", t->source,
                                                         "line:", t->line, "pos:", t->line_pos, 
                                                         "only !~ and != are allow in the condition");
@@ -455 +419 @@
                         } else {
                                 log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                "file:", t->file,
+                                                "source:", t->source,
                                                 "line:", t->line, "pos:", t->line_pos, 
                                                 "unexpected exclamation-marks: !");
@@ -545 +509 @@
                                 
                                 log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                "file:", t->file,
+                                                "source:", t->source,
                                                 "line:", t->line, "pos:", t->line_pos, 
                                                 "missing closing quote");
@@ -588 +552 @@
                                 buffer_copy_string(token, "+=");
                                 tid = TK_APPEND;
-                        }
-                        else {
+                        } else {
                                 t->offset++;
                                 tid = TK_PLUS;
@@ -650 +613 @@
                                         /* ERROR */
                                         log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                        "file:", t->file,
+                                                        "source:", t->source,
                                                         "line:", t->line, "pos:", t->line_pos, 
                                                         "invalid character in condition");
@@ -670 +633 @@
                                         /* ERROR */
                                         log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                        "file:", t->file,
+                                                        "source:", t->source,
                                                         "line:", t->line, "pos:", t->line_pos, 
                                                         "unexpected EOF");
@@ -676 +639 @@
                                         return -1;
                                 }
-                        }
-                        else {
+                        } else {
                                 /* the key might consist of [-.0-9a-z] */
                                 for (i = 0; t->input[t->offset + i] && 
@@ -690 +652 @@
                                         if (strcmp(token->ptr, "include") == 0) {
                                                 tid = TK_INCLUDE;
-                                        }
-                                        else if (strcmp(token->ptr, "else") == 0) {
+                                        } else if (strcmp(token->ptr, "include_shell") == 0) {
+                                                tid = TK_INCLUDE_SHELL;
+                                        } else if (strcmp(token->ptr, "else") == 0) {
                                                 tid = TK_ELSE;
-                                        }
-                                        else {
+                                        } else {
                                                 tid = TK_LKEY;
                                         }
@@ -703 +665 @@
                                         /* ERROR */
                                         log_error_write(srv, __FILE__, __LINE__, "sbsdsds", 
-                                                        "file:", t->file,
+                                                        "source:", t->source,
                                                         "line:", t->line, "pos:", t->line_pos, 
                                                         "invalid character in variable name");
@@ -717 +679 @@
 #if 0
                 log_error_write(srv, __FILE__, __LINE__, "sbsdsdbdd", 
-                                "file:", t->file,
+                                "source:", t->source,
                                 "line:", t->line, "pos:", t->line_pos,
                                 token, token->used - 1, tid);
@@ -731 +693 @@
 }
 
-int config_parse_file(server *srv, config_t *context, const char *fn) {
-        tokenizer_t t;
+static int config_parse(server *srv, config_t *context, tokenizer_t *t) {
         void *pParser;
         int token_id;
@@ -738 +699 @@
         int ret;
 
-        if (tokenizer_open(srv, &t, context->basedir, fn) == -1) {
-                return -1;
-        }
-        
         pParser = configparserAlloc( malloc );
         lasttoken = buffer_init();
         token = buffer_init();
-        while((1 == (ret = config_tokenizer(srv, &t, &token_id, token))) && context->ok) {
+        while((1 == (ret = config_tokenizer(srv, t, &token_id, token))) && context->ok) {
                 buffer_copy_string_buffer(lasttoken, token);
                 configparser(pParser, token_id, token, context);
@@ -765 +722 @@
                 log_error_write(srv, __FILE__, __LINE__, "sb", 
                                 "configfile parser failed:", lasttoken);
-        }
-        else if (context->ok == 0) {
+        } else if (context->ok == 0) {
                 log_error_write(srv, __FILE__, __LINE__, "sbsdsdsb", 
-                                "file:", t.file,
-                                "line:", t.line, "pos:", t.line_pos, 
+                                "source:", t->source,
+                                "line:", t->line, "pos:", t->line_pos, 
                                 "parser failed somehow near here:", lasttoken);
                 ret = -1;
@@ -775 +731 @@
         buffer_free(lasttoken);
 
-        tokenizer_close(srv, &t);
         return ret == -1 ? -1 : 0;
+}
+
+static int tokenizer_init(tokenizer_t *t, const buffer *source, const char *input, size_t size) {
+
+        t->source = source;
+        t->input = input;
+        t->size = size;
+        t->offset = 0;
+        t->line = 1;
+        t->line_pos = 1;
+        
+        t->in_key = 1;
+        t->in_brace = 0;
+        t->in_cond = 0;
+        return 0;
+}
+
+int config_parse_file(server *srv, config_t *context, const char *fn) {
+        tokenizer_t t;
+        stream s;
+        int ret;
+        buffer *filename;
+
+        if (buffer_is_empty(context->basedir) &&
+                        (fn[0] == '/' || fn[0] == '\\') &&
+                        (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) {
+                filename = buffer_init_string(fn);
+        } else {
+                filename = buffer_init_buffer(context->basedir);
+                buffer_append_string(filename, fn);
+        }
+
+        if (0 != stream_open(&s, filename)) {
+                log_error_write(srv, __FILE__, __LINE__, "sbss", 
+                                "opening configfile ", filename, "failed:", strerror(errno));
+                ret = -1;
+        } else {
+                tokenizer_init(&t, filename, s.start, s.size);
+                ret = config_parse(srv, context, &t);
+        }
+
+        stream_close(&s);
+        buffer_free(filename);
+        return ret;
+}
+
+int config_parse_cmd(server *srv, config_t *context, const char *cmd) {
+        proc_handler_t proc;
+        tokenizer_t t;
+        int ret;
+        buffer *source;
+        buffer *out;
+        char oldpwd[PATH_MAX];
+
+        if (NULL == getcwd(oldpwd, sizeof(oldpwd))) {
+                log_error_write(srv, __FILE__, __LINE__, "s", 
+                                "cannot get cwd", strerror(errno));
+                return -1;
+        }
+
+        source = buffer_init_string(cmd);
+        out = buffer_init();
+
+        if (!buffer_is_empty(context->basedir)) {
+                chdir(context->basedir->ptr);
+        }
+
+        if (0 != proc_open_buffer(&proc, cmd, NULL, out, NULL)) {
+                log_error_write(srv, __FILE__, __LINE__, "sbss", 
+                                "opening", source, "failed:", strerror(errno));
+                ret = -1;
+        } else {
+                tokenizer_init(&t, source, out->ptr, out->used);
+                ret = config_parse(srv, context, &t);
+        }
+
+        buffer_free(source);
+        buffer_free(out);
+        chdir(oldpwd);
+        return ret;
 }
 

trunk/src/configfile.h

@@ -19 +19 @@
 void configparser(void *yyp, int yymajor, buffer *yyminor, config_t *ctx);
 int config_parse_file(server *srv, config_t *context, const char *fn);
+int config_parse_cmd(server *srv, config_t *context, const char *cmd);
 
 #endif

trunk/src/configparser.y

@@ -132 +132 @@
 metaline ::= condlines(A) EOL. { A = NULL; }
 metaline ::= include.
+metaline ::= include_shell.
 metaline ::= EOL.
 
@@ -142 +143 @@
 %type       array                  {array *}
 %type       key                    {buffer *}
+%type       stringop               {buffer *}
 
 %type       cond                   {config_cond_t }
@@ -151 +153 @@
 %destructor array                  { array_free($$); }
 %destructor key                    { buffer_free($$); }
+%destructor stringop               { buffer_free($$); }
 
 %token_type                        {buffer *}
@@ -346 +349 @@
   default:
     assert(0);
-    break;
+    return;
   }
 
@@ -469 +472 @@
 }
 
-include ::= INCLUDE expression(A). {
+stringop(A) ::= expression(B). {
+  A = NULL;
   if (ctx->ok) {
-    if (A->type != TYPE_STRING) {
-      fprintf(stderr, "file must be string");
+    if (B->type != TYPE_STRING) {
+      fprintf(stderr, "operand must be string");
       ctx->ok = 0;
     } else {
-      buffer *file = ((data_string*)A)->value;
-      if (0 != config_parse_file(ctx->srv, ctx, file->ptr)) {
-        ctx->ok = 0;
-      }
-    }
-  }
-  A->free(A);
-  A = NULL;
-}
+      A = buffer_init_buffer(((data_string*)B)->value);
+    }
+  }
+  B->free(B);
+  B = NULL;
+}
+
+include ::= INCLUDE stringop(A). {
+  if (ctx->ok) {
+    if (0 != config_parse_file(ctx->srv, ctx, A->ptr)) {
+      ctx->ok = 0;
+    }
+    buffer_free(A);
+    A = NULL;
+  }
+}
+
+include_shell ::= INCLUDE_SHELL stringop(A). {
+  if (ctx->ok) {
+    if (0 != config_parse_cmd(ctx->srv, ctx, A->ptr)) {
+      ctx->ok = 0;
+    }
+    buffer_free(A);
+    A = NULL;
+  }
+}

trunk/src/plugin.c

@@ -62 +62 @@
         if (p->name) buffer_free(p->name);
 #ifdef HAVE_VALGRIND_VALGRIND_H
-        if (RUNNING_ON_VALGRIND) use_dlclose = 0;
+        /*if (RUNNING_ON_VALGRIND) use_dlclose = 0;*/
 #endif
 

trunk/src/plugin.h

@@ -88 +88 @@
 int config_patch_connection(server *srv, connection *con, comp_key_t comp);
 int config_check_cond(server *srv, connection *con, data_config *dc);
+int config_append_cond_match_buffer(connection *con, data_config *dc, buffer *buf, int n);
 
 #endif

trunk/tests/core-var-include.t

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 15;
+use Test::More tests => 16;
 
 my $basedir = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..');
@@ -194 +194 @@
         @request  = ( "GET /index.html HTTP/1.0\r\nHost: www.example.org\r\n" );
         @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 301, 'Location' => "/redirect" } );
-    skip "redirect is not working as expected", 12 if handle_http != 0; 
+    skip "redirect is not working as expected", 13 if handle_http != 0; 
         my $myvar = "good";
         my $server_name = "test.example.org";
@@ -213 +213 @@
                 "array_append"   => "/good_array_append",
                 "string_append"  => "/good_" . $mystr,
-                "number_append"  => "/good_" . "2"
+                "number_append"  => "/good_" . "2",
+
+                "include_shell"  => "/good_include_shell_" . "456"
         };
         foreach my $test (keys %{ $tests }) {

trunk/tests/var-include-sub.conf

@@ -26 +26 @@
                         "^/number_append$" => "/good_" + one,
                         )
+
+        cmd = "echo cmd_ok=456"
+        include_shell cmd
+        url.redirect += (
+                        "^/include_shell$" => "/good_include_shell_" + cmd_ok,
+                        )
 }