angr 9.2.116__py3-none-win_amd64.whl → 9.2.118__py3-none-win_amd64.whl

angr/engines/soot/expressions/invoke.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from archinfo.arch_soot import SootArgument, SootMethodDescriptor
 
 from . import translate_expr
@@ -22,7 +23,7 @@ class InvokeBase(SimSootExpr):
     def _translate_args(self):
         args = []
         # for instance method calls, add the 'this' reference
-        if isinstance(self, SimSootExpr_VirtualInvoke) or isinstance(self, SimSootExpr_SpecialInvoke):
+        if isinstance(self, (SimSootExpr_VirtualInvoke, SimSootExpr_SpecialInvoke)):
             this_ref_base = self._translate_value(self.expr.base)
             this_ref = self.state.memory.load(this_ref_base, none_if_missing=True)
             this_ref_type = this_ref.type if this_ref is not None else None
@@ -43,7 +44,7 @@ class InvokeBase(SimSootExpr):
         return args
 
     def _resolve_invoke_target(self, expr, state):
-        raise NotImplementedError()
+        raise NotImplementedError
 
 
 class SimSootExpr_VirtualInvoke(InvokeBase):
@@ -56,13 +57,10 @@ class SimSootExpr_VirtualInvoke(InvokeBase):
     def _resolve_invoke_target(self, expr, state):
         # get the type of the base object
         base = translate_expr(self.expr.base, self.state).expr
-        if base is not None:
-            base_type = base.type
-        else:
-            # the base is not set, for example if we process an invocation of an
-            # unloaded library function
-            # => fallback: use the statically retrieved type
-            base_type = self.expr.class_name
+        # if the base is not set, for example if we process an invocation of an
+        # unloaded library function
+        # => fallback: use the statically retrieved type
+        base_type = base.type if base is not None else self.expr.class_name
 
         # based on the class of the base object, we resolve the invoke target
         try:

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,5 +1,8 @@
+from __future__ import annotations
 import logging
 
+import claripy
+
 from ..values import SimSootValue_ArrayBaseRef
 from .base import SimSootExpr
 
@@ -27,7 +30,7 @@ class SimSootExpr_NewArray(SimSootExpr):
     @staticmethod
     def _bound_array_size(state, array_size):
         # check if array size can exceed MAX_ARRAY_SIZE
-        max_array_size = state.solver.BVV(state.javavm_memory.max_array_size, 32)
+        max_array_size = claripy.BVV(state.javavm_memory.max_array_size, 32)
         size_stays_below_maximum = state.solver.eval_upto(max_array_size.SGE(array_size), 2)
 
         # overwrite size, if it *always* exceeds the maximum

angr/engines/soot/expressions/newMultiArray.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
 import logging
 
+import claripy
+
 from .base import SimSootExpr
 from .newArray import SimSootExpr_NewArray
 from ..values import SimSootValue_ArrayBaseRef
@@ -39,7 +42,7 @@ class SimSootExpr_NewMultiArray(SimSootExpr):
     @staticmethod
     def _bound_multi_array_size(state, multi_array_size):
         # check if array size can exceed MAX_ARRAY_SIZE
-        max_multi_array_size = state.solver.BVV(state.javavm_memory.max_array_size, 32)
+        max_multi_array_size = claripy.BVV(state.javavm_memory.max_array_size, 32)
         size_stays_below_maximum = state.solver.eval_upto(max_multi_array_size.SGE(multi_array_size), 2)
 
         # overwrite size, if it *always* exceeds the maximum
@@ -79,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,5 +1,8 @@
+from __future__ import annotations
 import logging
 
+import claripy
+
 from .base import SimSootStmt
 
 l = logging.getLogger("angr.engines.soot.statements.goto")
@@ -8,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=self.state.solver.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,5 +1,8 @@
+from __future__ import annotations
 import logging
 
+import claripy
+
 from .base import SimSootStmt
 
 l = logging.getLogger("angr.engines.soot.statements.if")
@@ -12,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 == self.state.solver.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,5 +1,8 @@
+from __future__ import annotations
 import logging
 
+import claripy
+
 from .base import SimSootStmt
 
 l = logging.getLogger("angr.engines.soot.statements.switch")
@@ -26,7 +29,7 @@ class SwitchBase(SimSootStmt):
 
         # add default target
         default_jmp_target = self._get_bb_addr_from_instr(self.stmt.default_target)
-        default_jmp_cond = self.state.solver.And(*default_jmp_conditions)
+        default_jmp_cond = claripy.And(*default_jmp_conditions)
         self._add_jmp_target(default_jmp_target, default_jmp_cond)
 
 

angr/engines/soot/statements/throw.py

@@ -1,12 +1,15 @@
+from __future__ import annotations
 import logging
 
-from .base import SimSootStmt
+import claripy
 from archinfo.arch_soot import SootAddressTerminator
 
+from .base import SimSootStmt
+
 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=self.state.solver.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,6 +1,7 @@
+from __future__ import annotations
 import logging
 
-from claripy import And
+import claripy
 
 from . import translate_value
 from ....errors import SimEngineError
@@ -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):
         """
@@ -38,13 +38,13 @@ class SimSootValue_ArrayBaseRef(SimSootValue):
 
         :param function generator: Function that given the state, returns a
                                    default value for array elements, e.g.
-                                   `generator = lambda state: state.solver.BVV(0, 32)`
+                                   `generator = lambda state: claripy.BVV(0, 32)`
         """
         self._default_value_generator = generator
 
     @classmethod
     def from_sootvalue(cls, soot_value, state):
-        raise NotImplementedError()
+        raise NotImplementedError
 
 
 class SimSootValue_ArrayRef(SimSootValue):
@@ -72,18 +72,17 @@ 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 = state.solver.BVV(0, 32)
+        zero = claripy.BVV(0, 32)
         length = array.size
-        bound_constraint = state.solver.And(
+        bound_constraint = claripy.And(
             length.SGT(idx),
             zero.SLE(idx),
         )
@@ -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
@@ -121,4 +119,4 @@ class SimSootValue_ArrayRef(SimSootValue):
                 idx,
                 length,
             )
-            state.solver.add(And(length.SGT(idx), zero.SLE(idx)))
+            state.solver.add(claripy.And(length.SGT(idx), zero.SLE(idx)))

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)
@@ -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)