Skip to content

fix(codeowners): Handle IndexError when generating regex #29642

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

Merged
NisanthanNanthakumar merged 2 commits into from
Oct 28, 2021
Merged

fix(codeowners): Handle IndexError when generating regex #29642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bddd961
fix(codeowners): Handle IndexError when generating regex
Oct 28, 2021
7906134
use ternary
Oct 28, 2021
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
4 changes: 1 addition & 3 deletions src/sentry/ownership/grammar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ def _path_to_regex(pattern: str) -> Pattern[str]:
SOFTWARE.
"""
regex = ""

# Special case backslash can match a backslash file or directory
if pattern[0] == "\\":
return re.compile(r"\\(?:\Z|/)")
Expand All @@ -277,10 +276,9 @@ def _path_to_regex(pattern: str) -> Pattern[str]:
matches_dir = pattern[-1] == "/"
if matches_dir:
pattern = pattern.rstrip("/")

# patterns ending with "/*" are special. They only match items directly in the directory
# not deeper
trailing_slash_star = pattern[-1] == "*" and len(pattern) > 1 and pattern[-2] == "/"
trailing_slash_star = pattern[-1] == "*" and pattern[-2] == "/" if len(pattern) > 1 else False

iterator = enumerate(pattern)

Expand Down
24 changes: 24 additions & 0 deletions tests/sentry/ownership/test_grammar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,30 @@ def test_codeowners_match_backslash(path_details, expected):
_assert_matcher(Matcher("codeowners", "\\filename"), path_details, expected)


@pytest.mark.parametrize(
"path_details, expected",
[
([{"filename": "foo/"}, {"abs_path": "/usr/local/src/foo/"}], True),
(
[
{"filename": "/foo/subdir/"},
{"abs_path": "/usr/local/src/foo/subdir/"},
],
True,
),
(
[
{"filename": "config/subdir/test.py"},
{"abs_path": "/usr/local/src/config/subdir/test.py"},
],
True,
),
],
)
def test_codeowners_match_fowardslash(path_details, expected):
_assert_matcher(Matcher("codeowners", "/"), path_details, expected)


def test_parse_code_owners():
assert parse_code_owners(codeowners_fixture_data) == (
["@getsentry/frontend", "@getsentry/docs", "@getsentry/ecosystem"],
Expand Down