vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

safer HookMethod and more sandboxed cs mods

Browse Source
This commit is contained in:
Oiltanker
2022-04-17 19:26:54 +03:00
parent 03881f1240
commit e52f762861
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptFilter.cs
+3 -1
View File
@@ -34,8 +34,10 @@ namespace Barotrauma {
}; };
private static readonly string[] typesProhibited = new string[] { private static readonly string[] typesProhibited = new string[] {
//"System.Reflection", //"System.Reflection",
//"System.Type",
"System.IO", "System.IO",
"Moonsharp" "Moonsharp",
"Barotrauma.IO",
}; };
public static bool IsTypeAllowed(string name) public static bool IsTypeAllowed(string name)
{ {
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs
+5
View File
@@ -215,9 +215,14 @@ namespace Barotrauma
return methodInfo; return methodInfo;
} }
private static readonly string[] prohibitedHooks = {
"Barotrauma.Lua",
"Barotrauma.Cs"
};
public void HookMethod(string identifier, MethodInfo method, LuaCsPatch patch, HookMethodType hookType = HookMethodType.Before, ACsMod owner = null) public void HookMethod(string identifier, MethodInfo method, LuaCsPatch patch, HookMethodType hookType = HookMethodType.Before, ACsMod owner = null)
{ {
if (identifier == null || method == null || patch == null) throw new ArgumentNullException("Identifier, Method and Patch arguments must not be null."); if (identifier == null || method == null || patch == null) throw new ArgumentNullException("Identifier, Method and Patch arguments must not be null.");
if (prohibitedHooks.Any(h => method.DeclaringType.FullName.StartsWith(h))) throw new ArgumentException("Hooks into Modding Environment are prohibited.");
var funcAddr = ((long)method.MethodHandle.GetFunctionPointer()); var funcAddr = ((long)method.MethodHandle.GetFunctionPointer());
var patches = Harmony.GetPatchInfo(method); var patches = Harmony.GetPatchInfo(method);