diff --git a/ncat/Makefile.in b/ncat/Makefile.in
index cfd306d5f..3569e04e9 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.c
-LUA_OBJS = ncat_lua.o
+LUA_SRCS = ncat_lua_exec.c ncat_lua.c
+LUA_OBJS = ncat_lua_exec.o ncat_lua.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 2e773cb75..30082c3f4 100644
--- a/ncat/ncat.vcxproj
+++ b/ncat/ncat.vcxproj
@@ -199,6 +199,7 @@
+
@@ -217,6 +218,7 @@
+
diff --git a/ncat/ncat_lua.c b/ncat/ncat_lua.c
index 9bc5d7a75..e69e8554d 100644
--- a/ncat/ncat_lua.c
+++ b/ncat/ncat_lua.c
@@ -124,16 +124,20 @@
#include "ncat.h"
#include "ncat_lua.h"
-static lua_State *L;
-static int last_function_number;
+lua_State *luaexec_L = NULL;
+int error_handler_idx = -1;
-static void report(char *prefix)
+void lua_report(lua_State *L, char *prefix, int panic)
{
const char *errormsg;
errormsg = lua_tostring(L, -1);
if (errormsg == NULL)
errormsg = "(error object is not a string)";
- bye("%s: %s.", prefix, errormsg);
+
+ if (panic)
+ bye("%s: %s.", prefix, errormsg);
+ else
+ loguser("%s: %s.", prefix, errormsg);
}
static int traceback (lua_State *L)
@@ -151,32 +155,24 @@ static int traceback (lua_State *L)
return 1;
}
-void lua_setup(void)
+void lua_setup(char *cmdexec)
{
- ncat_assert(o.cmdexec != NULL);
+ ncat_assert(cmdexec != NULL);
- L = luaL_newstate();
- luaL_openlibs(L);
+ lua_State **L = &luaexec_L;
- if (luaL_loadfile(L, o.cmdexec) != 0)
- report("Error loading the Lua script");
+ if (*L == NULL) {
+ *L = luaL_newstate();
+ luaL_openlibs(*L);
- /* install the traceback function */
- last_function_number = lua_gettop(L);
- lua_pushcfunction(L, traceback);
- lua_insert(L, last_function_number);
-}
-
-void lua_run(void)
-{
- if (lua_pcall(L, 0, 0, last_function_number) != LUA_OK && !lua_isnil(L, -1)) {
- /* handle the error; the code below is taken from lua.c, Lua source code */
- lua_remove(L, last_function_number);
- report("Error running the Lua script");
- } else {
- if (o.debug)
- logdebug("%s returned successfully.\n", o.cmdexec);
- lua_close(L);
- exit(EXIT_SUCCESS);
+ if (error_handler_idx == -1) {
+ /* install the traceback function */
+ error_handler_idx = lua_gettop(*L);
+ lua_pushcfunction(*L, traceback);
+ lua_insert(*L, error_handler_idx);
+ }
}
+
+ if (luaL_loadfile(*L, cmdexec) != 0)
+ lua_report(*L, "Error loading the Lua script", 1);
}
diff --git a/ncat/ncat_lua.h b/ncat/ncat_lua.h
index decc8284c..c0a0f4336 100644
--- a/ncat/ncat_lua.h
+++ b/ncat/ncat_lua.h
@@ -136,7 +136,12 @@ extern "C" {
}
#endif
-void lua_setup(void);
-void lua_run(void);
+extern lua_State *luaexec_L;
+
+extern int error_handler_idx;
+
+void lua_report(lua_State *L, char *prefix, int panic);
+void dump_stack(lua_State *L, char* title);
+void lua_setup(char *cmdexec);
#endif
diff --git a/ncat/ncat_lua_exec.c b/ncat/ncat_lua_exec.c
new file mode 100644
index 000000000..3a2d67f44
--- /dev/null
+++ b/ncat/ncat_lua_exec.c
@@ -0,0 +1,139 @@
+/***************************************************************************
+ * ncat_lua_exec.c -- ncat --lua-exec facilities *
+ ***********************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"
+
+void lua_run(void)
+{
+ if (lua_pcall(luaexec_L, 0, 0, error_handler_idx) != LUA_OK && !lua_isnil(luaexec_L, -1)) {
+ /* handle the error; the code below is taken from lua.c, Lua source code */
+ lua_remove(luaexec_L, error_handler_idx);
+ lua_report(luaexec_L, "Error running the Lua script", 1);
+ } else {
+ if (o.debug)
+ logdebug("%s returned successfully.\n", o.cmdexec);
+ lua_close(luaexec_L);
+ exit(EXIT_SUCCESS);
+ }
+}
diff --git a/ncat/ncat_lua_exec.h b/ncat/ncat_lua_exec.h
new file mode 100644
index 000000000..7ac89763d
--- /dev/null
+++ b/ncat/ncat_lua_exec.h
@@ -0,0 +1,143 @@
+/***************************************************************************
+ * ncat_lua_exec.h -- ncat --lua-exec facilities header file *
+ ***********************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_EXEC_H
+#define _NCAT_LUA_EXEC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+void lua_run(void);
+
+void lua_unregister_fd(struct fdinfo *fdn);
+
+#endif
diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
index 3562d8560..5af89f25a 100644
--- a/ncat/ncat_main.c
+++ b/ncat/ncat_main.c
@@ -148,6 +148,7 @@
#ifdef HAVE_LUA
#include "ncat_lua.h"
+#include "ncat_lua_exec.h"
#endif
static int ncat_connect_mode(void);
@@ -544,7 +545,7 @@ int main(int argc, char *argv[])
#endif
ncat_assert(argc == 3);
o.cmdexec = argv[2];
- lua_setup();
+ lua_setup(o.cmdexec);
lua_run();
}
#endif
@@ -869,7 +870,7 @@ connection brokering should work.");
#ifdef HAVE_LUA
if (o.execmode == EXEC_LUA)
- lua_setup();
+ lua_setup(o.cmdexec);
#endif
if (o.listen)
diff --git a/ncat/ncat_posix.c b/ncat/ncat_posix.c
index 44c6f5254..f5458d20e 100644
--- a/ncat/ncat_posix.c
+++ b/ncat/ncat_posix.c
@@ -122,7 +122,7 @@
/* $Id$ */
#include "ncat.h"
-#include "ncat_lua.h"
+#include "ncat_lua_exec.h"
char **cmdline_split(const char *cmdexec);