[codex] fix incorrect-modifier revert detection

slither/detectors/functions/modifier.py

@@ -17,7 +17,8 @@
 
 def is_revert(node: Node) -> bool:
     return node.type == NodeType.THROW or any(
-        ir.function.name in ["revert()", "revert(string"] for ir in node.internal_calls
+        ir.function.name in ["revert()", "revert(string)"] or ir.function.name.startswith("revert ")
+        for ir in node.internal_calls
     )
 
 

tests/e2e/detectors/test_data/incorrect-modifier/0.8.4/modifier_reverts.sol

@@ -0,0 +1,31 @@
+pragma solidity ^0.8.4;
+
+contract Test {
+    address owner;
+
+    error NotOwner();
+
+    modifier onlyOwnerStr() {
+        if (msg.sender == owner) {
+            _;
+        } else {
+            revert("not owner");
+        }
+    }
+
+    modifier onlyOwnerErr() {
+        if (msg.sender == owner) {
+            _;
+        } else {
+            revert NotOwner();
+        }
+    }
+
+    function f() external onlyOwnerStr returns (uint256) {
+        return 1;
+    }
+
+    function g() external onlyOwnerErr returns (uint256) {
+        return 2;
+    }
+}

tests/e2e/detectors/test_detectors.py

@@ -1326,6 +1326,11 @@ def id_test(test_item: Test):
         "modifier_default.sol",
         "0.7.6",
     ),
+    Test(
+        all_detectors.ModifierDefaultDetection,
+        "modifier_reverts.sol",
+        "0.8.4",
+    ),
     Test(
         all_detectors.IncorrectUnaryExpressionDetection,
         "invalid_unary_expression.sol",