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

Jump to bottom

Fix glob matched role access requests when generating system annotations #41907

Merged
merged 5 commits into from
May 23, 2024
Merged

Fix glob matched role access requests when generating system annotations #41907

merged 5 commits into from
May 23, 2024

Conversation

lxea
Copy link
Contributor

@lxea lxea commented May 22, 2024 •
edited by nklaassen
Loading

This PR fixes the access request annotation filtering for cases where:

  • allow.request.roles includes wildcards, globs, or regular expressions
  • allow.request.claims_to_roles is used
  • an annotation value includes a traits template

@lxea lxea requested a review from hugoShaka May 22, 2024 15:51
@github-actions github-actions bot requested a review from camscale May 22, 2024 15:51
@lxea lxea force-pushed the lxea/glob-annotations-fix branch from e35a5aa to 347460c Compare May 22, 2024 16:07
@lxea lxea force-pushed the lxea/glob-annotations-fix branch from 347460c to 91bfa30 Compare May 22, 2024 16:10
@lxea lxea added the no-changelog Indicates that a PR does not require a changelog entry label May 22, 2024
@gravitational gravitational deleted a comment from github-actions bot May 22, 2024
@gravitational gravitational deleted a comment from github-actions bot May 22, 2024
@gravitational gravitational deleted a comment from github-actions bot May 22, 2024
zmb3
zmb3 reviewed May 22, 2024
View reviewed changes
lib/auth/auth_with_roles_test.go Outdated Show resolved Hide resolved
lib/auth/auth_with_roles_test.go Outdated Show resolved Hide resolved
lib/auth/auth_with_roles_test.go Outdated Show resolved Hide resolved
lib/auth/auth_with_roles_test.go Show resolved Hide resolved
@r0mant r0mant requested review from nklaassen and removed request for camscale May 22, 2024 17:23
@nklaassen nklaassen requested a review from zmb3 May 22, 2024 22:14
r0mant
r0mant approved these changes May 22, 2024
View reviewed changes
lib/services/access_request.go Outdated Show resolved Hide resolved
lib/services/access_request.go Show resolved Hide resolved
@nklaassen nklaassen enabled auto-merge May 22, 2024 23:44
@nklaassen nklaassen added this pull request to the merge queue May 23, 2024
Merged via the queue into master with commit 27fd7c7 May 23, 2024
37 checks passed
@nklaassen nklaassen deleted the lxea/glob-annotations-fix branch May 23, 2024 00:55
@public-teleport-github-review-bot
Copy link

@lxea See the table below for backport results.

Branch Result
branch/v13 Failed
branch/v14 Failed
branch/v15 Failed

nklaassen added a commit that referenced this pull request May 23, 2024
@nklaassen @zmb3
[v15] Fix glob matched role access requests when generating system an…
c2e0934 
…notations

Backport #41907 to branch/v15

Co-authored-by: Nic Klaassen <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
@nklaassen nklaassen mentioned this pull request May 23, 2024
Merged
nklaassen added a commit that referenced this pull request May 23, 2024
@nklaassen @zmb3
[v14] Fix glob matched role access requests when generating system an…
5ba7aab 
…notations

Backport #41907 to branch/v14

Co-authored-by: Nic Klaassen <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
@nklaassen nklaassen mentioned this pull request May 23, 2024
Merged
nklaassen added a commit that referenced this pull request May 23, 2024
@nklaassen @zmb3
[v13] Fix glob matched role access requests when generating system an…
fdbd30a 
…notations

Backport #41907 to branch/v13

Co-authored-by: Nic Klaassen <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
@nklaassen nklaassen mentioned this pull request May 23, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request May 23, 2024
@nklaassen @zmb3
[v15] Fix glob matched role access requests when generating system an…
d0cb668 
…notations (#41936)

Backport #41907 to branch/v15

Co-authored-by: Alex McGrath <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request May 23, 2024
@nklaassen @zmb3
[v14] Fix glob matched role access requests when generating system an…
309a9c6 
…notations (#41937)

Backport #41907 to branch/v14

Co-authored-by: Alex McGrath <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request May 23, 2024
@nklaassen @zmb3
[v13] Fix glob matched role access requests when generating system an…
e9490ed 
…notations (#41938)

* [v13] Fix glob matched role access requests when generating system annotations

Backport #41907 to branch/v13

Co-authored-by: Nic Klaassen <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>

* use x/exp/slices

---------

Co-authored-by: Alex McGrath <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nklaassen nklaassen nklaassen left review comments

@r0mant r0mant r0mant approved these changes

@zmb3 zmb3 zmb3 approved these changes

Assignees
No one assigned
Labels
backport/branch/v13 backport/branch/v14 backport/branch/v15 no-changelog Indicates that a PR does not require a changelog entry size/sm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lxea @r0mant @zmb3 @nklaassen