From: Jeija <norrepli@gmail.com>
Date: Thu, 25 Feb 2016 09:22:54 +0000 (+0100)
Subject: Require minetest.request_http_api to be called from the mod's main scope
X-Git-Tag: 0.4.14~204
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1100a5d614c2eaf8e1c4f3adbc70b477e01a405c;p=oweals%2Fminetest.git

Require minetest.request_http_api to be called from the mod's main scope

Fixes #3764
---

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index aee3674d0..8c879c96e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2337,7 +2337,7 @@ These functions return the leftover itemstack.
       otherwise returns `nil`.
     * The returned table contains the functions `fetch`, `fetch_async` and `fetch_async_get`
       described below.
-    * Only works at init time.
+    * Only works at init time and must be called from the mod's main scope (not from a function).
     * Function only exists if minetest server was built with cURL support.
     * **DO NOT ALLOW ANY OTHER MODS TO ACCESS THE RETURNED TABLE, STORE IT IN
       A LOCAL VARIABLE!**
diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp
index b0357e3e0..8bd39b6ed 100644
--- a/src/script/lua_api/l_http.cpp
+++ b/src/script/lua_api/l_http.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_http.h"
 #include "httpfetch.h"
 #include "settings.h"
+#include "debug.h"
 #include "log.h"
 
 #include <algorithm>
@@ -130,11 +131,27 @@ int ModApiHttp::l_request_http_api(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
+	// We have to make sure that this function is being called directly by
+	// a mod, otherwise a malicious mod could override this function and
+	// steal its return value.
+	lua_Debug info;
+
+	// Make sure there's only one item below this function on the stack...
+	if (lua_getstack(L, 2, &info)) {
+		return 0;
+	}
+	FATAL_ERROR_IF(!lua_getstack(L, 1, &info), "lua_getstack() failed");
+	FATAL_ERROR_IF(!lua_getinfo(L, "S", &info), "lua_getinfo() failed");
+
+	// ...and that that item is the main file scope.
+	if (strcmp(info.what, "main") != 0) {
+		return 0;
+	}
+
 	// Mod must be listed in secure.http_mods or secure.trusted_mods
 	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
 	if (!lua_isstring(L, -1)) {
-		lua_pushnil(L);
-		return 1;
+		return 0;
 	}
 
 	const char *mod_name = lua_tostring(L, -1);