Merge branch 'dev' of github.com:crytic/slither into dev

Author: montyly

scripts/ci_test_printers.sh

@@ -2,14 +2,24 @@
 
 ### Test printer 
 
-# Needed for evm printer
-pip install evm-cfg-builder
+cd tests/ast-parsing/compile || exit
 
-if ! slither "tests/*.json" --print all --json -; then
-    echo "Printer tests failed"
+# Do not test the evm printer,as it needs a refactoring
+ALL_PRINTERS="cfg,constructor-calls,contract-summary,data-dependency,echidna,function-id,function-summary,modifiers,call-graph,human-summary,inheritance,inheritance-graph,slithir,slithir-ssa,vars-and-auth,require,variable-order"
+
+# Only test 0.5.17 to limit test time
+for file in *0.5.17-compact.zip; do
+  if ! slither "$file" --print "$ALL_PRINTERS" > /dev/null 2>&1 ; then
+    echo "Printer failed"
+    echo "$file"
     exit 1
-fi
+  fi
+done
 
+cd ../../.. || exit
+# Needed for evm printer
+pip install evm-cfg-builder
 solc-select use "0.5.1"
-
-slither examples/scripts/test_evm_api.sol --print evm 
+if ! slither examples/scripts/test_evm_api.sol --print evm; then
+  echo "EVM printer failed"
+fi

slither/core/declarations/function.py

@@ -1405,7 +1405,11 @@ def is_protected(self) -> bool:
         """
             Determine if the function is protected using a check on msg.sender
 
-            Only detects if msg.sender is directly used in a condition
+            Consider onlyOwner as a safe modifier.
+            If the owner functionality is incorrectly implemented, this will lead to incorrectly
+            classify the function as protected
+
+            Otherwise only detects if msg.sender is directly used in a condition
             For example, it wont work for:
                 address a = msg.sender
                 require(a == owner)
@@ -1417,6 +1421,9 @@ def is_protected(self) -> bool:
             if self.is_constructor:
                 self._is_protected = True
                 return True
+            if "onlyOwner" in [m.name for m in self.modifiers]:
+                self._is_protected = True
+                return True
             conditional_vars = self.all_conditional_solidity_variables_read(include_loop=False)
             args_vars = self.all_solidity_variables_used_as_args()
             self._is_protected = (

slither/detectors/compiler_bugs/storage_ABIEncoderV2_array.py

@@ -43,7 +43,6 @@
     "0.5.7",
     "0.5.8",
     "0.5.9",
-    "0.5.10",
 ]
 
 
@@ -61,7 +60,7 @@ class ABIEncoderV2Array(AbstractDetector):
         "https://github.com/crytic/slither/wiki/Detector-Documentation#storage-abiencoderv2-array"
     )
     WIKI_TITLE = "Storage ABIEncoderV2 Array"
-    WIKI_DESCRIPTION = """`solc` versions `0.4.7`-`0.5.10` contain a [compiler bug](https://blog.ethereum.org/2019/06/25/solidity-storage-array-bugs.) leading to incorrect ABI encoder usage."""
+    WIKI_DESCRIPTION = """`solc` versions `0.4.7`-`0.5.9` contain a [compiler bug](https://blog.ethereum.org/2019/06/25/solidity-storage-array-bugs) leading to incorrect ABI encoder usage."""
     WIKI_EXPLOIT_SCENARIO = """
 ```solidity
 contract A {

slither/printers/summary/variable_order.py

@@ -29,7 +29,7 @@ def output(self, _filename):
             table = MyPrettyTable(["Name", "Type", "Slot", "Offset"])
             for variable in contract.state_variables_ordered:
                 if not variable.is_constant:
-                    slot, offset = self.slither.storage_layout_of(contract, variable)
+                    slot, offset = contract.compilation_unit.storage_layout_of(contract, variable)
                     table.add_row([variable.canonical_name, str(variable.type), slot, offset])
 
             all_tables.append((contract.name, table))

slither/tools/upgradeability/checks/initialization.py

@@ -1,5 +1,6 @@
 import logging
 
+from slither.core.declarations import Function
 from slither.slithir.operations import InternalCall
 from slither.tools.upgradeability.checks.abstract_checks import (
     AbstractCheck,
@@ -14,8 +15,18 @@ class MultipleInitTarget(Exception):
     pass
 
 
+def _has_initiliaze_modifier(function: Function):
+    if not function.modifiers:
+        return False
+    return any((m.name == "initializer") for m in function.modifiers)
+
+
 def _get_initialize_functions(contract):
-    return [f for f in contract.functions if f.name == "initialize" and f.is_implemented]
+    return [
+        f
+        for f in contract.functions
+        if (f.name == "initialize" or _has_initiliaze_modifier(f)) and f.is_implemented
+    ]
 
 
 def _get_all_internal_calls(function):