From a9163d2a7948915b4641763cc077aa7fb8c5dece Mon Sep 17 00:00:00 2001 From: Simone Date: Tue, 20 Feb 2024 22:46:28 +0100 Subject: [PATCH 1/3] Add --include-paths option --- slither/__main__.py | 35 +++++++++++++++++++++++------------ slither/core/slither_core.py | 22 +++++++++++++++++----- slither/slither.py | 4 ++++ slither/utils/command_line.py | 1 + 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/slither/__main__.py b/slither/__main__.py index 3cd914a87..405eb9142 100644 --- a/slither/__main__.py +++ b/slither/__main__.py @@ -268,9 +268,10 @@ def choose_printers( ################################################################################### -def parse_filter_paths(args: argparse.Namespace) -> List[str]: - if args.filter_paths: - return args.filter_paths.split(",") +def parse_filter_paths(args: argparse.Namespace, filter: bool) -> List[str]: + paths = args.filter_paths if filter else args.include_paths + if paths: + return paths.split(",") return [] @@ -307,6 +308,7 @@ def parse_args( "Checklist (consider using https://github.com/crytic/slither-action)" ) group_misc = parser.add_argument_group("Additional options") + group_filters = parser.add_mutually_exclusive_group() group_detector.add_argument( "--detect", @@ -518,14 +520,6 @@ def parse_args( default=defaults_flag_in_config["disable_color"], ) - group_misc.add_argument( - "--filter-paths", - help="Regex filter to exclude detector results matching file path e.g. (mocks/|test/)", - action="store", - dest="filter_paths", - default=defaults_flag_in_config["filter_paths"], - ) - group_misc.add_argument( "--triage-mode", help="Run triage mode (save results in triage database)", @@ -579,6 +573,22 @@ def parse_args( default=defaults_flag_in_config["no_fail"], ) + group_filters.add_argument( + "--filter-paths", + help="Regex filter to exclude detector results matching file path e.g. (mocks/|test/)", + action="store", + dest="filter_paths", + default=defaults_flag_in_config["filter_paths"], + ) + + group_filters.add_argument( + "--include-paths", + help="Regex filter to include detector results matching file path e.g. (mocks/|test/)", + action="store", + dest="include_paths", + default=defaults_flag_in_config["include_paths"], + ) + codex.init_parser(parser) # debugger command @@ -631,7 +641,8 @@ def parse_args( args = parser.parse_args() read_config_file(args) - args.filter_paths = parse_filter_paths(args) + args.filter_paths = parse_filter_paths(args, True) + args.include_paths = parse_filter_paths(args, False) # Verify our json-type output is valid args.json_types = set(args.json_types.split(",")) # type:ignore diff --git a/slither/core/slither_core.py b/slither/core/slither_core.py index b1bb7c66b..76220f5ba 100644 --- a/slither/core/slither_core.py +++ b/slither/core/slither_core.py @@ -62,6 +62,7 @@ class SlitherCore(Context): # Multiple time the same result, so we remove duplicates self._currently_seen_resuts: Set[str] = set() self._paths_to_filter: Set[str] = set() + self._paths_to_include: Set[str] = set() self._crytic_compile: Optional[CryticCompile] = None @@ -411,25 +412,29 @@ class SlitherCore(Context): if "source_mapping" in elem ] - # Use POSIX-style paths so that filter_paths works across different + # Use POSIX-style paths so that filter_paths|include_paths works across different # OSes. Convert to a list so elements don't get consumed and are lost # while evaluating the first pattern source_mapping_elements = list( map(lambda x: pathlib.Path(x).resolve().as_posix() if x else x, source_mapping_elements) ) - matching = False + (matching, paths, msg_err) = ( + (True, self._paths_to_include, "--include-paths") + if self._paths_to_include + else (False, self._paths_to_filter, "--filter-paths") + ) - for path in self._paths_to_filter: + for path in paths: try: if any( bool(re.search(_relative_path_format(path), src_mapping)) for src_mapping in source_mapping_elements ): - matching = True + matching = not matching break except re.error: logger.error( - f"Incorrect regular expression for --filter-paths {path}." + f"Incorrect regular expression for {msg_err} {path}." "\nSlither supports the Python re format" ": https://docs.python.org/3/library/re.html" ) @@ -500,6 +505,13 @@ class SlitherCore(Context): """ self._paths_to_filter.add(path) + def add_path_to_include(self, path: str): + """ + Add path to include + Path are used through direct comparison (no regex) + """ + self._paths_to_include.add(path) + # endregion ################################################################################### ################################################################################### diff --git a/slither/slither.py b/slither/slither.py index a3cc64404..4259b74b7 100644 --- a/slither/slither.py +++ b/slither/slither.py @@ -132,6 +132,10 @@ class Slither( for p in filter_paths: self.add_path_to_filter(p) + include_paths = kwargs.get("include_paths", []) + for p in include_paths: + self.add_path_to_include(p) + self._exclude_dependencies = kwargs.get("exclude_dependencies", False) triage_mode = kwargs.get("triage_mode", False) diff --git a/slither/utils/command_line.py b/slither/utils/command_line.py index 2432a2116..f03ced834 100644 --- a/slither/utils/command_line.py +++ b/slither/utils/command_line.py @@ -60,6 +60,7 @@ defaults_flag_in_config = { "json-types": ",".join(DEFAULT_JSON_OUTPUT_TYPES), "disable_color": False, "filter_paths": None, + "include_paths": None, "generate_patches": False, # debug command "skip_assembly": False, From c0d4dde29958dd0a35a6b2c11f3ecf135f3d42f8 Mon Sep 17 00:00:00 2001 From: Simone Date: Tue, 20 Feb 2024 22:51:04 +0100 Subject: [PATCH 2/3] Lint --- slither/__main__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slither/__main__.py b/slither/__main__.py index 405eb9142..25d83355f 100644 --- a/slither/__main__.py +++ b/slither/__main__.py @@ -268,8 +268,8 @@ def choose_printers( ################################################################################### -def parse_filter_paths(args: argparse.Namespace, filter: bool) -> List[str]: - paths = args.filter_paths if filter else args.include_paths +def parse_filter_paths(args: argparse.Namespace, filter_path: bool) -> List[str]: + paths = args.filter_paths if filter_path else args.include_paths if paths: return paths.split(",") return [] From a8915a8a7f8b25c9209df8eca4a81a7a4ec17325 Mon Sep 17 00:00:00 2001 From: alpharush <0xalpharush@protonmail.com> Date: Thu, 29 Feb 2024 11:30:38 -0600 Subject: [PATCH 3/3] update --inlude-paths help --- slither/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slither/__main__.py b/slither/__main__.py index 25d83355f..ee1428967 100644 --- a/slither/__main__.py +++ b/slither/__main__.py @@ -583,7 +583,7 @@ def parse_args( group_filters.add_argument( "--include-paths", - help="Regex filter to include detector results matching file path e.g. (mocks/|test/)", + help="Regex filter to include detector results matching file path e.g. (src/|contracts/). Opposite of --filter-paths", action="store", dest="include_paths", default=defaults_flag_in_config["include_paths"],