- add lua to do client verification

- only use gcrypt locking when required to

9 files changed, 363 insertions, 22 deletions

diff --git a/Makefile.am b/Makefile.am
index 47ab508..77f3b84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2
 
 EXTRA_DIST = m4/outoforder.m4 m4/apache.m4 \
                 m4/libgnutls.m4 m4/apr_memcache.m4 \
-                m4/apache_test.m4 \
+                m4/apache_test.m4 m4/lua.m4 \
                 include/mod_gnutls.h.in \
                 README \
                 NOTICE LICENSE autogen.sh
diff --git a/configure.ac b/configure.ac
index a16da41..fb84c67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AC_SUBST(LIBTOOL)
 MIN_TLS_VERSION=1.2.0
 CHECK_LIBGNUTLS($MIN_TLS_VERSION)
 
+CHECK_LUA()
+
 have_apr_memcache=0
 CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
 AC_SUBST(have_apr_memcache)
diff --git a/include/mod_gnutls.h.in b/include/mod_gnutls.h.in
index e787beb..3473bf1 100644
--- a/include/mod_gnutls.h.in
+++ b/include/mod_gnutls.h.in
@@ -72,6 +72,8 @@ typedef enum
 typedef struct
 {
     int client_verify_mode;
+    const char* lua_bytecode;
+    apr_size_t lua_bytecode_len;
 } mgs_dirconf_rec;
 
 typedef struct
@@ -235,11 +237,18 @@ const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
 
 const char *mgs_set_enabled(cmd_parms * parms, void *dummy,
                             const char *arg);
-
+                            
+const char *mgs_set_require_section(cmd_parms *cmd, 
+                                    void *mconfig, const char *arg);
 void *mgs_config_server_create(apr_pool_t * p, server_rec * s);
 
+void *mgs_config_dir_merge(apr_pool_t *p, void *basev, void *addv);
+
 void *mgs_config_dir_create(apr_pool_t *p, char *dir);
 
+const char *mgs_set_require_bytecode(cmd_parms *cmd, 
+                                    void *mconfig, const char *arg);
+
 mgs_srvconf_rec* mgs_find_sni_server(gnutls_session_t session);
 
 /* mod_gnutls Hooks. */
@@ -263,4 +272,6 @@ int mgs_hook_fixups(request_rec *r);
 
 int mgs_hook_authz(request_rec *r);
 
+int mgs_authz_lua(request_rec* r);
+
 #endif /*  __mod_gnutls_h_inc */
diff --git a/mod_gnutls.xcode/project.pbxproj b/mod_gnutls.xcode/project.pbxproj
index 08b50e1..8329c2e 100644
--- a/mod_gnutls.xcode/project.pbxproj
+++ b/mod_gnutls.xcode/project.pbxproj
@@ -23,8 +23,18 @@
                         refType = 2;
                         sourceTree = SOURCE_ROOT;
                 };
+                4541F3CF081DC7F1007457C1 = {
+                        fileEncoding = 4;
+                        isa = PBXFileReference;
+                        lastKnownFileType = sourcecode.c.c;
+                        name = gnutls_lua.c;
+                        path = src/gnutls_lua.c;
+                        refType = 4;
+                        sourceTree = "<group>";
+                };
                 45B624630802F1E200CBFD9A = {
                         children = (
+                                4541F3CF081DC7F1007457C1,
                                 4541F3BA081C4B1A007457C1,
                                 4541F3C5081C4F2B007457C1,
                                 45B6246D0802F20D00CBFD9A,
diff --git a/src/Makefile.am b/src/Makefile.am
index c6d42c9..59c8909 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 CLEANFILES = .libs/libmod_gnutls *~
 
-libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c
-libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS}
-libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS}
+libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c gnutls_lua.c
+libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS} ${LUA_CFLAGS}
+libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS} ${LUA_LIBS}
 
 lib_LTLIBRARIES = libmod_gnutls.la
 
diff --git a/src/gnutls_config.c b/src/gnutls_config.c
index f9a315c..1194448 100644
--- a/src/gnutls_config.c
+++ b/src/gnutls_config.c
@@ -317,12 +317,27 @@ void *mgs_config_server_create(apr_pool_t * p, server_rec * s)
     return sc;
 }
 
