From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Jan 2012 01:04:15 +0000 (+0000)
Subject: prosody: sandboxed require(): Point __index of _G at current env for modules that... 
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=01fc3110b0f60fc099c6659e9082748c7a55949f;p=prosody.git

prosody: sandboxed require(): Point __index of _G at current env for modules that need to reference globals they already set
---

diff --git a/prosody b/prosody
index 385997a6..f79910b7 100755
--- a/prosody
+++ b/prosody
@@ -150,10 +150,14 @@ function sandbox_require()
 		local curr_env_mt = getmetatable(getfenv(2));
 		local _realG_mt = getmetatable(_realG);
 		if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then
-			local old_newindex
+			local old_newindex, old_index;
 			old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
+			old_index, _realG_mt.__index = _realG_mt.__index, function (_G, k)
+				return rawget(curr_env, k);
+			end;
 			local ret = _real_require(...);
 			_realG_mt.__newindex = old_newindex;
+			_realG_mt.__index = old_index;
 			return ret;
 		end
 		return _real_require(...);