Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest file search now case-insensitive #35

Merged
merged 1 commit into from
Dec 19, 2024
Merged

manifest file search now case-insensitive #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion socketsecurity/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__author__ = 'socket.dev'
__version__ = '1.0.37'
__version__ = '1.0.38'
38 changes: 24 additions & 14 deletions socketsecurity/core/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,15 @@ def match_supported_files(files: list) -> bool:
patterns = socket_globs[ecosystem]
for file_name in patterns:
pattern = patterns[file_name]["pattern"]
# path_pattern = f"**/{pattern}"
for file in files:
if "\\" in file:
file = file.replace("\\", "/")
if PurePath(file).match(pattern):
matched_files.append(file)
# Split path and filename
path_parts = PurePath(file).parts
if path_parts:
# Compare only the filename portion case-insensitively
if PurePath(path_parts[-1].lower()).match(pattern.lower()):
matched_files.append(file)
if len(matched_files) == 0:
not_matched = True
return not_matched
Expand All @@ -435,17 +438,24 @@ def find_files(path: str) -> list:
patterns = socket_globs[ecosystem]
for file_name in patterns:
pattern = patterns[file_name]["pattern"]
file_path = f"{path}/**/{pattern}"

log.debug(f"Globbing {file_path}")
glob_start = time.time()
glob_files = glob(file_path, recursive=True)
for glob_file in glob_files:
if glob_file not in files:
files.add(glob_file)
glob_end = time.time()
glob_total_time = glob_end - glob_start
log.debug(f"Glob for pattern {file_path} took {glob_total_time:.2f} seconds")
# Keep path as-is but try filename variations
file_paths = [
f"{path}/**/{pattern}",
f"{path}/**/{pattern.lower()}",
f"{path}/**/{pattern.upper()}",
f"{path}/**/{pattern.capitalize()}"
]

for file_path in file_paths:
log.debug(f"Globbing {file_path}")
glob_start = time.time()
glob_files = glob(file_path, recursive=True)
for glob_file in glob_files:
if glob_file not in files:
files.add(glob_file)
glob_end = time.time()
glob_total_time = glob_end - glob_start
log.debug(f"Glob for pattern {file_path} took {glob_total_time:.2f} seconds")

log.debug("Finished Find Files")
end_time = time.time()
Expand Down
Loading