+void *mgs_config_dir_merge(apr_pool_t *p, void *basev, void *addv)
+{
+    mgs_dirconf_rec *new;
+    mgs_dirconf_rec *base = (mgs_dirconf_rec *) basev;
+    mgs_dirconf_rec *add = (mgs_dirconf_rec *) addv;
+    
+    new = (mgs_dirconf_rec *) apr_pcalloc(p, sizeof(mgs_dirconf_rec));
+    new->lua_bytecode = apr_pstrmemdup(p, add->lua_bytecode,
+                                       add->lua_bytecode_len);
+    new->lua_bytecode_len = add->lua_bytecode_len;
+    new->client_verify_mode = add->client_verify_mode;
+    return new;
+}
+
 void *mgs_config_dir_create(apr_pool_t *p, char *dir)
 {
     mgs_dirconf_rec *dc = apr_palloc(p, sizeof(*dc));
     
     dc->client_verify_mode = -1;
-    
+    dc->lua_bytecode = NULL;
+    dc->lua_bytecode_len = 0;
     return dc;
 }
 
diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
index 2d12b51..3862c9d 100644
--- a/src/gnutls_hooks.c
+++ b/src/gnutls_hooks.c
@@ -17,6 +17,7 @@
 
 #include "mod_gnutls.h"
 #include "http_vhost.h"
+#include "ap_mpm.h"
 
 #if !USING_2_1_RECENT
 extern server_rec *ap_server_conf;
@@ -30,6 +31,8 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 static apr_file_t* debug_log_fp;
 #endif
 
+static int mpm_is_threaded;
+
 static apr_status_t mgs_cleanup_pre_config(void *data)
 {
     gnutls_global_deinit();
@@ -48,8 +51,12 @@ int mgs_hook_pre_config(apr_pool_t * pconf,
 {
 
 #if APR_HAS_THREADS
-    /* TODO: Check MPM Type here */
-    gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+    ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_is_threaded);
+    if (mpm_is_threaded) {
+        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+    }
+#else
+    mpm_is_threaded = 0;
 #endif
 
     gnutls_global_init();
@@ -234,11 +241,6 @@ int mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog,
             rv = gnutls_x509_crt_get_dn_by_oid(sc->cert_x509, 
                                                GNUTLS_OID_X520_COMMON_NAME, 0, 0,
                                                sc->cert_cn, &data_len);
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
-                         s,
-                         "GnuTLS: sni-x509 cn: %s/%d pk: %s s: 0x%08X sc: 0x%08X", sc->cert_cn, rv,
-                         gnutls_pk_algorithm_get_name(gnutls_x509_privkey_get_pk_algorithm(sc->privkey_x509)),
-                         (unsigned int)s, (unsigned int)sc);
         }
     }
 
@@ -568,7 +570,6 @@ int mgs_hook_fixups(request_rec *r)
         gnutls_x509_crt_get_issuer_dn(ctxt->sc->cert_x509, buf, &len);
         apr_table_setn(env, "SSL_SERVER_I_DN", apr_pstrmemdup(r->pool, buf, len));
     }
-    
     return rv;
 }
 
@@ -585,11 +586,14 @@ int mgs_hook_authz(request_rec *r)
     if (!ctxt) {
         return DECLINED;
     }
-    
-    if (!dc) {
-        dc = mgs_config_dir_create(r->pool, NULL);
+    ap_add_common_vars(r);
+    mgs_hook_fixups(r);
+    status = mgs_authz_lua(r);
+    if (status != 0) {
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                      "GnuTLS: FAILED Lua Authorization Test");
+        return HTTP_FORBIDDEN;
     }
-
     if (dc->client_verify_mode == GNUTLS_CERT_IGNORE) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
                       "GnuTLS: Directory set to Ignore Client Certificate!");
