Fix for issue #132. Now AUTH raises an error if no server password is configured.

[redis.git] / src / scripting.c

diff --git a/src/scripting.c b/src/scripting.c
index f62e5c2931b764480aafa90f59231417662081fd..99ca700cf41e47a5e13b6ba2bd1e9d03a3c00cd3 100644 (file)
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -265,9 +265,28 @@ void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
     }
 }
 
     }
 }
 

+void luaLoadLib(lua_State *lua, const char *libname, lua_CFunction luafunc) {
+  lua_pushcfunction(lua, luafunc);
+  lua_pushstring(lua, libname);
+  lua_call(lua, 1, 0);
+}
+
+void luaLoadLibraries(lua_State *lua) {
+    luaLoadLib(lua, "", luaopen_base);
+    luaLoadLib(lua, LUA_TABLIBNAME, luaopen_table);
+    luaLoadLib(lua, LUA_STRLIBNAME, luaopen_string);
+    luaLoadLib(lua, LUA_MATHLIBNAME, luaopen_math);
+    luaLoadLib(lua, LUA_DBLIBNAME, luaopen_debug); 
+
+#if 0 /* Stuff that we don't load currently, for sandboxing concerns. */
+    luaLoadLib(lua, LUA_LOADLIBNAME, luaopen_package);
+    luaLoadLib(lua, LUA_OSLIBNAME, luaopen_os);
+#endif
+}
+

 void scriptingInit(void) {
     lua_State *lua = lua_open();
 void scriptingInit(void) {
     lua_State *lua = lua_open();

-    luaL_openlibs(lua);
+    luaLoadLibraries(lua);

 
     /* Initialize a dictionary we use to map SHAs to scripts.
      * This is useful for replication, as we need to replicate EVALSHA
 
     /* Initialize a dictionary we use to map SHAs to scripts.
      * This is useful for replication, as we need to replicate EVALSHA


@@ -512,7 +531,7 @@ void evalGenericCommand(redisClient *c, int evalsha) {
         {
             int retval = dictAdd(server.lua_scripts,
                                  sdsnewlen(funcname+2,40),c->argv[1]);
         {
             int retval = dictAdd(server.lua_scripts,
                                  sdsnewlen(funcname+2,40),c->argv[1]);

-            redisAssert(retval == DICT_OK);
+            redisAssertWithInfo(c,NULL,retval == DICT_OK);

             incrRefCount(c->argv[1]);
         }
     }
             incrRefCount(c->argv[1]);
         }
     }


@@ -564,7 +583,7 @@ void evalGenericCommand(redisClient *c, int evalsha) {
     if (evalsha) {
         robj *script = dictFetchValue(server.lua_scripts,c->argv[1]->ptr);
 
     if (evalsha) {
         robj *script = dictFetchValue(server.lua_scripts,c->argv[1]->ptr);
 

-        redisAssert(script != NULL);
+        redisAssertWithInfo(c,NULL,script != NULL);

         rewriteClientCommandArgument(c,0,
             resetRefCount(createStringObject("EVAL",4)));
         rewriteClientCommandArgument(c,1,script);
         rewriteClientCommandArgument(c,0,
             resetRefCount(createStringObject("EVAL",4)));
         rewriteClientCommandArgument(c,1,script);