X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fscript%2Fcpp_api%2Fs_base.cpp;h=6bea8230b28c8161f15df1144722c682b4a149b1;hb=550c0404a8b6fbee857003c961bb802121e88f51;hp=898271743ee099ad1793aa9827cb9022c414373f;hpb=49cec3f78240ed6310a9b5dd05ce09a79ed5a12e;p=dragonfireclient.git

diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index 898271743..6bea8230b 100644
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "cpp_api/s_base.h"
 #include "cpp_api/s_internal.h"
+#include "cpp_api/s_security.h"
 #include "lua_api/l_object.h"
+#include "common/c_converter.h"
 #include "serverobject.h"
-#include "debug.h"
-#include "log.h"
+#include "filesys.h"
 #include "mods.h"
+#include "porting.h"
 #include "util/string.h"
+#include "server.h"
+#ifndef SERVER
+#include "client.h"
+#endif
 
 
 extern "C" {
@@ -36,6 +42,8 @@ extern "C" {
 
 #include <stdio.h>
 #include <cstdarg>
+#include "script/common/c_content.h"
+#include <sstream>
 
 
 class ModNameStorer
@@ -43,18 +51,18 @@ class ModNameStorer
 private:
 	lua_State *L;
 public:
-	ModNameStorer(lua_State *L_, const std::string modname):
+	ModNameStorer(lua_State *L_, const std::string &mod_name):
 		L(L_)
 	{
-		// Store current modname in registry
-		lua_pushstring(L, modname.c_str());
-		lua_setfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
+		// Store current mod name in registry
+		lua_pushstring(L, mod_name.c_str());
+		lua_rawseti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
 	}
 	~ModNameStorer()
 	{
-		// Clear current modname in registry
+		// Clear current mod name from registry
 		lua_pushnil(L);
-		lua_setfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
+		lua_rawseti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
 	}
 };
 
@@ -65,16 +73,26 @@ class ModNameStorer
 
 ScriptApiBase::ScriptApiBase()
 {
-	#ifdef SCRIPTAPI_LOCK_DEBUG
-	m_locked = false;
-	#endif
+#ifdef SCRIPTAPI_LOCK_DEBUG
+	m_lock_recursion_count = 0;
+#endif
 
 	m_luastack = luaL_newstate();
-	assert(m_luastack);
+	FATAL_ERROR_IF(!m_luastack, "luaL_newstate() failed");
+
+	lua_atpanic(m_luastack, &luaPanic);
+
+	luaL_openlibs(m_luastack);
 
 	// Make the ScriptApiBase* accessible to ModApiBase
 	lua_pushlightuserdata(m_luastack, this);
-	lua_setfield(m_luastack, LUA_REGISTRYINDEX, "scriptapi");
+	lua_rawseti(m_luastack, LUA_REGISTRYINDEX, CUSTOM_RIDX_SCRIPTAPI);
+
+	// Add and save an error handler
+	lua_getglobal(m_luastack, "debug");
+	lua_getfield(m_luastack, -1, "traceback");
+	lua_rawseti(m_luastack, LUA_REGISTRYINDEX, CUSTOM_RIDX_BACKTRACE);
+	lua_pop(m_luastack, 1); // pop debug
 
 	// If we are using LuaJIT add a C++ wrapper function to catch
 	// exceptions thrown in Lua -> C++ calls
@@ -84,9 +102,15 @@ ScriptApiBase::ScriptApiBase()
 	lua_pop(m_luastack, 1);
 #endif
 
-	m_server = 0;
-	m_environment = 0;
-	m_guiengine = 0;
+	// Add basic globals
+	lua_newtable(m_luastack);
+	lua_setglobal(m_luastack, "core");
+
+	lua_pushstring(m_luastack, DIR_DELIM);
+	lua_setglobal(m_luastack, "DIR_DELIM");
+
+	lua_pushstring(m_luastack, porting::getPlatformName());
+	lua_setglobal(m_luastack, "PLATFORM");
 }
 
 ScriptApiBase::~ScriptApiBase()
@@ -94,102 +118,176 @@ ScriptApiBase::~ScriptApiBase()
 	lua_close(m_luastack);
 }
 