diff --git a/src/gnutls_lua.c b/src/gnutls_lua.c
new file mode 100644
index 0000000..6d80574
--- /dev/null
+++ b/src/gnutls_lua.c
@@ -0,0 +1,292 @@
+/**
+ *  Copyright 2004-2005 Paul Querna
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#include "mod_gnutls.h"
+
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+
+#include <ctype.h>
+
+static char *MGS_LUA_RRKEY = "request_rec";
+
+static request_rec *mgs_lua_getrr(lua_State *lvm)
+{
+    request_rec *r;
+    
+    /* Push the request_rec off the registry, onto the stack. */
+    lua_pushlightuserdata(lvm, MGS_LUA_RRKEY);
+    lua_gettable(lvm, LUA_REGISTRYINDEX);
+    r = lua_touserdata(lvm, -1);
+    lua_pop(lvm, 1); 
+    return r;
+}
+
+static int get_request_table(lua_State *lvm, long offset)
+{   
+    const char *key;
+    request_rec *r;
+    const char *value;
+    apr_table_t *t;
+    key = luaL_checkstring(lvm, 1);
+
+    r = mgs_lua_getrr(lvm);
+    
+    t = *(apr_table_t **)((char *)r + offset);
+
+    value = apr_table_get(t, key);
+
+    if (value) {
+        lua_pushstring(lvm, value); 
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+
+static int mgs_lua_getenv(lua_State *lvm)
+{
+    return get_request_table(lvm, APR_OFFSETOF(request_rec, subprocess_env));
+}
+
+static int mgs_lua_getheader(lua_State *lvm)
+{   
+    return get_request_table(lvm, APR_OFFSETOF(request_rec, headers_in));
+} 
+
+static const luaL_reg mgs_lua_reg[] = {
+    {"getenv", mgs_lua_getenv},
+    {"header", mgs_lua_getheader},
+    {NULL, NULL}
+};
+
+lua_State* get_luastate() 
+{
+    lua_State* lvm = lua_open();
+    luaopen_base(lvm);
+    luaopen_io(lvm);
+    luaopen_table(lvm);
+    luaopen_string(lvm);
+    luaopen_math(lvm);
+    luaopen_loadlib(lvm);
+    luaL_openlib(lvm, "ap", mgs_lua_reg, 0);
+    
+    return lvm;
+}
+
+int mgs_authz_lua(request_rec* r)
+{
+    int rv;
+    lua_State* lvm;
+    mgs_dirconf_rec *dc = ap_get_module_config(r->per_dir_config,
+                                               &gnutls_module);
+    
+    if (dc->lua_bytecode_len <= 0) {
+        return 0;
+    }
+    
+    lvm = get_luastate();
+    lua_pushlightuserdata(lvm, MGS_LUA_RRKEY);
+    lua_pushlightuserdata(lvm, r);
+    lua_settable(lvm, LUA_REGISTRYINDEX);
+    
+    /* Push Bytecode onto the stack */
+    rv = luaL_loadbuffer(lvm, dc->lua_bytecode, dc->lua_bytecode_len, "gnutls-lua");
+
+    if (rv != 0) {
+        /* Get the Error message */
+        const char* error = lua_tostring(lvm, -1);
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                      "GnuTLS: Error Loading Lua Bytecode: %s", error);
+        lua_pop(lvm, 1);
+        return -1;
+    }
+    
+    rv = lua_pcall(lvm, 0, 1, 0);
+    if (rv != 0) {
+        /* Get the Error message */
+        const char* error = lua_tostring(lvm, -1);
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                      "GnuTLS: Error Running Lua: %s", error);
+        lua_pop(lvm, 1);
+        return -1;
+    }
+    
+    rv = (int)lua_tonumber(lvm, -1);
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                  "GnuTLS: (%d) Lua Return: %d",
+                  dc->lua_bytecode_len, rv);
+    lua_pop(lvm, 1);
+    lua_close(lvm);
+    return rv;
+}
+
+static apr_size_t config_getstr(ap_configfile_t *cfg, char *buf, size_t bufsiz)
+{
+    apr_size_t i = 0;
+    
+    if (cfg->getstr) {
+        const char *res = (cfg->getstr)(buf, bufsiz, cfg->param);
+        if (res) {
+            i = strlen(buf);
+            if (i && buf[i - 1] == '\n') ++cfg->line_number;
+        }
+        else {
+            buf[0] = '\0';
+            i = 0;
+        }
+    }
+    else {
+        while (i < bufsiz) {
+            int ch = (cfg->getch)(cfg->param);
+            if (ch == EOF) break;
+            buf[i++] = ch;
+            if (ch == '\n') {
+                ++cfg->line_number;
+                break;
+            }
+        }
+    }
+    return i;
+}
+
+struct cr_ctx {
+    ap_configfile_t *cfp;
+    size_t startline;
+    char buf[HUGE_STRING_LEN];
+};
+
+static const char *LUACMD = "gnutlsrequire";
+static const char *lf = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
+#define N_LF 32
+
+static const char *direct_chunkreader(lua_State *lvm, void *udata, size_t *plen)
+{
+    const char *p;
+    struct cr_ctx *ctx = udata;
+    
+    if (ctx->startline) {
+        *plen = ctx->startline > N_LF ? N_LF : ctx->startline;
+        ctx->startline -= *plen;
+        return lf;
+    }
+    *plen = config_getstr(ctx->cfp, ctx->buf, HUGE_STRING_LEN);
+    
+    for (p = ctx->buf; isspace(*p); ++p);
+    if (p[0] == '<' && p[1] == '/') {
+        int i = 0;
+        while (i < strlen(LUACMD)) {
+            if (tolower(p[i + 2]) != LUACMD[i]) return ctx->buf;
+            ++i;
+        }
+        *plen = 0;
+        return NULL;
+    }
+    return ctx->buf;
+}
+
+static int ldump_writer (lua_State *L, const void* b, size_t size, void* B) {
+    (void)L;
+    luaL_addlstring((luaL_Buffer*) B, (const char *)b, size);
+    return 1;
+}
+
+/* a bytecode buffer*/
+typedef struct bcbuf_ctx {
+    apr_size_t buflen;
+    char* buf;
+} bcbuf_ctx;
+
+const char *mgs_set_require_section(cmd_parms *cmd, void *mconfig, const char *arg)
+{
+    apr_size_t bytecode_len;
+    const char* bytecode;
+    bcbuf_ctx* bcbuf;
+    luaL_Buffer b;
+    ap_directive_t **current = mconfig;
+    struct cr_ctx ctx[1];
+    int result;
+    const char *filename = apr_psprintf(cmd->pool, "@%s", cmd->config_file->name);
+    // get a word argument
+    const char *word;
+    apr_size_t wordlen;
+    lua_State *lvm = get_luastate();
+
+    word = ap_getword_conf(cmd->pool, &arg);
+    wordlen = strlen(word);
+    do {
+        if (wordlen) {
+            if (word[wordlen - 1] == '>') {
+                --wordlen;
+                break;
+            }
+            if (*arg == '>') break;
+        }
+        return apr_pstrcat(cmd->pool, "<", LUACMD, "> takes exactly one argument", NULL);
+    } while (0);
+
+    ctx->cfp = cmd->config_file;
+    ctx->startline = cmd->config_file->line_number;
+    lua_settop(lvm, 0);
+    result = lua_load(lvm, direct_chunkreader, ctx, filename);
+
+    if (result != 0) {
+        word = apr_pstrcat(cmd->pool, "Lua Error:", lua_tostring(lvm, -1), NULL);
+        lua_close(lvm);
+        return word;
+    }
+    else {
+        luaL_buffinit(lvm, &b);
+        lua_dump(lvm, ldump_writer, &b);
+        luaL_pushresult(&b);
+        bytecode = lua_tostring(lvm, -1);
+        bytecode_len = lua_strlen(lvm, -1);
+    }
+    
+    /* Here, we have to replace our current config node for the next pass */
+    if (!*current) {
+        *current = apr_pcalloc(cmd->pool, sizeof(**current));
+    }
+    
+    (*current)->filename = cmd->config_file->name;
+    (*current)->line_num = ctx->startline;
+    (*current)->directive = apr_pstrdup(cmd->pool, "GnuTLSRequireByteCode");
+    (*current)->args = NULL;
+
+    bcbuf = apr_pcalloc(cmd->pool, sizeof(bcbuf));
+    bcbuf->buflen = bytecode_len;
+    bcbuf->buf = apr_pstrmemdup(cmd->pool, bytecode, bytecode_len);
+
+    (*current)->data = bcbuf;
+    lua_close(lvm);
+    return NULL;
+}
+
+const char *mgs_set_require_bytecode(cmd_parms *cmd, void *mconfig, const char *arg)
+{
+    bcbuf_ctx* bcbuf;
+    ap_directive_t *directive = cmd->directive;
+    mgs_dirconf_rec *dc = mconfig;
+
+    bcbuf = directive->data;
+    dc->lua_bytecode_len = bcbuf->buflen;
+    dc->lua_bytecode = apr_pstrmemdup(cmd->pool, bcbuf->buf, bcbuf->buflen);
+    
+    return NULL;
+}
diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
index a2c36ee..84440d0 100644
--- a/src/mod_gnutls.c
+++ b/src/mod_gnutls.c
@@ -54,7 +54,6 @@ static void gnutls_hooks(apr_pool_t * p)
                               AP_FTYPE_CONNECTION + 5);
 }
 
