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

angr/engines/soot/expressions/length.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootExpr
 
 

angr/engines/soot/expressions/local.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootExpr
 
 

angr/engines/soot/expressions/new.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from ..values import SimSootValue_ThisRef

angr/engines/soot/expressions/newArray.py

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

angr/engines/soot/expressions/newMultiArray.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy
@@ -81,6 +82,5 @@ class SimSootExpr_NewMultiArray(SimSootExpr):
                     s, element_type, inner_sizes
                 ),
             )
-        else:
-            # otherwise, we allocate a simple Array
-            return SimSootExpr_NewArray.new_array(state, element_type, size)
+        # otherwise, we allocate a simple Array
+        return SimSootExpr_NewArray.new_array(state, element_type, size)

angr/engines/soot/expressions/paramref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootExpr
 
 

angr/engines/soot/expressions/phi.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from .base import SimSootExpr

angr/engines/soot/expressions/staticfieldref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootExpr
 
 

angr/engines/soot/expressions/thisref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootExpr
 
 

angr/engines/soot/expressions/unsupported.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootExpr
 
 

angr/engines/soot/field_dispatcher.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from archinfo.arch_soot import SootFieldDescriptor
@@ -24,15 +25,13 @@ def resolve_field(state, field_class, field_name, field_type, raise_exception_if
         if _class_contains_field(class_, field_name, field_type):
             state.javavm_classloader.init_class(class_)
             # if so, create the field_id and return a reference to it
-            field_id = SootFieldDescriptor(class_.name, field_name, field_type)
-            return field_id
+            return SootFieldDescriptor(class_.name, field_name, field_type)
 
     # field could not be found
     l.warning("Couldn't find field %s in classes %s.", field_name, class_hierarchy)
     if raise_exception_if_not_found:
-        raise SootFieldNotLoadedException()
-    else:
-        return SootFieldDescriptor(field_class, field_name, field_type)
+        raise SootFieldNotLoadedException
+    return SootFieldDescriptor(field_class, field_name, field_type)
 
 
 def _class_contains_field(field_class, field_name, field_type):
@@ -44,6 +43,4 @@ def _class_contains_field(field_class, field_name, field_type):
         return False
     field = field_class.fields[field_name]
     # check type
-    if field[1] != field_type:
-        return False
-    return True
+    return field[1] == field_type

angr/engines/soot/method_dispatcher.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from archinfo.arch_soot import SootMethodDescriptor
@@ -25,10 +26,7 @@ def resolve_method(
     :rtype: archinfo.arch_soot.SootMethodDescriptor
     """
     base_class = state.javavm_classloader.get_class(class_name)
-    if include_superclasses:
-        class_hierarchy = state.javavm_classloader.get_class_hierarchy(base_class)
-    else:
-        class_hierarchy = [base_class]
+    class_hierarchy = state.javavm_classloader.get_class_hierarchy(base_class) if include_superclasses else [base_class]
     # walk up in class hierarchy, until method is found
     for class_descriptor in class_hierarchy:
         java_binary = state.project.loader.main_object
@@ -44,6 +42,5 @@ def resolve_method(
     # => fallback: continue with infos available from the invocation, so we
     #              still can use SimProcedures
     if raise_exception_if_not_found:
-        raise SootMethodNotLoadedException()
-    else:
-        return SootMethodDescriptor(class_name, method_name, params, ret_type=ret_type)
+        raise SootMethodNotLoadedException
+    return SootMethodDescriptor(class_name, method_name, params, ret_type=ret_type)

angr/engines/soot/statements/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 l = logging.getLogger("angr.engines.soot.statements")
@@ -8,16 +9,15 @@ def translate_stmt(stmt, state):
     if stmt_name.endswith("Stmt"):
         stmt_name = stmt_name[:-4]
 
-    stmt_cls_name = "SimSootStmt_%s" % stmt_name
+    stmt_cls_name = f"SimSootStmt_{stmt_name}"
     if stmt_cls_name in globals():
         stmt_class = globals()[stmt_cls_name]
         s = stmt_class(stmt, state)
         s.process()
         return s
 
-    else:
-        l.warning("Unsupported Soot statement %s.", stmt_cls_name)
-        return None
+    l.warning("Unsupported Soot statement %s.", stmt_cls_name)
+    return None
 
 
 from .assign import SimSootStmt_Assign

angr/engines/soot/statements/assign.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from ..expressions.invoke import InvokeBase

angr/engines/soot/statements/base.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from archinfo.arch_soot import SootAddressDescriptor
@@ -29,15 +30,13 @@ class SimSootStmt:
         self._execute()
 
     def _execute(self):
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def _translate_expr(self, expr):
-        expr_ = translate_expr(expr, self.state)
-        return expr_
+        return translate_expr(expr, self.state)
 
     def _translate_value(self, value):
-        value_ = translate_value(value, self.state)
-        return value_
+        return translate_value(value, self.state)
 
     def _get_bb_addr_from_instr(self, instr):
         """
@@ -50,9 +49,9 @@ class SimSootStmt:
         current_method = self.state.addr.method
         try:
             bb = current_method.block_by_label[instr]
-        except KeyError:
+        except KeyError as err:
             l.error("Possible jump to a non-existing bb %s --> %d", self.state.addr, instr)
-            raise IncorrectLocationException()
+            raise IncorrectLocationException from err
 
         return SootAddressDescriptor(current_method, bb.idx, 0)
 

angr/engines/soot/statements/goto.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy
@@ -10,4 +11,4 @@ l = logging.getLogger("angr.engines.soot.statements.goto")
 class SimSootStmt_Goto(SimSootStmt):
     def _execute(self):
         jmp_target = self._get_bb_addr_from_instr(instr=self.stmt.target)
-        self._add_jmp_target(target=jmp_target, condition=claripy.true)
+        self._add_jmp_target(target=jmp_target, condition=claripy.true())

angr/engines/soot/statements/identity.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from .base import SimSootStmt

angr/engines/soot/statements/if_.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy
@@ -14,5 +15,5 @@ class SimSootStmt_If(SimSootStmt):
         self._add_jmp_target(target=jmp_target, condition=jmp_condition)
         self._add_jmp_target(
             target=None,  # if target is None, engine goes on linearly
-            condition=(jmp_condition == claripy.false),
+            condition=(jmp_condition == claripy.false()),
         )

angr/engines/soot/statements/invoke.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from .base import SimSootStmt

angr/engines/soot/statements/return_.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootStmt
 
 

angr/engines/soot/statements/switch.py

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

angr/engines/soot/statements/throw.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy
@@ -11,4 +12,4 @@ l = logging.getLogger(name=__name__)
 class SimSootStmt_Throw(SimSootStmt):
     def _execute(self):
         # TODO: implement simprocedure to throw exception
-        self._add_jmp_target(target=SootAddressTerminator(), condition=claripy.true)
+        self._add_jmp_target(target=SootAddressTerminator(), condition=claripy.true())

angr/engines/soot/values/__init__.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 def translate_value(value, state):
     value_name = value.__class__.__name__
     if value_name.startswith("Soot"):
@@ -10,8 +13,7 @@ def translate_value(value, state):
     else:
         return value
 
-    value_ = value_cls.from_sootvalue(value, state)
-    return value_
+    return value_cls.from_sootvalue(value, state)
 
 
 from .local import SimSootValue_Local

angr/engines/soot/values/arrayref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import claripy
@@ -29,8 +30,7 @@ class SimSootValue_ArrayBaseRef(SimSootValue):
         """
         if self._default_value_generator:
             return self._default_value_generator(state)
-        else:
-            return state.project.simos.get_default_value_by_type(self.element_type, state=state)
+        return state.project.simos.get_default_value_by_type(self.element_type, state=state)
 
     def add_default_value_generator(self, generator):
         """
@@ -44,7 +44,7 @@ class SimSootValue_ArrayBaseRef(SimSootValue):
 
     @classmethod
     def from_sootvalue(cls, soot_value, state):
-        raise NotImplementedError()
+        raise NotImplementedError
 
 
 class SimSootValue_ArrayRef(SimSootValue):
@@ -72,14 +72,13 @@ class SimSootValue_ArrayRef(SimSootValue):
         if isinstance(idx_value, SimSootValue_IntConstant):
             # idx is a constant
             return idx_value.value
-        else:
-            # idx is a variable
-            # => load value from memory
-            return state.memory.load(idx_value)
+        # idx is a variable
+        # => load value from memory
+        return state.memory.load(idx_value)
 
     @staticmethod
     def check_array_bounds(idx, array, state):
-        # a valid idx fullfills the constraint
+        # a valid idx fulfills the constraint
         # 0 <= idx < length
         zero = claripy.BVV(0, 32)
         length = array.size
@@ -107,9 +106,8 @@ class SimSootValue_ArrayRef(SimSootValue):
         # raise exception, if index is *always* invalid
         if True not in idx_stays_within_bounds:
             raise SimEngineError(
-                "Access of %s[%s] (length %s) is always invalid. "
+                f"Access of {array.id}[{idx}] (length {length}) is always invalid. "
                 "Cannot continue w/o raising java.lang.ArrayIndexOutOfBoundsException."
-                "" % (array.id, idx, length)
             )
 
         # bound index and/or length, if there are *some* invalid values

angr/engines/soot/values/base.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
+
 class SimSootValue:
     @classmethod
     def from_sootvalue(cls, soot_value, state):
-        raise NotImplementedError()
+        raise NotImplementedError

angr/engines/soot/values/constants.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootValue
 
 

angr/engines/soot/values/instancefieldref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import translate_value
 from .base import SimSootValue
 from ..field_dispatcher import resolve_field

angr/engines/soot/values/local.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootValue
 
 

angr/engines/soot/values/paramref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootValue
 
 

angr/engines/soot/values/staticfieldref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootValue
 from ..field_dispatcher import resolve_field
 

angr/engines/soot/values/strref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .base import SimSootValue
 
 
@@ -5,7 +6,7 @@ class SimSootValue_StringRef(SimSootValue):
     __slots__ = ["id", "type"]
 
     def __init__(self, heap_alloc_id):
-        self.id = "%s.string" % heap_alloc_id
+        self.id = f"{heap_alloc_id}.string"
         self.type = "java.lang.String"
 
     def __repr__(self):
@@ -16,7 +17,7 @@ class SimSootValue_StringRef(SimSootValue):
 
     @classmethod
     def from_sootvalue(cls, soot_value, state):
-        raise NotImplementedError()
+        raise NotImplementedError
 
     @staticmethod
     def new_string(state, value):

angr/engines/soot/values/thisref.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from archinfo.arch_soot import SootAddressTerminator, SootArgument

angr/engines/successors.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import TYPE_CHECKING
 import logging
 
@@ -41,13 +42,13 @@ class SimSuccessors:
 
     def __init__(self, addr: int | None, initial_state):
         self.addr = addr
-        self.initial_state: "SimState" = initial_state
+        self.initial_state: SimState = initial_state
 
-        self.successors: list["SimState"] = []
-        self.all_successors: list["SimState"] = []
-        self.flat_successors: list["SimState"] = []
-        self.unsat_successors: list["SimState"] = []
-        self.unconstrained_successors: list["SimState"] = []
+        self.successors: list[SimState] = []
+        self.all_successors: list[SimState] = []
+        self.flat_successors: list[SimState] = []
+        self.unsat_successors: list[SimState] = []
+        self.unconstrained_successors: list[SimState] = []
 
         # the engine that should process or did process this request
         self.engine = None
@@ -70,17 +71,13 @@ class SimSuccessors:
             if len(self.unconstrained_successors) != 0:
                 successor_strings.append(f"{len(self.unconstrained_successors)} unconstrained")
 
-            if len(successor_strings) == 0:
-                result = "empty"
-            else:
-                result = " ".join(successor_strings)
+            result = "empty" if len(successor_strings) == 0 else " ".join(successor_strings)
         else:
             result = "failure"
 
         if isinstance(self.addr, int):
             return f"<{self.description} from {self.addr:#x}: {result}>"
-        else:
-            return f"<{self.description} from {self.addr}: {result}>"
+        return f"<{self.description} from {self.addr}: {result}>"
 
     @property
     def is_empty(self):
@@ -260,18 +257,19 @@ class SimSuccessors:
 
         # categorize the state
         if o.APPROXIMATE_GUARDS in state.options and state.solver.is_false(state.scratch.guard, exact=False):
-            if o.VALIDATE_APPROXIMATIONS in state.options:
-                if state.satisfiable():
-                    raise Exception("WTF")
+            if o.VALIDATE_APPROXIMATIONS in state.options and state.satisfiable():
+                raise Exception("WTF")
             self.unsat_successors.append(state)
         elif o.APPROXIMATE_SATISFIABILITY in state.options and not state.solver.satisfiable(exact=False):
-            if o.VALIDATE_APPROXIMATIONS in state.options:
-                if state.solver.satisfiable():
-                    raise Exception("WTF")
+            if o.VALIDATE_APPROXIMATIONS in state.options and state.solver.satisfiable():
+                raise Exception("WTF")
             self.unsat_successors.append(state)
-        elif not state.scratch.guard.symbolic and state.solver.is_false(state.scratch.guard):
-            self.unsat_successors.append(state)
-        elif o.LAZY_SOLVES not in state.options and not state.satisfiable():
+        elif (
+            not state.scratch.guard.symbolic
+            and state.solver.is_false(state.scratch.guard)
+            or o.LAZY_SOLVES not in state.options
+            and not state.satisfiable()
+        ):
             self.unsat_successors.append(state)
         elif o.NO_SYMBOLIC_JUMP_RESOLUTION in state.options and state.solver.symbolic(target):
             self.unconstrained_successors.append(state)
@@ -322,7 +320,7 @@ class SimSuccessors:
                 skip_max_targets_warning = False
                 if o.NO_IP_CONCRETIZATION in state.options:
                     # Don't try to concretize the IP
-                    cond_and_targets = [(claripy.true, target)]
+                    cond_and_targets = [(claripy.true(), target)]
                     max_targets = 0
                     skip_max_targets_warning = True  # don't warn
                 elif o.KEEP_IP_SYMBOLIC in state.options:
@@ -514,8 +512,7 @@ class SimSuccessors:
 
         if fallback:
             return None
-        else:
-            return cond_and_targets[:limit]
+        return cond_and_targets[:limit]
 
     @staticmethod
     def _eval_target_brutal(state, ip, limit):

angr/engines/syscall.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import logging
 
@@ -31,21 +32,20 @@ class SimEngineSyscall(SuccessorsMixin, ProcedureMixin):
         if sys_procedure is None:
             if angr.sim_options.BYPASS_UNSUPPORTED_SYSCALL not in state.options:
                 raise AngrUnsupportedSyscallError(
-                    "Trying to perform a syscall on an emulated system which is not currently cofigured to support "
+                    "Trying to perform a syscall on an emulated system which is not currently configured to support "
                     "syscalls. To resolve this, make sure that your SimOS is a subclass of SimUserspace, or set the "
                     "BYPASS_UNSUPPORTED_SYSCALL state option."
                 )
-            else:
+            try:
+                cc = angr.SYSCALL_CC[state.arch.name][state.os_name](state.arch)
+            except KeyError:
                 try:
-                    cc = angr.SYSCALL_CC[state.arch.name][state.os_name](state.arch)
+                    l.warning("No syscall calling convention available for %s/%s", state.arch.name, state.os_name)
+                    cc = angr.SYSCALL_CC[state.arch.name]["default"](state.arch)
                 except KeyError:
-                    try:
-                        l.warning("No syscall calling convention available for %s/%s", state.arch.name, state.os_name)
-                        cc = angr.SYSCALL_CC[state.arch.name]["default"](state.arch)
-                    except KeyError:
-                        cc = None  # some default will get picked down the line...
+                    cc = None  # some default will get picked down the line...
 
-                sys_procedure = angr.SIM_PROCEDURES["stubs"]["syscall"](cc=cc)
+            sys_procedure = angr.SIM_PROCEDURES["stubs"]["syscall"](cc=cc)
 
         return self.process_procedure(state, successors, sys_procedure, **kwargs)
 

angr/engines/unicorn.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import copy
 import functools
 import logging
@@ -80,17 +81,21 @@ class SimEngineUnicorn(SuccessorsMixin):
         # should the countdown still be updated if we're not stepping a whole block?
         # current decision: leave it updated, since we are moving forward
         if num_inst is not None:
-            # we don't support single stepping with unicorn
+            if once("unicorn_num_inst_warning"):
+                l.warning("unicorn engine doesn't support stepping with num_inst")
             return False
 
         unicorn = state.unicorn  # shorthand
 
         # if we have a concrete target we want the program to synchronize the segment
         # registers before, otherwise undefined behavior could happen.
-        if state.project.concrete_target and self.project.arch.name in ("x86", "x86_64"):
-            if not state.concrete.segment_registers_initialized:
-                l.debug("segment register must be synchronized with the concrete target before using unicorn engine")
-                return False
+        if (
+            state.project.concrete_target
+            and self.project.arch.name in ("x86", "x86_64")
+            and not state.concrete.segment_registers_initialized
+        ):
+            l.debug("segment register must be synchronized with the concrete target before using unicorn engine")
+            return False
         if state.regs.ip.symbolic:
             l.debug("symbolic IP!")
             return False
@@ -179,7 +184,7 @@ class SimEngineUnicorn(SuccessorsMixin):
 
         self._instr_mem_write_addrs = set()  # pylint:disable=attribute-defined-outside-init
         for block_details in self.state.unicorn._get_details_of_blocks_with_symbolic_vex_stmts():
-            self.state.scratch.guard = claripy.true
+            self.state.scratch.guard = claripy.true()
             try:
                 if self.state.os_name == "CGC" and block_details["block_addr"] in {
                     self.state.unicorn.cgc_random_addr,
@@ -420,8 +425,8 @@ class SimEngineUnicorn(SuccessorsMixin):
 
         # initialize unicorn plugin
         try:
-            syscall_data = kwargs["syscall_data"] if "syscall_data" in kwargs else None
-            fd_bytes = kwargs["fd_bytes"] if "fd_bytes" in kwargs else None
+            syscall_data = kwargs.get("syscall_data", None)
+            fd_bytes = kwargs.get("fd_bytes", None)
             state.unicorn.setup(syscall_data=syscall_data, fd_bytes=fd_bytes)
         except SimValueError:
             # it's trying to set a symbolic register somehow
@@ -476,7 +481,7 @@ class SimEngineUnicorn(SuccessorsMixin):
 
         if state.unicorn.jumpkind.startswith("Ijk_Sys"):
             state.ip = state.unicorn._syscall_pc
-        successors.add_successor(state, state.ip, claripy.true, state.unicorn.jumpkind)
+        successors.add_successor(state, state.ip, claripy.true(), state.unicorn.jumpkind)
 
         successors.description = description
         successors.processed = True

angr/engines/vex/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .claripy import *
 from .light import *
 from .heavy import *

angr/engines/vex/claripy/__init__.py

@@ -1 +1,2 @@
+from __future__ import annotations
 from .datalayer import ClaripyDataMixin