mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 14:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disalow importing some files

Browse Source 
Not all modules should be able to load all other modules. A predicate
function can to be passed to the `ScriptInterface`. That function
returns whether the module is allowed to loat the module. If no
predicate is passed in no modules can be loaded through that
`ScriptInterface`.
This commit is contained in:
phosit
2025-02-05 15:15:53 +01:00
committed by phosit
parent 6492bc705a
commit 05869454e5
9 changed files with 167 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ScriptInterface.cpp
+13 -7
View File
@@ -53,7 +53,8 @@
struct ScriptInterface_impl
{
ScriptInterface_impl(const char* nativeScopeName, ScriptContext& context, JS::Compartment* compartment);
ScriptInterface_impl(const char* nativeScopeName, ScriptContext& context,
JS::Compartment* compartment, std::function<bool(const VfsPath&)> allowModule);
~ScriptInterface_impl();
// Take care to keep this declaration before heap rooted members. Destructors of heap rooted
@@ -303,9 +304,10 @@ bool ScriptInterface::Math_random(JSContext* cx, uint argc, JS::Value* vp)
}
ScriptInterface_impl::ScriptInterface_impl(const char* nativeScopeName, ScriptContext& context,
JS::Compartment* compartment) :
JS::Compartment* compartment, std::function<bool(const VfsPath&)> allowModule) :
m_context(context), m_cx(context.GetGeneralJSContext()), m_glob(context.GetGeneralJSContext()),
m_nativeScope(context.GetGeneralJSContext())
m_nativeScope(context.GetGeneralJSContext()),
m_ModuleLoader{std::move(allowModule)}
{
JS::RealmCreationOptions creationOpt;
// Keep JIT code during non-shrinking GCs. This brings a quite big performance improvement.
@@ -351,8 +353,10 @@ ScriptInterface_impl::~ScriptInterface_impl()
m_context.UnRegisterRealm(JS::GetObjectRealmOrNull(m_glob));
}
ScriptInterface::ScriptInterface(const char* nativeScopeName, const char* debugName, ScriptContext& context) :
m(std::make_unique<ScriptInterface_impl>(nativeScopeName, context, nullptr))
ScriptInterface::ScriptInterface(const char* nativeScopeName, const char* debugName, ScriptContext& context,
std::function<bool(const VfsPath&)> allowModule) :
m{std::make_unique<ScriptInterface_impl>(nativeScopeName, context, nullptr,
std::move(allowModule))}
{
// Profiler stats table isn't thread-safe, so only enable this on the main thread
if (Threading::IsMainThread())
@@ -366,11 +370,13 @@ ScriptInterface::ScriptInterface(const char* nativeScopeName, const char* debugN
JS::SetRealmPrivate(JS::GetObjectRealmOrNull(rq.glob), (void*)&m_CmptPrivate);
}
ScriptInterface::ScriptInterface(const char* nativeScopeName, const char* debugName, const ScriptInterface& neighbor)
ScriptInterface::ScriptInterface(const char* nativeScopeName, const char* debugName,
const ScriptInterface& neighbor, std::function<bool(const VfsPath& path)> allowModule)
{
ScriptRequest nrq(neighbor);
JS::Compartment* comp = JS::GetCompartmentForRealm(JS::GetCurrentRealmOrNull(nrq.cx));
m = std::make_unique<ScriptInterface_impl>(nativeScopeName, neighbor.GetContext(), comp);
m = std::make_unique<ScriptInterface_impl>(nativeScopeName, neighbor.GetContext(), comp,
std::move(allowModule));
// Profiler stats table isn't thread-safe, so only enable this on the main thread
if (Threading::IsMainThread())