From a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Jun 2026 16:24:49 -0500 Subject: Adding metadata --- .../js2py/files/js2py-0.74-CVE-2024-28397.patch | 21 -------- .../js2py/files/js2py-0.74-py312-load_attr.patch | 57 ---------------------- 2 files changed, 78 deletions(-) delete mode 100644 dev-python/js2py/files/js2py-0.74-CVE-2024-28397.patch delete mode 100644 dev-python/js2py/files/js2py-0.74-py312-load_attr.patch (limited to 'dev-python/js2py/files') diff --git a/dev-python/js2py/files/js2py-0.74-CVE-2024-28397.patch b/dev-python/js2py/files/js2py-0.74-CVE-2024-28397.patch deleted file mode 100644 index c8ecfab22485..000000000000 --- a/dev-python/js2py/files/js2py-0.74-CVE-2024-28397.patch +++ /dev/null @@ -1,21 +0,0 @@ -# https://nvd.nist.gov/vuln/detail/CVE-2024-28397 -# https://github.com/Marven11/CVE-2024-28397-js2py-Sandbox-Escape/blob/main/patch.txt -# https://github.com/PiotrDabkowski/Js2Py/pull/323 -# https://github.com/Marven11/Js2Py/commit/56e244eb - -Author: Marven11 <110723864+Marven11@users.noreply.github.com> -Date: Fri, 1 Mar 2024 12:53:58 +0800 - -diff --git a/js2py/constructors/jsobject.py b/js2py/constructors/jsobject.py -index c4e0ada3..b1806ea6 100644 ---- a/js2py/constructors/jsobject.py -+++ b/js2py/constructors/jsobject.py -@@ -49,7 +49,7 @@ def getOwnPropertyNames(obj): - raise MakeError( - 'TypeError', - 'Object.getOwnPropertyDescriptor called on non-object') -- return obj.own.keys() -+ return list(obj.own.keys()) - - def create(obj): - if not (obj.is_object() or obj.is_null()): diff --git a/dev-python/js2py/files/js2py-0.74-py312-load_attr.patch b/dev-python/js2py/files/js2py-0.74-py312-load_attr.patch deleted file mode 100644 index 6dfa467cc41f..000000000000 --- a/dev-python/js2py/files/js2py-0.74-py312-load_attr.patch +++ /dev/null @@ -1,57 +0,0 @@ -From fd7df4a91fb08060914c7b1d9e94583d18f3371b Mon Sep 17 00:00:00 2001 -From: Felix Yan -Date: Wed, 17 Apr 2024 16:47:47 +0300 -Subject: [PATCH] Fix bytecode for Python 3.12 - -`LOAD_ATTR` has been changed in Python 3.12 and it seems reusing the -`LOAD_GLOBAL` logic makes the simple tests passing. - -I am not sure if this is correct since I'm pretty new to the code, but -maybe it's still helpful. ---- - js2py/translators/translating_nodes.py | 2 +- - js2py/utils/injector.py | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/js2py/translators/translating_nodes.py b/js2py/translators/translating_nodes.py -index 4e2b5760..a780ba73 100644 ---- a/js2py/translators/translating_nodes.py -+++ b/js2py/translators/translating_nodes.py -@@ -543,7 +543,7 @@ def TryStatement(type, block, handler, handlers, guardedHandlers, finalizer): - if handler: - identifier = handler['param']['name'] - holder = 'PyJsHolder_%s_%d' % (to_hex(identifier), -- random.randrange(1e8)) -+ random.randrange(six.integer_types[-1](1e8))) - identifier = repr(identifier) - result += 'except PyJsException as PyJsTempException:\n' - # fill in except ( catch ) block and remember to recover holder variable to its previous state -diff --git a/js2py/utils/injector.py b/js2py/utils/injector.py -index 88e0d93e..835229f0 100644 ---- a/js2py/utils/injector.py -+++ b/js2py/utils/injector.py -@@ -14,6 +14,7 @@ - # Opcode constants used for comparison and replacecment - LOAD_FAST = opcode.opmap['LOAD_FAST'] - LOAD_GLOBAL = opcode.opmap['LOAD_GLOBAL'] -+LOAD_ATTR = opcode.opmap['LOAD_ATTR'] - STORE_FAST = opcode.opmap['STORE_FAST'] - - -@@ -79,6 +80,7 @@ def append_arguments(code_obj, new_locals): - (co_names.index(name), varnames.index(name)) for name in new_locals) - - is_new_bytecode = sys.version_info >= (3, 11) -+ is_new_load_attr = sys.version_info >= (3, 12) - # Now we modify the actual bytecode - modified = [] - drop_future_cache = False -@@ -97,7 +99,7 @@ def append_arguments(code_obj, new_locals): - # it's one of the globals that we are replacing. Either way, - # update its arg using the appropriate dict. - drop_future_cache = False -- if inst.opcode == LOAD_GLOBAL: -+ if inst.opcode == LOAD_GLOBAL or (is_new_load_attr and inst.opcode == LOAD_ATTR): - idx = inst.arg - if is_new_bytecode: - idx = idx // 2 -- cgit v1.3