immunio 1.1.2 → 1.1.5

data/lua-hooks/ext/luajit/src/vm_ppc.dasc

@@ -1,6 +1,6 @@
 |// Low-level VM code for PowerPC 32 bit or 32on64 bit mode.
 |// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
 |
 |.arch ppc
 |.section code_op, code_sub
@@ -2525,7 +2525,7 @@ static void build_subroutines(BuildCtx *ctx)
   |.if JIT
   |  // RA = resultptr, RB = meta base
   |  lwz INS, -4(PC)
-  |    lwz TMP3, -20(RB)		// Save previous trace number.
+  |    lwz TRACE:TMP2, -20(RB)		// Save previous trace.
   |   addic. TMP1, MULTRES, -8
   |  decode_RA8 RC, INS			// Call base.
   |   beq >2
@@ -2540,15 +2540,11 @@ static void build_subroutines(BuildCtx *ctx)
   |   decode_RA8 RA, INS
   |   decode_RB8 RB, INS
   |   add RA, RA, RB
-  |  lwz TMP1, DISPATCH_J(trace)(DISPATCH)
   |3:
   |   cmplw RA, RC
   |   bgt >9				// More results wanted?
   |
-  |  slwi TMP2, TMP3, 2
-  |  lwzx TRACE:TMP2, TMP1, TMP2
-  |  cmpwi TRACE:TMP2, 0
-  |  beq ->cont_nop
+  |  lhz TMP3, TRACE:TMP2->traceno
   |  lhz RD, TRACE:TMP2->link
   |  cmpw RD, TMP3
   |   cmpwi cr1, RD, 0

data/lua-hooks/ext/luajit/src/vm_x64.dasc

@@ -1,6 +1,6 @@
 |// Low-level VM code for x64 CPUs in LJ_GC64 mode.
 |// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
 |
 |.arch x64
 |.section code_op, code_sub
@@ -531,7 +531,7 @@ static void build_subroutines(BuildCtx *ctx)
   |  jmp >2
   |
   |->vm_growstack_v:			// Grow stack for vararg Lua function.
-  |  sub RD, 8
+  |  sub RD, 16				// LJ_FR2
   |  jmp >1
   |
   |->vm_growstack_f:			// Grow stack for fixarg Lua function.
@@ -1804,7 +1804,11 @@ static void build_subroutines(BuildCtx *ctx)
   |  jmp ->fff_res1
   |
   |.ffunc_n math_frexp
+  |.if X64WIN
+  |  lea CARG2, TMP1
+  |.else
   |  lea CARG1, TMP1
+  |.endif
   |  mov RB, BASE
   |  call extern frexp
   |  mov BASE, RB
@@ -1822,7 +1826,11 @@ static void build_subroutines(BuildCtx *ctx)
   |  jmp ->fff_res
   |
   |.ffunc_n math_modf
+  |.if X64WIN
+  |  lea CARG2, [BASE-16]
+  |.else
   |  lea CARG1, [BASE-16]
+  |.endif
   |  mov PC, [BASE-8]
   |  mov RB, BASE
   |  call extern modf

data/lua-hooks/ext/luajit/src/vm_x86.dasc

@@ -1,6 +1,6 @@
 |// Low-level VM code for x86 CPUs.
 |// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
 |
 |.if P64
 |.arch x64
@@ -2667,8 +2667,8 @@ static void build_subroutines(BuildCtx *ctx)
   |->cont_stitch:			// Trace stitching.
   |.if JIT
   |  // BASE = base, RC = result, RB = mbase
-  |  mov RA, [RB-24]			// Save previous trace number.
-  |  mov TMP1, RA
+  |  mov TRACE:RA, [RB-24]		// Save previous trace.
+  |  mov TMP1, TRACE:RA
   |  mov TMP3, DISPATCH			// Need one more register.
   |  mov DISPATCH, MULTRES
   |  movzx RA, PC_RA
@@ -2699,11 +2699,8 @@ static void build_subroutines(BuildCtx *ctx)
   |  ja >9				// More results wanted?
   |
   |  mov DISPATCH, TMP3
