Skip to content

Promote integration to main #239

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
rocklambros merged 2 commits into from
Oct 9, 2026
Merged

Promote integration to main #239

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
d5b47e7
Sync integration from main (#237)
rocklambros Oct 9, 2026
9174097
Let a roster name carry a parenthesized nickname (#238)
rocklambros Oct 9, 2026
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: 4 additions & 0 deletions SECURITY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Include what you have:

Partial reports are welcome. We would rather triage something incomplete than never hear about it.

## Security contact

Rock Lambros ([rock.lambros@owasp.org](mailto:rock.lambros@owasp.org)) is the project's named security contact. Send reports through private vulnerability reporting above, so every maintainer sees them and the report stays tracked. Write to this address to reach a person about a report you already filed, or if private vulnerability reporting is unavailable to you.

## What is in scope

| In scope | Out of scope |
Expand Down
18 changes: 18 additions & 0 deletions tests/test_roadmap_model_roster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,21 @@ def test_real_governance_names_the_three_project_leads_and_the_volunteers():
assert project_lead_logins(roster) == frozenset({"rocklambros", "afogel", "bar-capsule"})
assert ("Victor Hernandez", "victorm-hernandez") in roster.triage_volunteers
assert "victorm-hernandez" in trusted_logins(REPO_ROOT)


def test_a_name_may_carry_a_parenthesized_nickname():
text = (
"## Project leads\n\n| Role | Name |\n| --- | --- |\n"
"| Project Lead | Kyriakos Lambros (Rock) ([@rocklambros](https://github.com/rocklambros)) |\n"
"| Project Lead | Ariel Fogel ([@afogel](https://github.com/afogel)) |\n\n"
"## Workstream leads\n\n| Workstream | Leads |\n| --- | --- |\n"
"| Development (SDK) | Kyriakos Lambros (Rock) ([@rocklambros](https://github.com/rocklambros)), "
"Fred Wilmot ([@fewdisc](https://github.com/fewdisc)) |\n\n"
"## Triage volunteers\n\n| Volunteer | Assigned by |\n| --- | --- |\n"
"| Victor Hernandez ([@victorm-hernandez](https://github.com/victorm-hernandez)) | Kyriakos Lambros (Rock) |\n\n"
"## Origins\n\nMichael Bargury ([@mbrg](https://github.com/mbrg)) created ACS.\n"
)
roster = parse_governance(text)
assert roster.project_leads == (("Kyriakos Lambros (Rock)", "rocklambros"), ("Ariel Fogel", "afogel"))
assert ("Kyriakos Lambros (Rock)", "rocklambros") in roster.workstreams["Development (SDK)"]
assert ("Victor Hernandez", "victorm-hernandez") in roster.triage_volunteers
4 changes: 3 additions & 1 deletion tools/roadmap_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ class RosterError(ValueError):

_OWNER_TOKEN = re.compile(r"^@[A-Za-z0-9-]+$")
_LINK = re.compile(r"\[@([^\]]+)\]\(https://github\.com/([^)/\s]+)\)")
_PERSON = re.compile(r"([^,()|]+?)\s*\(\[@([^\]]+)\]\(https://github\.com/([^)/\s]+)\)\)")
# A name may carry one parenthesized part, such as a nickname in "Kyriakos Lambros (Rock)".
# The group refuses a parenthesis that opens the handle link, so the name ends there.
_PERSON = re.compile(r"((?:[^,()|]|\((?!\[@)[^()|]*\))+?)\s*\(\[@([^\]]+)\]\(https://github\.com/([^)/\s]+)\)\)")
_SPLIT_CELLS = re.compile(r"(?<!\\)\|")


Expand Down
Loading