-
 static const command_rec mgs_config_cmds[] = {
     AP_INIT_TAKE1("GnuTLSClientVerify", mgs_set_client_verify,
                   NULL,
@@ -81,16 +80,24 @@ static const command_rec mgs_config_cmds[] = {
                   RSRC_CONF,
                   "Cache Configuration"),
     AP_INIT_TAKE1("GnuTLSEnable", mgs_set_enabled,
-                  NULL, RSRC_CONF,
+                  NULL,
+                  RSRC_CONF,
                   "Whether this server has GnuTLS Enabled. Default: Off"),
-    
+    AP_INIT_RAW_ARGS("<GnuTLSRequire", mgs_set_require_section,
+                  NULL,
+                  EXEC_ON_READ|OR_ALL,
+                  "Whether this server has GnuTLS Enabled. Default: Off"),
+    AP_INIT_RAW_ARGS("GnuTLSRequireByteCode", mgs_set_require_bytecode,
+                     NULL,
+                     OR_ALL,
+                     "Internal Command for reading Lua Bytecode."),
     {NULL}
 };
 
 module AP_MODULE_DECLARE_DATA gnutls_module = {
     STANDARD20_MODULE_STUFF,
     mgs_config_dir_create,
-    NULL,
+    mgs_config_dir_merge,
     mgs_config_server_create,
     NULL,
     mgs_config_cmds,