-  |  mov RB, TMP1			// Get previous trace number.
-  |  mov RA, [DISPATCH+DISPATCH_J(trace)]
-  |  mov TRACE:RD, [RA+RB*4]
-  |  test TRACE:RD, TRACE:RD
-  |  jz ->cont_nop
+  |  mov TRACE:RD, TMP1			// Get previous trace.
+  |  movzx RB, word TRACE:RD->traceno
   |  movzx RD, word TRACE:RD->link
   |  cmp RD, RB
   |  je ->cont_nop			// Blacklisted.

data/lua-hooks/ext/luautf8/module.mk

@@ -0,0 +1,2 @@
+SRC += \
+	ext/luautf8/lutf8lib.c

data/lua-hooks/ext/module.mk

@@ -0,0 +1,15 @@
+MODULES := \
+	ext/libinjection \
+	ext/lpeg \
+	ext/lua-cmsgpack \
+	ext/lua-snapshot \
+	ext/luautf8 \
+	ext/perf \
+	ext/sha1 \
+	ext/sha2 \
+	ext/sysutils
+
+SRC += \
+	ext/all.c
+	
+include $(patsubst %,%/module.mk,$(MODULES))

data/lua-hooks/ext/modules.h

@@ -0,0 +1,17 @@
+// Lists the registration functions for all the modules
+
+#include "lua.h"
+
+LUALIB_API int luaopen_libinjection(lua_State *L);
+LUALIB_API int luaopen_utf8(lua_State *L);
+LUALIB_API int luaopen_lpeg (lua_State *L);
+LUALIB_API int luaopen_cmsgpack(lua_State *L);
+LUALIB_API int luaopen_snapshot(lua_State *L);
+LUALIB_API int luaopen_sha1(lua_State *L);
+LUALIB_API int luaopen_sha256(lua_State *L);
+LUALIB_API int luaopen_cpuload(lua_State *L);
+LUALIB_API int luaopen_loadavg(lua_State* L);
+LUALIB_API int luaopen_meminfo(lua_State *L);
+LUALIB_API int luaopen_luaos(lua_State *L);
+LUALIB_API int luaopen_sysutils(lua_State *L);
+

data/lua-hooks/ext/perf/luacpu.c