-bool ScriptApiBase::loadMod(const std::string &scriptpath,
-		const std::string &modname)
+int ScriptApiBase::luaPanic(lua_State *L)
 {
-	ModNameStorer modnamestorer(getStack(), modname);
+	std::ostringstream oss;
+	oss << "LUA PANIC: unprotected error in call to Lua API ("
+		<< lua_tostring(L, -1) << ")";
+	FATAL_ERROR(oss.str().c_str());
+	// NOTREACHED
+	return 0;
+}
 
-	if(!string_allowed(modname, MODNAME_ALLOWED_CHARS)){
-		errorstream<<"Error loading mod \""<<modname
-				<<"\": modname does not follow naming conventions: "
-				<<"Only chararacters [a-z0-9_] are allowed."<<std::endl;
-		return false;
-	}
+void ScriptApiBase::loadMod(const std::string &script_path,
+		const std::string &mod_name)
+{
+	ModNameStorer mod_name_storer(getStack(), mod_name);
+
+	loadScript(script_path);
+}
 
-	bool success = false;
+void ScriptApiBase::loadScript(const std::string &script_path)
+{
+	verbosestream << "Loading and running script from " << script_path << std::endl;
+
+	lua_State *L = getStack();
 
-	try{
-		success = loadScript(scriptpath);
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	bool ok;
+	if (m_secure) {
+		ok = ScriptApiSecurity::safeLoadFile(L, script_path.c_str());
+	} else {
+		ok = !luaL_loadfile(L, script_path.c_str());
 	}
-	catch(LuaError &e){
-		errorstream<<"Error loading mod \""<<modname
-				<<"\": "<<e.what()<<std::endl;
+	ok = ok && !lua_pcall(L, 0, 0, error_handler);
+	if (!ok) {
+		std::string error_msg = lua_tostring(L, -1);
+		lua_pop(L, 2); // Pop error message and error handler
+		throw ModError("Failed to load and run script from " +
+				script_path + ":\n" + error_msg);
 	}
-
-	return success;
+	lua_pop(L, 1); // Pop error handler
 }
 
-bool ScriptApiBase::loadScript(const std::string &scriptpath)
+#ifndef SERVER
+void ScriptApiBase::loadModFromMemory(const std::string &mod_name)
 {
-	verbosestream<<"Loading and running script from "<<scriptpath<<std::endl;
+	ModNameStorer mod_name_storer(getStack(), mod_name);
+
+	const std::string *init_filename = getClient()->getModFile(mod_name + ":init.lua");
+	const std::string display_filename = mod_name + ":init.lua";
+	if(init_filename == NULL)
+		throw ModError("Mod:\"" + mod_name + "\" lacks init.lua");
+
+	verbosestream << "Loading and running script " << display_filename << std::endl;
 
 	lua_State *L = getStack();
 
-	lua_pushcfunction(L, script_error_handler);
-	int errorhandler = lua_gettop(L);
-
-	int ret = luaL_loadfile(L, scriptpath.c_str()) || lua_pcall(L, 0, 0, errorhandler);
-	if(ret){
-		errorstream<<"========== ERROR FROM LUA ==========="<<std::endl;
-		errorstream<<"Failed to load and run script from "<<std::endl;
-		errorstream<<scriptpath<<":"<<std::endl;
-		errorstream<<std::endl;
-		errorstream<<lua_tostring(L, -1)<<std::endl;
-		errorstream<<std::endl;
-		errorstream<<"======= END OF ERROR FROM LUA ========"<<std::endl;
-		lua_pop(L, 1); // Pop error message from stack
-		lua_pop(L, 1); // Pop the error handler from stack
-		return false;
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	bool ok = ScriptApiSecurity::safeLoadFile(L, init_filename->c_str(), display_filename.c_str());
+	if (ok)
+		ok = !lua_pcall(L, 0, 0, error_handler);
+	if (!ok) {
+		std::string error_msg = luaL_checkstring(L, -1);
+		lua_pop(L, 2); // Pop error message and error handler
+		throw ModError("Failed to load and run mod \"" +
+				mod_name + "\":\n" + error_msg);
 	}
-	lua_pop(L, 1); // Pop the error handler from stack
-	return true;
+	lua_pop(L, 1); // Pop error handler
+}
+#endif
+
+// Push the list of callbacks (a lua table).
+// Then push nargs arguments.
+// Then call this function, which
+// - runs the callbacks
+// - replaces the table and arguments with the return value,
+//     computed depending on mode
+// This function must only be called with scriptlock held (i.e. inside of a
+// code block with SCRIPTAPI_PRECHECKHEADER declared)
+void ScriptApiBase::runCallbacksRaw(int nargs,
+		RunCallbacksMode mode, const char *fxn)
+{
+#ifdef SCRIPTAPI_LOCK_DEBUG
+	assert(m_lock_recursion_count > 0);
+#endif
+	lua_State *L = getStack();
+	FATAL_ERROR_IF(lua_gettop(L) < nargs + 1, "Not enough arguments");
+
+	// Insert error handler
+	PUSH_ERROR_HANDLER(L);
+	int error_handler = lua_gettop(L) - nargs - 1;
+	lua_insert(L, error_handler);
+
+	// Insert run_callbacks between error handler and table
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "run_callbacks");
+	lua_remove(L, -2);
+	lua_insert(L, error_handler + 1);
+
+	// Insert mode after table
+	lua_pushnumber(L, (int)mode);
+	lua_insert(L, error_handler + 3);
+
+	// Stack now looks like this:
+	// ... <error handler> <run_callbacks> <table> <mode> <arg#1> <arg#2> ... <arg#n>
+
+	int result = lua_pcall(L, nargs + 2, 1, error_handler);
+	if (result != 0)
+		scriptError(result, fxn);
+
+	lua_remove(L, error_handler);
 }
 
 void ScriptApiBase::realityCheck()
 {
 	int top = lua_gettop(m_luastack);
-	if(top >= 30){
-		dstream<<"Stack is over 30:"<<std::endl;
+	if (top >= 30) {
+		dstream << "Stack is over 30:" << std::endl;
 		stackDump(dstream);
-		throw LuaError(m_luastack, "Stack is over 30 (reality check)");
+		std::string traceback = script_get_backtrace(m_luastack);
+		throw LuaError("Stack is over 30 (reality check)\n" + traceback);
 	}
 }
 
-void ScriptApiBase::scriptError()
+void ScriptApiBase::scriptError(int result, const char *fxn)
 {
-	throw LuaError(NULL, lua_tostring(m_luastack, -1));
+	script_error(getStack(), result, m_last_run_mod.c_str(), fxn);
 }
 
 void ScriptApiBase::stackDump(std::ostream &o)
 {
-	int i;
 	int top = lua_gettop(m_luastack);
-	for (i = 1; i <= top; i++) {  /* repeat for each level */
+	for (int i = 1; i <= top; i++) {  /* repeat for each level */
 		int t = lua_type(m_luastack, i);
 		switch (t) {
-
 			case LUA_TSTRING:  /* strings */
-				o<<"\""<<lua_tostring(m_luastack, i)<<"\"";
+				o << "\"" << lua_tostring(m_luastack, i) << "\"";
 				break;
-
 			case LUA_TBOOLEAN:  /* booleans */
-				o<<(lua_toboolean(m_luastack, i) ? "true" : "false");
+				o << (lua_toboolean(m_luastack, i) ? "true" : "false");
 				break;
-
 			case LUA_TNUMBER:  /* numbers */ {
 				char buf[10];
-				snprintf(buf, 10, "%g", lua_tonumber(m_luastack, i));
-				o<<buf;
-				break; }
-
+				snprintf(buf, 10, "%lf", lua_tonumber(m_luastack, i));
+				o << buf;
+				break;
+			}
 			default:  /* other values */
-				o<<lua_typename(m_luastack, t);
+				o << lua_typename(m_luastack, t);
 				break;
-
 		}
-		o<<" ";
+		o << " ";
 	}
-	o<<std::endl;
+	o << std::endl;
+}
+
+void ScriptApiBase::setOriginDirect(const char *origin)
+{
+	m_last_run_mod = origin ? origin : "??";
+}
+
+void ScriptApiBase::setOriginFromTableRaw(int index, const char *fxn)
+{
+#ifdef SCRIPTAPI_DEBUG
+	lua_State *L = getStack();
+
+	m_last_run_mod = lua_istable(L, index) ?
+		getstringfield_default(L, index, "mod_origin", "") : "";
+	//printf(">>>> running %s for mod: %s\n", fxn, m_last_run_mod.c_str());
+#endif
 }
 
 void ScriptApiBase::addObjectReference(ServerActiveObject *cobj)
@@ -201,8 +299,8 @@ void ScriptApiBase::addObjectReference(ServerActiveObject *cobj)
 	ObjectRef::create(L, cobj); // Puts ObjectRef (as userdata) on stack
 	int object = lua_gettop(L);
 
-	// Get minetest.object_refs table
-	lua_getglobal(L, "minetest");
+	// Get core.object_refs table
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "object_refs");
 	luaL_checktype(L, -1, LUA_TTABLE);
 	int objectstable = lua_gettop(L);
@@ -218,8 +316,8 @@ void ScriptApiBase::removeObjectReference(ServerActiveObject *cobj)
 	SCRIPTAPI_PRECHECKHEADER
 	//infostream<<"scriptapi_rm_object_reference: id="<<cobj->getId()<<std::endl;
 
-	// Get minetest.object_refs table
-	lua_getglobal(L, "minetest");
+	// Get core.object_refs table
+	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "object_refs");
 	luaL_checktype(L, -1, LUA_TTABLE);
 	int objectstable = lua_gettop(L);
@@ -238,28 +336,23 @@ void ScriptApiBase::removeObjectReference(ServerActiveObject *cobj)
 }
 
 // Creates a new anonymous reference if cobj=NULL or id=0
-void ScriptApiBase::objectrefGetOrCreate(
+void ScriptApiBase::objectrefGetOrCreate(lua_State *L,
 		ServerActiveObject *cobj)
 {
-	lua_State *L = getStack();
-
-	if(cobj == NULL || cobj->getId() == 0){
+	if (cobj == NULL || cobj->getId() == 0) {
 		ObjectRef::create(L, cobj);
 	} else {
-		objectrefGet(cobj->getId());
+		push_objectRef(L, cobj->getId());
 	}
 }
 
-void ScriptApiBase::objectrefGet(u16 id)
+Server* ScriptApiBase::getServer()
 {
-	lua_State *L = getStack();
-
-	// Get minetest.object_refs[i]
-	lua_getglobal(L, "minetest");
-	lua_getfield(L, -1, "object_refs");
-	luaL_checktype(L, -1, LUA_TTABLE);
-	lua_pushnumber(L, id);
-	lua_gettable(L, -2);
-	lua_remove(L, -2); // object_refs
-	lua_remove(L, -2); // minetest
+	return dynamic_cast<Server *>(m_gamedef);
 }
+#ifndef SERVER
+Client* ScriptApiBase::getClient()
+{
+	return dynamic_cast<Client *>(m_gamedef);
+}
+#endif