Prevent cluster groups from being deleted when referenced by a projects' configuration #15119
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
This duplicates `(*cluster.ClusterGroup).ToAPI`. Signed-off-by: Mark Laing <mark.laing@canonical.com>
This function queries for projects that have the group name present in the value for the config key `restricted.cluster.groups`. Then it parses the config value properly to check for an exact match. Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
This includes a small refactor of `GET /1.0/cluster/groups` where the handler was unnecessarily iterating over the list of groups twice. Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
…ced by a project. Signed-off-by: Mark Laing <mark.laing@canonical.com>
github-actions
bot
added
Documentation
![github-advanced-security[bot]](/https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| JOIN projects_config ON projects.id = projects_config.project_id | ||
| WHERE projects_config.key = 'restricted.cluster.groups' AND projects_config.value LIKE '%` + groupName + `%'` | ||
|
|
||
| stmt, err := tx.Prepare(q) |
Check failure
Code scanning / CodeQL
Database query built from user-controlled sources High
tomponline
reviewed
Mar 10, 2025
| q := ` | ||
| SELECT projects.name, projects_config.value FROM projects | ||
| JOIN projects_config ON projects.id = projects_config.project_id | ||
| WHERE projects_config.key = 'restricted.cluster.groups' AND projects_config.value LIKE '%` + groupName + `%'` |
There was a problem hiding this comment.
This is a SQL injection security risk.
There was a problem hiding this comment.
Also the use of LIKE here seems potentially incorrect as it might match partial group names.
Can we use JSON collation and direct matching with query parameters instead?
tomponline
requested changes
Mar 10, 2025
Whoopsie 😆 Thank you CodeQL 🙏 Not sure how I convinced myself that this was ok... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds an API extension
clustering_groups_used_byand adds aUsedByfield toapi.ClusterGroup. On GET requests, theUsedByURLs are projects that contain the cluster group inrestricted.cluster.groups. DELETE requests will fail if the cluster group is used by a project.Closes #15118