@@ -108,7 +108,7 @@ static const luaL_Reg libcpuload[] = {
 
 int
 luaopen_cpuload(lua_State *L) {
-  luaL_checkversion(L);
+//  luaL_checkversion(L);
   luaL_register(L, "perf", libcpuload);
   return 1;
 }

data/lua-hooks/ext/perf/lualoadavg.c

@@ -34,7 +34,7 @@ static const luaL_Reg libloadavg[] = {
 
 int
 luaopen_loadavg(lua_State *L) {
-  luaL_checkversion(L);
+//  luaL_checkversion(L);
   luaL_register(L, "perf", libloadavg);
   return 1;
 }

data/lua-hooks/ext/perf/luameminfo.c

@@ -32,7 +32,7 @@ static const luaL_Reg libmeminfo[] = {
 
 int
 luaopen_meminfo(lua_State *L) {
-  luaL_checkversion(L);
+//  luaL_checkversion(L);
   luaL_register(L, "perf", libmeminfo);
   return 1;
 }

data/lua-hooks/ext/perf/luaoslib.c

@@ -1,8 +1,41 @@
 #include <time.h>
+#include <string.h>
 
 #define lib_os_c
 #define LUA_LIB
 
+/*
+** list of valid conversion specifiers for the 'strftime' function
+*/
+#if !defined(LUA_STRFTIMEOPTIONS)
+
+#if !defined(LUA_USE_POSIX)
+#define LUA_STRFTIMEOPTIONS     { "aAbBcdHIjmMpSUwWxXyYz%", "" }
+#else
+#define LUA_STRFTIMEOPTIONS \
+        { "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \
+          "", "E", "cCxXyY",  \
+          "O", "deHImMSuUVwWy" }
+#endif
+
+#endif
+
+/*
+** By default, Lua uses gmtime/localtime, except when POSIX is available,
+** where it uses gmtime_r/localtime_r
+*/
+#if defined(LUA_USE_GMTIME_R)
+
+#define l_gmtime(t,r)           gmtime_r(t,r)
+#define l_localtime(t,r)        localtime_r(t,r)
+
+#elif !defined(l_gmtime)
+
+#define l_gmtime(t,r)           ((void)r, gmtime(t))
+#define l_localtime(t,r)        ((void)r, localtime(t))
+
+#endif
+
 #include "lua.h"
 #include "lauxlib.h"
 #include "lj_err.h"
@@ -13,6 +46,26 @@ static int os_clock(lua_State *L) {
   return 1;
 }
 
+/*
+** {======================================================
+** Time/Date operations
+** { year=%Y, month=%m, day=%d, hour=%H, min=%M, sec=%S,
+**   wday=%w+1, yday=%j, isdst=? }
+** =======================================================
+*/
+
+static void setfield (lua_State *L, const char *key, int value) {
+  lua_pushinteger(L, value);
+  lua_setfield(L, -2, key);
+}
+
+static void setboolfield (lua_State *L, const char *key, int value) {
+  if (value < 0)  /* undefined? */
+    return;  /* does not set field */
+  lua_pushboolean(L, value);
+  lua_setfield(L, -2, key);
+}
+
 static int getboolfield(lua_State *L, const char *key) {
   int res;
   lua_getfield(L, -1, key);
@@ -35,6 +88,74 @@ static int getfield(lua_State *L, const char *key, int d) {
   return res;
 }
 
+static const char *checkoption (lua_State *L, const char *conv, char *buff) {
+  static const char *const options[] = LUA_STRFTIMEOPTIONS;
+  unsigned int i;
+  for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) {
+    if (*conv != '\0' && strchr(options[i], *conv) != NULL) {
+      buff[1] = *conv;
+      if (*options[i + 1] == '\0') {  /* one-char conversion specifier? */
+        buff[2] = '\0';  /* end buffer */
+        return conv + 1;
+      }
+      else if (*(conv + 1) != '\0' &&
+               strchr(options[i + 1], *(conv + 1)) != NULL) {
+        buff[2] = *(conv + 1);  /* valid two-char conversion specifier */
+        buff[3] = '\0';  /* end buffer */
+        return conv + 2;
+      }
+    }
+  }
+  luaL_argerror(L, 1,
+    lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
+  return conv;  /* to avoid warnings */
+}
+
+static int os_date (lua_State *L) {
+  const char *s = luaL_optstring(L, 1, "%c");
+  time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL));
+  struct tm tmr, *stm;
+  if (*s == '!') {  /* UTC? */
+    stm = l_gmtime(&t, &tmr);
+    s++;  /* skip `!' */
+  }
+  else
+    stm = l_localtime(&t, &tmr);
+  if (stm == NULL)  /* invalid date? */
+    lua_pushnil(L);
+  else if (strcmp(s, "*t") == 0) {
+    lua_createtable(L, 0, 9);  /* 9 = number of fields */
+    setfield(L, "sec", stm->tm_sec);
+    setfield(L, "min", stm->tm_min);
+    setfield(L, "hour", stm->tm_hour);
+    setfield(L, "day", stm->tm_mday);
+    setfield(L, "month", stm->tm_mon+1);
+    setfield(L, "year", stm->tm_year+1900);
+    setfield(L, "wday", stm->tm_wday+1);
+    setfield(L, "yday", stm->tm_yday+1);
+    setboolfield(L, "isdst", stm->tm_isdst);
+  }
+  else {
+    char cc[4];
+    luaL_Buffer b;
+    cc[0] = '%';
+    luaL_buffinit(L, &b);
+    while (*s) {
+      if (*s != '%')  /* no conversion specifier? */
+        luaL_addchar(&b, *s++);
+      else {
+        size_t reslen;
+        char buff[200];  /* should be big enough for any conversion result */
+        s = checkoption(L, s + 1, cc);
+        reslen = strftime(buff, sizeof(buff), cc, stm);
+        luaL_addlstring(&b, buff, reslen);
+      }
+    }
+    luaL_pushresult(&b);
+  }
+  return 1;
+}
+
 static int os_time(lua_State *L) {
   time_t t;
   if (lua_isnoneornil(L, 1)) {  /* called without args? */
@@ -61,7 +182,7 @@ static int os_time(lua_State *L) {
 
 static int os_difftime(lua_State *L) {
   lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
-			     (time_t)(luaL_optnumber(L, 2, (lua_Number)0))));
+           (time_t)(luaL_optnumber(L, 2, (lua_Number)0))));
   return 1;
 }
 
@@ -69,13 +190,14 @@ static const luaL_Reg libluaos[] = {
   {"clock", os_clock},
   {"time", os_time},
   {"difftime", os_difftime},
+  {"date", os_date},
 
   {NULL, NULL}
 };
 
 int
 luaopen_luaos(lua_State *L) {
-  luaL_checkversion(L);
+//  luaL_checkversion(L);
   luaL_register(L, "perf", libluaos);
   return 1;
 }

data/lua-hooks/ext/perf/module.mk

@@ -0,0 +1,5 @@
+SRC += \
+	ext/perf/luacpu.c \
+	ext/perf/lualoadavg.c \
+	ext/perf/luameminfo.c \
+	ext/perf/luaoslib.c

data/lua-hooks/ext/sha1/luasha1.c

@@ -1,4 +1,6 @@
+#include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
 #define LUA_LIB
 #include "lua.h"
@@ -66,7 +68,7 @@ static const luaL_Reg libsha1[] = {
 
 int
 luaopen_sha1(lua_State *L) {
-  luaL_checkversion(L);
+//  luaL_checkversion(L);
   luaL_register(L, "sha1", libsha1);
   return 1;
-}
+}

data/lua-hooks/ext/sha1/module.mk

@@ -0,0 +1,5 @@
+SRC += \
+	ext/sha1/luasha1.c
+
+SPECIAL_SRC += \
+	ext/sha1/sha1.c

data/lua-hooks/ext/sha2/luasha256.c

@@ -1,4 +1,6 @@
+#include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
 #define LUA_LIB
 #include "lua.h"
@@ -69,7 +71,7 @@ static const luaL_Reg libsha256[] = {
 
 int
 luaopen_sha256(lua_State *L) {
-  luaL_checkversion(L);
+//  luaL_checkversion(L);
   luaL_register(L, "sha2", libsha256);
   return 1;
-}
+}

data/lua-hooks/ext/sha2/module.mk

@@ -0,0 +1,5 @@
+SRC += \
+	ext/sha2/luasha256.c
+	
+SPECIAL_SRC += \
+	ext/sha2/sha256.c

data/lua-hooks/ext/sysutils/lua_utils.c

@@ -0,0 +1,56 @@
+#define LUA_LIB
+#include <lua.h>
+#include <lauxlib.h>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#else
+#include <sys/utsname.h>
+#endif /* _WIN32 */
+
+static int lua_uname(lua_State *L)
+{
+#ifdef _WIN32
+  const char *name;
+  SYSTEM_INFO info;
+  lua_pushliteral(L, "Windows");
+  name = getenv("COMPUTERNAME");
+  lua_pushstring(L, name ? name : "");
+  memset(&info, 0, sizeof(info));
+  GetSystemInfo(&info);
+  if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+    lua_pushliteral(L, "AMD64");
+  else if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
+    lua_pushliteral(L, "X86");
+  else if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM)
+    lua_pushliteral(L, "ARM");
+  else if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64)
+    lua_pushliteral(L, "IA64");
+  else if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64)
+    lua_pushstring(L, "");
+  return 3;
+#else
+  struct utsname info;
+  if (uname(&info) >= 0)
+  {
+    lua_pushstring(L, info.sysname);
+    lua_pushstring(L, info.nodename);
+    lua_pushstring(L, info.machine);
+    return 3;
+  }
+  lua_pushstring(L, "Unknown");
+  return 1;
+#endif
+}
+
+static const luaL_Reg sys_utils[] = {
+  {"uname", lua_uname},
+  {NULL, NULL}
+};
+
+int luaopen_sysutils(lua_State *L) {
+//  luaL_checkversion(L);
+  luaL_register(L, "sysutils", sys_utils);
+  return 1;
+}