angr 9.2.117__py3-none-macosx_11_0_arm64.whl → 9.2.119__py3-none-macosx_11_0_arm64.whl

angr/misc/autoimport.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import importlib
 import importlib.machinery
@@ -23,7 +24,7 @@ def auto_import_packages(base_module, base_path, ignore_dirs=(), ignore_files=()
         l.debug("Loading %s.%s", base_module, lib_module_name)
 
         try:
-            package = importlib.import_module(".%s" % lib_module_name, base_module)
+            package = importlib.import_module(f".{lib_module_name}", base_module)
         except ImportError:
             l.warning("Unable to autoimport package %s.%s", base_module, lib_module_name, exc_info=True)
         else:
@@ -47,7 +48,7 @@ def auto_import_modules(base_module, base_path, ignore_files=(), filter_func: Ca
             continue
 
         try:
-            proc_module = importlib.import_module(".%s" % proc_module_name, base_module)
+            proc_module = importlib.import_module(f".{proc_module_name}", base_module)
         except ImportError:
             l.warning("Unable to autoimport module %s.%s", base_module, proc_module_name, exc_info=True)
             continue

angr/misc/bug_report.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import importlib.metadata
 import os
 import sys
@@ -21,7 +22,7 @@ native_modules = {
     "angr": lambda: angr.state_plugins.unicorn_engine._UC_NATIVE,  # pylint: disable=undefined-variable
     "unicorn": lambda: unicorn.unicorn._uc,  # pylint: disable=undefined-variable
     "pyvex": lambda: pyvex.pvc,  # pylint: disable=undefined-variable
-    "z3": lambda: [x for x in gc.get_objects() if type(x) is ctypes.CDLL and "z3" in str(x)][0],  # YIKES FOREVER
+    "z3": lambda: next(x for x in gc.get_objects() if type(x) is ctypes.CDLL and "z3" in str(x)),  # YIKES FOREVER
 }
 python_packages = {"z3": "z3-solver"}
 
@@ -34,7 +35,7 @@ def get_venv():
 
 def print_versions():
     for m in angr_modules:
-        print("######## %s #########" % m)
+        print(f"######## {m} #########")
         try:
             python_filename = importlib.util.find_spec(m).origin
         except ImportError:
@@ -42,11 +43,11 @@ def print_versions():
             continue
         except Exception as e:  # pylint: disable=broad-except
             print(f"An error occurred importing {m}: {e}")
-        print("Python found it in %s" % (python_filename))
+        print(f"Python found it in {python_filename}")
         try:
             pip_package = python_packages.get(m, m)
             pip_version = importlib.metadata.version(pip_package)
-            print("Pip version %s" % pip_version)
+            print(f"Pip version {pip_version}")
         except Exception:  # pylint: disable-broad-except
             print("Pip version not found!")
         print_git_info(python_filename)
@@ -72,7 +73,7 @@ def print_git_info(dirname):
             remote_url = repo.remotes[remote_name].url
             print(f"\tChecked out from remote {remote_name}: {remote_url}")
         else:
-            print("Tracking local branch %s" % cur_tb.name)
+            print(f"Tracking local branch {cur_tb.name}")
     except Exception:  # pylint: disable=broad-except
         print("Could not resolve tracking branch or remote info!")
 

angr/misc/hookset.py

@@ -4,6 +4,8 @@ This process is formalized as a "hooking" of a python method - each exploration
 the same name on the simulation manager class.
 """
 
+from __future__ import annotations
+
 
 class HookSet:
     """
@@ -97,8 +99,7 @@ class HookedMethod:
             finally:
                 self.pending.append(current_hook)
             return result
-        else:
-            return self.func(*args, **kwargs)
+        return self.func(*args, **kwargs)
 
     def copy_to(self, new_func):
         new_hooked = HookedMethod(new_func)

angr/misc/loggers.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import traceback
 import logging
 import zlib
@@ -49,8 +50,7 @@ class Loggers:
         real_k = k.replace("_", ".")
         if real_k in self._loggers:
             return self._loggers[real_k]
-        else:
-            raise AttributeError(k)
+        raise AttributeError(k)
 
     def __dir__(self):
         return list(super().__dir__()) + list(self._loggers.keys())

angr/misc/picklable_lock.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import threading
 
 

angr/misc/plugins.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import TypeVar, Generic
 
 from angr.errors import AngrNoPluginError
@@ -74,8 +75,8 @@ class PluginHub(Generic[P]):
     def __getattr__(self, name: str) -> P:
         try:
             return self.get_plugin(name)
-        except AngrNoPluginError:
-            raise AttributeError(name)
+        except AngrNoPluginError as err:
+            raise AttributeError(name) from err
 
     def __dir__(self):
         out = set(self.__dict__)
@@ -120,11 +121,11 @@ class PluginHub(Generic[P]):
         if isinstance(preset, str):
             try:
                 preset = self._presets[preset]
-            except (AttributeError, KeyError):
-                raise AngrNoPluginError("There is no preset named %s" % preset)
+            except (AttributeError, KeyError) as err:
+                raise AngrNoPluginError(f"There is no preset named {preset}") from err
 
         elif not isinstance(preset, PluginPreset):
-            raise ValueError("Argument must be an instance of PluginPreset: %s" % preset)
+            raise ValueError(f"Argument must be an instance of PluginPreset: {preset}")
 
         if self._active_preset:
             l.warning("Overriding active preset %s with %s", self._active_preset, preset)
@@ -156,7 +157,7 @@ class PluginHub(Generic[P]):
         if name in self._active_plugins:
             return self._active_plugins[name]
 
-        elif self._active_preset is not None:
+        if self._active_preset is not None:
             plugin_cls: type[P] = self._active_preset.request_plugin(name)
             plugin = self._init_plugin(plugin_cls)
 
@@ -166,8 +167,7 @@ class PluginHub(Generic[P]):
             self.register_plugin(name, plugin)
             return plugin
 
-        else:
-            raise AngrNoPluginError("No such plugin: %s" % name)
+        raise AngrNoPluginError(f"No such plugin: {name}")
 
     def _init_plugin(self, plugin_cls: type[P]) -> P:  # pylint: disable=no-self-use
         """
@@ -250,8 +250,8 @@ class PluginPreset:
         """
         try:
             return self._default_plugins[name]
-        except KeyError:
-            raise AngrNoPluginError("There is no plugin named %s" % name)
+        except KeyError as err:
+            raise AngrNoPluginError(f"There is no plugin named {name}") from err
 
     def copy(self):
         """
@@ -266,7 +266,7 @@ class PluginPreset:
 class PluginVendor(Generic[P], PluginHub[P]):
     """
     A specialized hub which serves only as a plugin vendor, never having any "active" plugins.
-    It will directly return the plugins provided by the preset instead of instanciating them.
+    It will directly return the plugins provided by the preset instead of instantiating them.
     """
 
     def release_plugin(self, name):
@@ -287,5 +287,3 @@ class VendorPreset(PluginPreset):
     """
     A specialized preset class for use with the PluginVendor.
     """
-
-    ...

angr/misc/range.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class IRange:
     """
     A simple range object for testing inclusion. Like range but works for huge numbers.

angr/misc/telemetry.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+import enum
+
+try:
+    from opentelemetry.trace import get_current_span, Status, StatusCode, Tracer, get_tracer as _get_tracer
+except ImportError:
+    if TYPE_CHECKING:
+        raise
+
+    # pylint: disable=missing-class-docstring,unused-argument
+    class Status:
+        def __init__(self, *args, **kwargs):
+            pass
+
+    class StatusCode(enum.Enum):
+        OK = 0
+        UNSET = 1
+        ERROR = 2
+
+    class Tracer:
+        @staticmethod
+        def start_as_current_span(*args, **kwargs):
+            def inner(f):
+                return f
+
+            return inner
+
+        @staticmethod
+        def get_current_span(*args, **kwargs):
+            return Span()
+
+    def _get_tracer(*args, **kwargs):
+        return Tracer()
+
+    class Span:
+        @staticmethod
+        def set_attribute(*args, **kwargs):
+            pass
+
+        @staticmethod
+        def add_event(*args, **kwargs):
+            pass
+
+    get_current_span = Tracer.get_current_span
+
+
+from angr import __version__
+
+__all__ = ["get_tracer", "get_current_span", "Status", "StatusCode"]
+
+
+def get_tracer(name: str) -> Tracer:
+    return _get_tracer(name, __version__)

angr/misc/testing.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 
 TESTER_MODULE_NAMES = ["unittest", "pytest", "_pytest", "nose", "nose2"]
@@ -14,7 +15,7 @@ def detect_test_env():
 
         if frame_module == "__main__" or frame_module == "__console__":
             return False
-        elif frame_module is not None and any(
+        if frame_module is not None and any(
             frame_module.startswith(module_name + ".") for module_name in TESTER_MODULE_NAMES
         ):
             return True

angr/misc/ux.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import warnings
 
 
@@ -7,9 +8,8 @@ once_set = set()
 def once(key):
     if key in once_set:
         return False
-    else:
-        once_set.add(key)
-        return True
+    once_set.add(key)
+    return True
 
 
 already_complained = set()
@@ -20,9 +20,9 @@ def deprecated(replacement=None):
         def inner(*args, **kwargs):
             if func not in already_complained:
                 if replacement is None:
-                    warnings.warn("Don't use %s" % (func.__name__), DeprecationWarning)
+                    warnings.warn(f"Don't use {func.__name__}", DeprecationWarning, stacklevel=1)
                 else:
-                    warnings.warn(f"Use {replacement} instead of {func.__name__}", DeprecationWarning)
+                    warnings.warn(f"Use {replacement} instead of {func.__name__}", DeprecationWarning, stacklevel=1)
                 already_complained.add(func)
             return func(*args, **kwargs)
 

angr/misc/weakpatch.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from weakref import WeakValueDictionary, WeakKeyDictionary, _IterationGuard
 
 

angr/procedures/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import annotations
 from .procedure_dict import SIM_PROCEDURES, SimProcedures
 from .definitions import SIM_LIBRARIES, SIM_TYPE_COLLECTIONS

angr/procedures/cgc/_terminate.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/cgc/allocate.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy

angr/procedures/cgc/deallocate.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy

angr/procedures/cgc/fdwait.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import itertools
 
 import claripy

angr/procedures/cgc/random.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import itertools
 
 import claripy

angr/procedures/cgc/receive.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from itertools import count
 
 import claripy
@@ -63,31 +64,30 @@ class receive(angr.SimProcedure):
             self.size = read_length
 
             return 0
-        else:
-            if self.state.solver.solution(count != 0, True):
-                data, read_length = simfd.read_data(count)
-                if not self.state.solver.is_true(read_length == 0):
-                    self.state.memory.store(buf, data, size=read_length)
-                action_list = list(self.state.history.recent_actions)
-
-                try:
-                    # get and fix up the memory write
-                    action = next(
-                        a
-                        for a in reversed(action_list)
-                        if isinstance(a, SimActionData) and a.action == "write" and a.type == "mem"
-                    )
-                    action.size.ast = read_length
-                    action.data.ast = action.actual_value.ast
-                    self.data = data
-                except StopIteration:
-                    # the write didn't occur (i.e., size of 0)
-                    self.data = None
-            else:
+        if self.state.solver.solution(count != 0, True):
+            data, read_length = simfd.read_data(count)
+            if not self.state.solver.is_true(read_length == 0):
+                self.state.memory.store(buf, data, size=read_length)
+            action_list = list(self.state.history.recent_actions)
+
+            try:
+                # get and fix up the memory write
+                action = next(
+                    a
+                    for a in reversed(action_list)
+                    if isinstance(a, SimActionData) and a.action == "write" and a.type == "mem"
+                )
+                action.size.ast = read_length
+                action.data.ast = action.actual_value.ast
+                self.data = data
+            except StopIteration:
+                # the write didn't occur (i.e., size of 0)
                 self.data = None
+        else:
+            self.data = None
 
-            self.size = read_length
-            if type(read_length) is int:
-                read_length = claripy.BVV(read_length, 32)
-            self.state.memory.store(rx_bytes, read_length, condition=rx_bytes != 0, endness="Iend_LE")
-            return 0
+        self.size = read_length
+        if type(read_length) is int:
+            read_length = claripy.BVV(read_length, 32)
+        self.state.memory.store(rx_bytes, read_length, condition=rx_bytes != 0, endness="Iend_LE")
+        return 0

angr/procedures/cgc/transmit.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/definitions/__init__.py

@@ -1,4 +1,5 @@
 # pylint:disable=arguments-renamed,global-statement
+from __future__ import annotations
 import copy
 import os
 import logging
@@ -25,8 +26,8 @@ if TYPE_CHECKING:
 
 
 l = logging.getLogger(name=__name__)
-SIM_LIBRARIES: dict[str, "SimLibrary"] = {}
-SIM_TYPE_COLLECTIONS: dict[str, "SimTypeCollection"] = {}
+SIM_LIBRARIES: dict[str, SimLibrary] = {}
+SIM_TYPE_COLLECTIONS: dict[str, SimTypeCollection] = {}
 
 
 class SimTypeCollection:
@@ -36,14 +37,14 @@ class SimTypeCollection:
 
     def __init__(self):
         self.names: list[str] | None = None
-        self.types: dict[str, "SimType"] = {}
+        self.types: dict[str, SimType] = {}
 
     def set_names(self, *names):
         self.names = names
         for name in names:
             SIM_TYPE_COLLECTIONS[name] = self
 
-    def add(self, name: str, t: "SimType") -> None:
+    def add(self, name: str, t: SimType) -> None:
         """
         Add a type to the collection.
 
@@ -53,7 +54,7 @@ class SimTypeCollection:
 
         self.types[name] = t
 
-    def get(self, name: str, bottom_on_missing: bool = False) -> "SimType":
+    def get(self, name: str, bottom_on_missing: bool = False) -> SimType:
         """
         Get a SimType object from the collection as identified by the name.
 
@@ -273,8 +274,7 @@ class SimLibrary:
             proc = copy.deepcopy(self.procedures[name])
             self._apply_metadata(proc, arch)
             return proc
-        else:
-            return self.get_stub(name, arch)
+        return self.get_stub(name, arch)
 
     def get_stub(self, name, arch):
         """
@@ -470,7 +470,7 @@ class SimSyscallLibrary(SimLibrary):
         super().__init__()
         self.syscall_number_mapping: dict[str, dict[int, str]] = defaultdict(dict)  # keyed by abi
         self.syscall_name_mapping: dict[str, dict[str, int]] = defaultdict(dict)  # keyed by abi
-        self.default_cc_mapping: dict[str, type["SimCCSyscall"]] = {}  # keyed by abi
+        self.default_cc_mapping: dict[str, type[SimCCSyscall]] = {}  # keyed by abi
         self.syscall_prototypes: dict[str, dict[str, SimTypeFunction]] = defaultdict(dict)  # keyed by abi
         self.fallback_proc = stub_syscall
 
@@ -743,8 +743,7 @@ def load_win32api_definitions():
         for _ in autoimport.auto_import_modules(
             "angr.procedures.definitions",
             _DEFINITIONS_BASEDIR,
-            filter_func=lambda module_name: module_name.startswith("win32_")
-            or module_name.startswith("wdk_")
+            filter_func=lambda module_name: module_name.startswith(("win32_", "wdk_"))
             or module_name in {"ntoskrnl", "ntdll", "user32"},
         ):
             pass

angr/procedures/definitions/cgc.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import SimSyscallLibrary
 from .. import SIM_PROCEDURES as P
 

angr/procedures/definitions/glibc.py

@@ -1,4 +1,5 @@
 # pylint:disable=line-too-long
+from __future__ import annotations
 import logging
 
 from ...sim_type import (

angr/procedures/definitions/gnulib.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from ...sim_type import SimTypeFunction, \

angr/procedures/definitions/libstdcpp.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from ...sim_type import SimTypeFunction, SimTypePointer, SimTypeChar, SimTypeBottom
 from .. import SIM_PROCEDURES as P
 from . import SimCppLibrary

angr/procedures/definitions/linux_kernel.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 from typing import Dict
 

angr/procedures/definitions/linux_loader.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import SimLibrary
 from .. import SIM_PROCEDURES as P
 

angr/procedures/definitions/msvcr.py

@@ -1,4 +1,5 @@
 # Microsoft Visual C/C++ Runtime
+from __future__ import annotations
 from . import SimLibrary
 from .. import SIM_PROCEDURES as P
 from ...calling_conventions import SimCCMicrosoftAMD64

angr/procedures/definitions/parse_syscalls_from_local_system.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import xml.etree.ElementTree
 import glob
 import os
@@ -23,7 +24,7 @@ def parse_unistd_include_header(header_path):
 
 
 def dump_mapping(abi, mapping):
-    print('\nlib.add_number_mapping_from_dict("%s", {' % abi)
+    print(f'\nlib.add_number_mapping_from_dict("{abi}", {{')
     for num in sorted(mapping):
         print('    %d: "%s",' % (num, mapping[num]))
     print('})')

angr/procedures/definitions/parse_win32json.py

@@ -1,4 +1,5 @@
 # Based on https://github.com/dfraze/binja_winmd/blob/main/main.py. Thank you, Dustin Fraze!
+from __future__ import annotations
 
 from typing import Set
 import json
@@ -32,47 +33,45 @@ def is_anonymous_struct(s_name: str) -> bool:
 def get_angr_type_from_name(name):
     if name == "Byte":
         return angr.types.SimTypeChar(signed=False, label="Byte")
-    elif name == "SByte":
+    if name == "SByte":
         return angr.types.SimTypeChar(signed=True, label="SByte")
-    elif name == "Char":
+    if name == "Char":
         return angr.types.SimTypeChar(signed=True, label="Char")
-    elif name == "UInt16":
+    if name == "UInt16":
         return angr.types.SimTypeShort(signed=False, label="UInt16")
-    elif name == "Int16":
+    if name == "Int16":
         return angr.types.SimTypeShort(signed=True, label="Int16")
-    elif name == "Int64":
+    if name == "Int64":
         return angr.types.SimTypeLongLong(signed=True, label="Int64")
-    elif name == "UInt32":
+    if name == "UInt32":
         return angr.types.SimTypeInt(signed=False, label="UInt32")
-    elif name == "UInt64":
+    if name == "UInt64":
         return angr.types.SimTypeLongLong(signed=False, label="UInt64")
-    elif name == "Int32":
+    if name == "Int32":
         return angr.types.SimTypeInt(signed=True, label="Int32")
-    elif name == "Single":
+    if name == "Single":
         return angr.types.SimTypeFloat(size=32)
-    elif name == "Double":
+    if name == "Double":
         return angr.types.SimTypeFloat(size=64)
-    elif name == "UIntPtr":
+    if name == "UIntPtr":
         return angr.types.SimTypePointer(angr.types.SimTypeInt(signed=False, label="UInt"), label="UIntPtr")
-    elif name == "IntPtr":
+    if name == "IntPtr":
         return angr.types.SimTypePointer(angr.types.SimTypeInt(signed=True, label="Int"), label="IntPtr")
-    elif name == "Void":
+    if name == "Void":
         return angr.types.SimTypeBottom(label="Void")
-    elif name == "Boolean":
+    if name == "Boolean":
         return angr.types.SimTypeBool(label="Boolean")
-    elif name == "Guid":
+    if name == "Guid":
         # FIXME
         return angr.types.SimTypeBottom(label="Guid")
-    else:
-        print(f"Unhandled Native Type: {name}")
-        sys.exit(-1)
+    print(f"Unhandled Native Type: {name}")
+    sys.exit(-1)
 
 
 def get_typeref_from_struct_type(t: angr.types.SimType) -> angr.types.SimType:
-    if isinstance(t, angr.types.SimStruct):
-        if t.name and not is_anonymous_struct(t.name):
-            # replace it with a SimTypeRef to avoid duplicate definition
-            t = angr.types.SimTypeRef(t.name, angr.types.SimStruct)
+    if isinstance(t, angr.types.SimStruct) and t.name and not is_anonymous_struct(t.name):
+        # replace it with a SimTypeRef to avoid duplicate definition
+        t = angr.types.SimTypeRef(t.name, angr.types.SimStruct)
     return t
 
 
@@ -86,8 +85,7 @@ def handle_json_type(t, create_missing: bool = False):
         elem = get_typeref_from_struct_type(handle_json_type(t["Child"], create_missing=create_missing))
         if t["Shape"]:
             return angr.types.SimTypeFixedSizeArray(elem, length=int(t["Shape"]["Size"]))
-        else:
-            return angr.types.SimTypePointer(elem)
+        return angr.types.SimTypePointer(elem)
     if t["Kind"] == "ApiRef":
         try:
             named_type = typelib.get(t["Name"], bottom_on_missing=create_missing)
@@ -117,9 +115,8 @@ def handle_json_type(t, create_missing: bool = False):
         return angr.types.SimUnion(members)
     if t["Kind"] == "MissingClrType":
         return angr.types.SimTypeBottom(label="MissingClrType")
-    else:
-        print(f"Unhandled type: {t}")
-        sys.exit(0)
+    print(f"Unhandled type: {t}")
+    sys.exit(0)
 
 
 def create_angr_type_from_json(t):
@@ -149,11 +146,11 @@ def create_angr_type_from_json(t):
         # TODO: Handle Com
         typelib.add(t["Name"], angr.types.SimTypeBottom(label=t["Name"]))
     elif t["Kind"] == "ComClassID":
-        return None
+        return
     elif t["Kind"] == "Union":
         real_new_type = handle_json_type(t)
         typelib.add(t["Name"], real_new_type)
-        return None
+        return
     else:
         print(f"Found unknown type kind: {t['Kind']}")
 
@@ -210,7 +207,7 @@ def do_it(in_dir, out_file):
         for f in funcs:
             libname = f["DllImport"].lower()
             suffix = ""
-            if libname.endswith(".dll") or libname.endswith(".exe") or libname.endswith(".sys"):
+            if libname.endswith((".dll", ".exe", ".sys")):
                 suffix = libname[-3:]
                 libname = libname[:-4]
             # special case: put all wdk_ntdll.dll APIs under ntoskrnl.exe to avoid conflict with user-space ntdll.dll

angr/procedures/definitions/types_win32.py

@@ -1,4 +1,5 @@
 # pylint:disable=line-too-long
+from __future__ import annotations
 from collections import OrderedDict
 
 from angr.procedures.definitions import SimTypeCollection