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

fix(secrets): fix find line #6864

Merged
merged 2 commits into from
Nov 21, 2024
+11 −7
Merged

fix(secrets): fix find line #6864

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19f1693
fix find line
omryMen Nov 21, 2024
caa02f0
fix find line
omryMen Nov 21, 2024
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
18 changes: 11 additions & 7 deletions checkov/secrets/plugins/custom_regex_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,13 @@ def _find_potential_secret(
continue
multiline_matches = multiline_regex.findall(file_content)
for mm in multiline_matches:
line_num = find_line_number(file_content, mm, line_number)
quoted_mm = f"'{mm}'"
ps = PotentialSecret(
type=regex_data["Name"],
filename=filename,
secret=quoted_mm,
line_number=find_line_number(file_content, mm, line_number),
line_number=line_num,
is_verified=is_verified,
is_added=is_added,
is_removed=is_removed,
Expand Down Expand Up @@ -219,9 +220,12 @@ def analyze_string(self, string: str, **kwargs: Optional[Dict[str, Any]]) -> Gen


def find_line_number(file_string: str, substring: str, default_line_number: int) -> int:
lines = file_string.splitlines()

for line_number, line in enumerate(lines, start=1):
if substring in line:
return line_number
return default_line_number
try:
lines = file_string.splitlines()

for line_number, line in enumerate(lines, start=1):
if substring in line:
return line_number
return default_line_number
except Exception:
return default_line_number
Loading