diff --git a/ncat/Makefile.in b/ncat/Makefile.in
index 3569e04e9..6190937a0 100644
--- a/ncat/Makefile.in
+++ b/ncat/Makefile.in
@@ -83,8 +83,8 @@ DATAFILES = certs/ca-bundle.crt
endif
ifneq ($(HAVE_LUA),)
-LUA_SRCS = ncat_lua_exec.c ncat_lua.c
-LUA_OBJS = ncat_lua_exec.o ncat_lua.o
+LUA_SRCS = ncat_lua_exec.c ncat_lua.c ncat_lua_filters.c
+LUA_OBJS = ncat_lua_exec.o ncat_lua.o ncat_lua_filters.o
LUA_LIBS = @LIBLUA_LIBS@ -lm
LUA_CFLAGS += -DHAVE_LUA=1 -I../liblua
else
diff --git a/ncat/ncat.vcxproj b/ncat/ncat.vcxproj
index 30082c3f4..6dd93fdc3 100644
--- a/ncat/ncat.vcxproj
+++ b/ncat/ncat.vcxproj
@@ -200,6 +200,7 @@
+
@@ -219,6 +220,7 @@
+
diff --git a/ncat/ncat_lua.c b/ncat/ncat_lua.c
index be7425b02..3cd2832d8 100644
--- a/ncat/ncat_lua.c
+++ b/ncat/ncat_lua.c
@@ -123,7 +123,9 @@
#include "ncat.h"
#include "ncat_lua.h"
+#include "ncat_lua_filters.h"
+lua_State *filters_L = NULL;
lua_State *luaexec_L = NULL;
int error_handler_idx = -1;
@@ -168,9 +170,8 @@ static int traceback (lua_State *L)
void lua_setup(char *cmdexec, int script)
{
ncat_assert(cmdexec != NULL);
- ncat_assert(script == 0); //TODO
- lua_State **L = &luaexec_L;
+ lua_State **L = script ? &filters_L : &luaexec_L;
if (*L == NULL) {
*L = luaL_newstate();
@@ -182,8 +183,14 @@ void lua_setup(char *cmdexec, int script)
lua_pushcfunction(*L, traceback);
lua_insert(*L, error_handler_idx);
}
+
+ if (script)
+ lua_filters_setup();
}
if (luaL_loadfile(*L, cmdexec) != 0)
lua_report(*L, "Error loading the Lua script", 1);
+
+ if (script)
+ lua_run_filter(cmdexec);
}
diff --git a/ncat/ncat_lua.h b/ncat/ncat_lua.h
index 55750d42b..0c2a3111f 100644
--- a/ncat/ncat_lua.h
+++ b/ncat/ncat_lua.h
@@ -137,6 +137,7 @@ extern "C" {
#endif
extern lua_State *luaexec_L;
+extern lua_State *filters_L;
extern int error_handler_idx;
diff --git a/ncat/ncat_lua_filters.c b/ncat/ncat_lua_filters.c
new file mode 100644
index 000000000..f201894d9
--- /dev/null
+++ b/ncat/ncat_lua_filters.c
@@ -0,0 +1,231 @@
+/***************************************************************************
+ * ncat_lua_filters.c -- Ncat Lua filters shared code *
+ ***********************IMPORTANT NMAP LICENSE TERMS************************
+ * *
+ * The Nmap Security Scanner is (C) 1996-2013 Insecure.Com LLC. Nmap is *
+ * also a registered trademark of Insecure.Com LLC. This program is free *
+ * software; you may redistribute and/or modify it under the terms of the *
+ * GNU General Public License as published by the Free Software *
+ * Foundation; Version 2 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS *
+ * AND EXCEPTIONS DESCRIBED HEREIN. This guarantees your right to use, *
+ * modify, and redistribute this software under certain conditions. If *
+ * you wish to embed Nmap technology into proprietary software, we sell *
+ * alternative licenses (contact sales@nmap.com). Dozens of software *
+ * vendors already license Nmap technology such as host discovery, port *
+ * scanning, OS detection, version detection, and the Nmap Scripting *
+ * Engine. *
+ * *
+ * Note that the GPL places important restrictions on "derivative works", *
+ * yet it does not provide a detailed definition of that term. To avoid *
+ * misunderstandings, we interpret that term as broadly as copyright law *
+ * allows. For example, we consider an application to constitute a *
+ * derivative work for the purpose of this license if it does any of the *
+ * following with any software or content covered by this license *
+ * ("Covered Software"): *
+ * *
+ * o Integrates source code from Covered Software. *
+ * *
+ * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db *
+ * or nmap-service-probes. *
+ * *
+ * o Is designed specifically to execute Covered Software and parse the *
+ * results (as opposed to typical shell or execution-menu apps, which will *
+ * execute anything you tell them to). *
+ * *
+ * o Includes Covered Software in a proprietary executable installer. The *
+ * installers produced by InstallShield are an example of this. Including *
+ * Nmap with other software in compressed or archival form does not *
+ * trigger this provision, provided appropriate open source decompression *
+ * or de-archiving software is widely available for no charge. For the *
+ * purposes of this license, an installer is considered to include Covered *
+ * Software even if it actually retrieves a copy of Covered Software from *
+ * another source during runtime (such as by downloading it from the *
+ * Internet). *
+ * *
+ * o Links (statically or dynamically) to a library which does any of the *
+ * above. *
+ * *
+ * o Executes a helper program, module, or script to do any of the above. *
+ * *
+ * This list is not exclusive, but is meant to clarify our interpretation *
+ * of derived works with some common examples. Other people may interpret *
+ * the plain GPL differently, so we consider this a special exception to *
+ * the GPL that we apply to Covered Software. Works which meet any of *
+ * these conditions must conform to all of the terms of this license, *
+ * particularly including the GPL Section 3 requirements of providing *
+ * source code and allowing free redistribution of the work as a whole. *
+ * *
+ * As another special exception to the GPL terms, Insecure.Com LLC grants *
+ * permission to link the code of this program with any version of the *
+ * OpenSSL library which is distributed under a license identical to that *
+ * listed in the included docs/licenses/OpenSSL.txt file, and distribute *
+ * linked combinations including the two. *
+ * *
+ * Any redistribution of Covered Software, including any derived works, *
+ * must obey and carry forward all of the terms of this license, including *
+ * obeying all GPL rules and restrictions. For example, source code of *
+ * the whole work must be provided and free redistribution must be *
+ * allowed. All GPL references to "this License", are to be treated as *
+ * including the terms and conditions of this license text as well. *
+ * *
+ * Because this license imposes special exceptions to the GPL, Covered *
+ * Work may not be combined (even as part of a larger work) with plain GPL *
+ * software. The terms, conditions, and exceptions of this license must *
+ * be included as well. This license is incompatible with some other open *
+ * source licenses as well. In some cases we can relicense portions of *
+ * Nmap or grant special permissions to use it in other open source *
+ * software. Please contact fyodor@nmap.org with any such requests. *
+ * Similarly, we don't incorporate incompatible open source software into *
+ * Covered Software without special permission from the copyright holders. *
+ * *
+ * If you have any questions about the licensing restrictions on using *
+ * Nmap in other works, are happy to help. As mentioned above, we also *
+ * offer alternative license to integrate Nmap into proprietary *
+ * applications and appliances. These contracts have been sold to dozens *
+ * of software vendors, and generally include a perpetual license as well *
+ * as providing for priority support and updates. They also fund the *
+ * continued development of Nmap. Please email sales@nmap.com for further *
+ * information. *
+ * *
+ * If you have received a written license agreement or contract for *
+ * Covered Software stating terms other than these, you may choose to use *
+ * and redistribute Covered Software under those terms instead of these. *
+ * *
+ * Source is provided to this software because we believe users have a *
+ * right to know exactly what a program is going to do before they run it. *
+ * This also allows you to audit the software for security holes (none *
+ * have been found so far). *
+ * *
+ * Source code also allows you to port Nmap to new platforms, fix bugs, *
+ * and add new features. You are highly encouraged to send your changes *
+ * to the dev@nmap.org mailing list for possible incorporation into the *
+ * main distribution. By sending these changes to Fyodor or one of the *
+ * Insecure.Org development mailing lists, or checking them into the Nmap *
+ * source code repository, it is understood (unless you specify otherwise) *
+ * that you are offering the Nmap Project (Insecure.Com LLC) the *
+ * unlimited, non-exclusive right to reuse, modify, and relicense the *
+ * code. Nmap will always be available Open Source, but this is important *
+ * because the inability to relicense code has caused devastating problems *
+ * for other Free Software projects (such as KDE and NASM). We also *
+ * occasionally relicense the code to third parties as discussed above. *
+ * If you wish to specify special license conditions of your *
+ * contributions, just say so when you send them. *
+ * *
+ * This program 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 Nmap *
+ * license file for more details (it's in a COPYING file included with *
+ * Nmap, and also available from https://svn.nmap.org/nmap/COPYING *
+ * *
+ ***************************************************************************/
+
+/* $Id$ */
+
+#include "ncat.h"
+#include "ncat_lua.h"
+#include "ncat_lua_filters.h"
+
+static int make_socket_function_idx;
+
+static void lua_set_registry(const char *key);
+
+static int lua_do_nothing(lua_State *L)
+{
+ return 0;
+}
+
+static void lua_create_supersocket()
+{
+ lua_newtable(filters_L);
+
+ lua_pushstring(filters_L, "recv");
+ lua_pushcfunction(filters_L, lua_do_nothing);
+ lua_settable(filters_L, -3);
+
+ lua_pushstring(filters_L, "send");
+ lua_pushcfunction(filters_L, lua_do_nothing);
+ lua_settable(filters_L, -3);
+
+ lua_set_registry("socket");
+}
+
+void lua_filters_setup()
+{
+ /* Initialize the registry. */
+ lua_pushlightuserdata(filters_L, filters_L);
+ lua_newtable(filters_L);
+ lua_settable(filters_L, LUA_REGISTRYINDEX);
+
+ lua_newtable(filters_L);
+ lua_set_registry("connections");
+
+ lua_newtable(filters_L);
+ lua_set_registry("connection_roots");
+
+ lua_create_supersocket();
+
+ luaL_loadstring(filters_L, "return function(function_self, self, arg2) "
+ "local super = arg2 or self.super "
+ "local ret "
+ "if super then "
+ "ret = {} "
+ "for _, m in pairs({'send','recv'}) do "
+ /* Set the method to one that calls super and passes it
+ all the arguments we got, returning everything we'd get.
+ */
+ "ret[m] = function(self, ...) "
+ "return table.unpack({self.super[m](self.super, ...)}) "
+ "end "
+ "end "
+ "else "
+ "ret = {} "
+ "end "
+ "for k, v in pairs(self) do "
+ "ret[k] = v "
+ "end "
+ "if super then "
+ "ret.super = function_self(function_self, super) "
+ "end "
+ "return ret "
+ "end ");
+ lua_pcall(filters_L, 0, 1, error_handler_idx);
+ make_socket_function_idx = lua_gettop(filters_L);
+}
+
+void lua_fetch_registry(const char *key)
+{
+ lua_pushlightuserdata(filters_L, filters_L);
+ lua_gettable(filters_L, LUA_REGISTRYINDEX);
+ lua_pushstring(filters_L, key);
+ lua_gettable(filters_L, -2);
+ lua_insert(filters_L, -2);
+ lua_pop(filters_L, 1);
+}
+
+static void lua_set_registry(const char *key)
+{
+ lua_pushlightuserdata(filters_L, filters_L);
+ lua_gettable(filters_L, LUA_REGISTRYINDEX);
+ lua_insert(filters_L, -2);
+ lua_pushstring(filters_L, key);
+ lua_insert(filters_L, -2);
+ lua_settable(filters_L, -3);
+ lua_pop(filters_L, 1);
+}
+
+void lua_run_filter(char *cmdexec)
+{
+ lua_pcall(filters_L, 0, 1, error_handler_idx);
+ if (!lua_istable(filters_L, -1))
+ bye("%s did not return a table.", cmdexec);
+ /* Overwrite the socket variable with new_socket(socket_from_file,
+ socket). */
+ lua_pushvalue(filters_L, make_socket_function_idx);
+ lua_insert(filters_L, -2);
+ lua_pushvalue(filters_L, make_socket_function_idx);
+ lua_insert(filters_L, -3);
+ lua_fetch_registry("socket");
+ if (lua_pcall(filters_L, 3, 1, error_handler_idx) != LUA_OK)
+ lua_report(filters_L, cmdexec, 1);
+ lua_set_registry("socket");
+}
diff --git a/ncat/ncat_lua_filters.h b/ncat/ncat_lua_filters.h
new file mode 100644
index 000000000..4af89811c
--- /dev/null
+++ b/ncat/ncat_lua_filters.h
@@ -0,0 +1,137 @@
+/***************************************************************************
+ * ncat_lua_filters.h -- Ncat Lua filters shared code headers *
+ ***********************IMPORTANT NMAP LICENSE TERMS************************
+ * *
+ * The Nmap Security Scanner is (C) 1996-2013 Insecure.Com LLC. Nmap is *
+ * also a registered trademark of Insecure.Com LLC. This program is free *
+ * software; you may redistribute and/or modify it under the terms of the *
+ * GNU General Public License as published by the Free Software *
+ * Foundation; Version 2 ("GPL"), BUT ONLY WITH ALL OF THE CLARIFICATIONS *
+ * AND EXCEPTIONS DESCRIBED HEREIN. This guarantees your right to use, *
+ * modify, and redistribute this software under certain conditions. If *
+ * you wish to embed Nmap technology into proprietary software, we sell *
+ * alternative licenses (contact sales@nmap.com). Dozens of software *
+ * vendors already license Nmap technology such as host discovery, port *
+ * scanning, OS detection, version detection, and the Nmap Scripting *
+ * Engine. *
+ * *
+ * Note that the GPL places important restrictions on "derivative works", *
+ * yet it does not provide a detailed definition of that term. To avoid *
+ * misunderstandings, we interpret that term as broadly as copyright law *
+ * allows. For example, we consider an application to constitute a *
+ * derivative work for the purpose of this license if it does any of the *
+ * following with any software or content covered by this license *
+ * ("Covered Software"): *
+ * *
+ * o Integrates source code from Covered Software. *
+ * *
+ * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db *
+ * or nmap-service-probes. *
+ * *
+ * o Is designed specifically to execute Covered Software and parse the *
+ * results (as opposed to typical shell or execution-menu apps, which will *
+ * execute anything you tell them to). *
+ * *
+ * o Includes Covered Software in a proprietary executable installer. The *
+ * installers produced by InstallShield are an example of this. Including *
+ * Nmap with other software in compressed or archival form does not *
+ * trigger this provision, provided appropriate open source decompression *
+ * or de-archiving software is widely available for no charge. For the *
+ * purposes of this license, an installer is considered to include Covered *
+ * Software even if it actually retrieves a copy of Covered Software from *
+ * another source during runtime (such as by downloading it from the *
+ * Internet). *
+ * *
+ * o Links (statically or dynamically) to a library which does any of the *
+ * above. *
+ * *
+ * o Executes a helper program, module, or script to do any of the above. *
+ * *
+ * This list is not exclusive, but is meant to clarify our interpretation *
+ * of derived works with some common examples. Other people may interpret *
+ * the plain GPL differently, so we consider this a special exception to *
+ * the GPL that we apply to Covered Software. Works which meet any of *
+ * these conditions must conform to all of the terms of this license, *
+ * particularly including the GPL Section 3 requirements of providing *
+ * source code and allowing free redistribution of the work as a whole. *
+ * *
+ * As another special exception to the GPL terms, Insecure.Com LLC grants *
+ * permission to link the code of this program with any version of the *
+ * OpenSSL library which is distributed under a license identical to that *
+ * listed in the included docs/licenses/OpenSSL.txt file, and distribute *
+ * linked combinations including the two. *
+ * *
+ * Any redistribution of Covered Software, including any derived works, *
+ * must obey and carry forward all of the terms of this license, including *
+ * obeying all GPL rules and restrictions. For example, source code of *
+ * the whole work must be provided and free redistribution must be *
+ * allowed. All GPL references to "this License", are to be treated as *
+ * including the terms and conditions of this license text as well. *
+ * *
+ * Because this license imposes special exceptions to the GPL, Covered *
+ * Work may not be combined (even as part of a larger work) with plain GPL *
+ * software. The terms, conditions, and exceptions of this license must *
+ * be included as well. This license is incompatible with some other open *
+ * source licenses as well. In some cases we can relicense portions of *
+ * Nmap or grant special permissions to use it in other open source *
+ * software. Please contact fyodor@nmap.org with any such requests. *
+ * Similarly, we don't incorporate incompatible open source software into *
+ * Covered Software without special permission from the copyright holders. *
+ * *
+ * If you have any questions about the licensing restrictions on using *
+ * Nmap in other works, are happy to help. As mentioned above, we also *
+ * offer alternative license to integrate Nmap into proprietary *
+ * applications and appliances. These contracts have been sold to dozens *
+ * of software vendors, and generally include a perpetual license as well *
+ * as providing for priority support and updates. They also fund the *
+ * continued development of Nmap. Please email sales@nmap.com for further *
+ * information. *
+ * *
+ * If you have received a written license agreement or contract for *
+ * Covered Software stating terms other than these, you may choose to use *
+ * and redistribute Covered Software under those terms instead of these. *
+ * *
+ * Source is provided to this software because we believe users have a *
+ * right to know exactly what a program is going to do before they run it. *
+ * This also allows you to audit the software for security holes (none *
+ * have been found so far). *
+ * *
+ * Source code also allows you to port Nmap to new platforms, fix bugs, *
+ * and add new features. You are highly encouraged to send your changes *
+ * to the dev@nmap.org mailing list for possible incorporation into the *
+ * main distribution. By sending these changes to Fyodor or one of the *
+ * Insecure.Org development mailing lists, or checking them into the Nmap *
+ * source code repository, it is understood (unless you specify otherwise) *
+ * that you are offering the Nmap Project (Insecure.Com LLC) the *
+ * unlimited, non-exclusive right to reuse, modify, and relicense the *
+ * code. Nmap will always be available Open Source, but this is important *
+ * because the inability to relicense code has caused devastating problems *
+ * for other Free Software projects (such as KDE and NASM). We also *
+ * occasionally relicense the code to third parties as discussed above. *
+ * If you wish to specify special license conditions of your *
+ * contributions, just say so when you send them. *
+ * *
+ * This program 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 Nmap *
+ * license file for more details (it's in a COPYING file included with *
+ * Nmap, and also available from https://svn.nmap.org/nmap/COPYING *
+ * *
+ ***************************************************************************/
+
+/* $Id$ */
+
+#ifndef _NCAT_LUA_FILTERS_H
+#define _NCAT_LUA_FILTERS_H
+
+struct ncat_lua_state {
+ struct fdinfo fdn;
+};
+
+void lua_fetch_registry(const char *key);
+void lua_run_filter(char *cmdexec);
+void lua_filters_setup();
+struct ncat_lua_state* get_connection(struct fdinfo *fdn, int *created);
+struct ncat_lua_state* lua_fetch_userdata(lua_State *L, int idx, int *ret);
+
+#endif