Skip to content

fix database dynamic labels#29215

Merged
GavinFrazar merged 3 commits intomasterfrom
gavinfrazar/fix-dynamic-database-labels-rbac
Jul 20, 2023
Merged

fix database dynamic labels#29215
GavinFrazar merged 3 commits intomasterfrom
gavinfrazar/fix-dynamic-database-labels-rbac

Conversation

@GavinFrazar
Copy link
Copy Markdown
Contributor

Fixes #7198

This PR updates the database retrieved for session RBAC checking (at connection time) to includes cloud and dynamic labels.

It also fixes some suspicious recursive read locking in the app server that could have caused a deadlock.

* fix locking in apps/databases service
Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not super familiar with these parts, so I'm taking some of the changes at face value. Seems reasonable to me.

Comment thread lib/srv/db/ca.go Outdated
Comment thread lib/srv/db/access_test.go Outdated
Comment thread lib/srv/db/access_test.go Outdated
Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Gavin.

Well-spotted on the RWLocks, btw.

@smallinsky smallinsky self-requested a review July 19, 2023 15:48
Comment thread lib/srv/db/server.go
@GavinFrazar GavinFrazar added this pull request to the merge queue Jul 20, 2023
Merged via the queue into master with commit c37d7a1 Jul 20, 2023
@GavinFrazar GavinFrazar deleted the gavinfrazar/fix-dynamic-database-labels-rbac branch July 20, 2023 18:03
@public-teleport-github-review-bot
Copy link
Copy Markdown

@GavinFrazar See the table below for backport results.

Branch Result
branch/v11 Failed
branch/v12 Failed
branch/v13 Create PR

GavinFrazar added a commit that referenced this pull request Jul 20, 2023
github-merge-queue Bot pushed a commit that referenced this pull request Jul 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

application-access database-access Database access related issues and PRs size/md

Projects

None yet

Development

Successfully merging this pull request may close these issues.

dynamic_labels are not found in DB RBAC

5 participants