Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 11:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

jailed exec: add support for __builtins__ global

Browse Source
This commit is contained in:
Benoit Favre 2025-02-28 15:07:20 +01:00
parent efacdad731
commit b77463f5b2
2 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/interpreter/ceval.c
View File

@ -253,6 +253,20 @@ FrameResult VM__run_top_frame(VM* self) {
} }
if(res == -1) goto __ERROR; if(res == -1) goto __ERROR;
// builtins // builtins
if (self->max_steps > 0) {
int res = Frame__getglobal(frame, py_name("__builtins__"));
if (res == 1) {
py_Ref builtins = &self->last_retval;
if(!py_istype(builtins, tp_dict)) { return TypeError("__builtins__ must be a dict object"); }
res = py_dict_getitem(builtins, py_name2ref(name));
if (res == 1) {
PUSH(&self->last_retval);
DISPATCH();
}
}
NameError(name);
goto __ERROR;
}
py_Ref tmp = py_getdict(&self->builtins, name); py_Ref tmp = py_getdict(&self->builtins, name);
if(tmp != NULL) { if(tmp != NULL) {
PUSH(tmp); PUSH(tmp);
@ -275,6 +289,20 @@ FrameResult VM__run_top_frame(VM* self) {
} }
if(res == -1) goto __ERROR; if(res == -1) goto __ERROR;
if (self->max_steps > 0) {
int res = Frame__getglobal(frame, py_name("__builtins__"));
if (res == 1) {
py_Ref builtins = &self->last_retval;
if(!py_istype(builtins, tp_dict)) { return TypeError("__builtins__ must be a dict object"); }
res = py_dict_getitem(builtins, py_name2ref(name));
if (res == 1) {
PUSH(&self->last_retval);
DISPATCH();
}
}
NameError(name);
goto __ERROR;
}
tmp = py_getdict(&self->builtins, name); tmp = py_getdict(&self->builtins, name);
if(tmp != NULL) { if(tmp != NULL) {
PUSH(tmp); PUSH(tmp);
@ -291,6 +319,20 @@ FrameResult VM__run_top_frame(VM* self) {
DISPATCH(); DISPATCH();
} }
if(res == -1) goto __ERROR; if(res == -1) goto __ERROR;
if (self->max_steps > 0) {
int res = Frame__getglobal(frame, py_name("__builtins__"));
if (res == 1) {
py_Ref builtins = &self->last_retval;
if(!py_istype(builtins, tp_dict)) { return TypeError("__builtins__ must be a dict object"); }
res = py_dict_getitem(builtins, py_name2ref(name));
if (res == 1) {
PUSH(&self->last_retval);
DISPATCH();
}
}
NameError(name);
goto __ERROR;
}
py_Ref tmp = py_getdict(&self->builtins, name); py_Ref tmp = py_getdict(&self->builtins, name);
if(tmp != NULL) { if(tmp != NULL) {
PUSH(tmp); PUSH(tmp);
@ -322,6 +364,20 @@ FrameResult VM__run_top_frame(VM* self) {
DISPATCH(); DISPATCH();
} }
if(res == -1) goto __ERROR; if(res == -1) goto __ERROR;
if (self->max_steps > 0) {
int res = Frame__getglobal(frame, py_name("__builtins__"));
if (res == 1) {
py_Ref builtins = &self->last_retval;
if(!py_istype(builtins, tp_dict)) { return TypeError("__builtins__ must be a dict object"); }
res = py_dict_getitem(builtins, py_name2ref(name));
if (res == 1) {
PUSH(&self->last_retval);
DISPATCH();
}
}
NameError(name);
goto __ERROR;
}
tmp = py_getdict(&self->builtins, name); tmp = py_getdict(&self->builtins, name);
if(tmp) { if(tmp) {
PUSH(tmp); PUSH(tmp);

18
tests/66_eval.py
View File

@ -82,3 +82,21 @@ try:
exec_jailed(100000, code) exec_jailed(100000, code)
except Timeout: except Timeout:
pass pass
code = '''
def f():
z(1)
f()
z(2)
'''
res = []
exec_jailed(100000, code, {'__builtins__': {'z': lambda x: res.append(x)}})
assert res == [1, 2]
code = '''
print(1)
'''
try:
exec_jailed(100000, code, {'__builtins__': {}})
except NameError:
pass