chore(security): Clean up session/commit logic #29381
Merged
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
john-bodley
commented
Jun 26, 2024
| if deleted_count := pvms.delete(): | ||
| logger.info("Deleted %i faulty permissions", deleted_count) | ||
| self.get_session.commit() |
There was a problem hiding this comment.
I'm not really sure what's going on here. The commit was after a SELECT as opposed to the DELETE.
| @@ -1047,9 +1047,6 @@ def sync_role_definitions(self) -> None: | |||
| ) | |||
|
|
|||
| self.create_missing_perms() | |||
|
|
|||
| # commit role and view menu updates | |||
| self.get_session.commit() | |||
There was a problem hiding this comment.
The create_missing_perms logic already commits.
| if self.is_admin(): | ||
| return | ||
| orig_resource = db.session.query(resource.__class__).get(resource.id) | ||
| orig_resource = self.get_session.query(resource.__class__).get(resource.id) |
There was a problem hiding this comment.
We should use the Flask-AppBuilder session everywhere for consistency. Note that db.session and self.get_session are the same Flask-SQLAlchemy session so the logic remains unchanged.
rusackas
added
the
review:checkpoint
michael-s-molina
approved these changes
Jun 26, 2024
john-bodley
removed
the
review:checkpoint
eschutho
pushed a commit
that referenced
this pull request
Jul 24, 2024
mistercrunch
added
🏷️ bot
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.
SUMMARY
A few housekeeping tasks with regards to the security manager:
get_sessionmethod is a property and thusget_session()actually unnecessarily instantiates a new session.add_permission_view_menufunction commits (which is called bymerge_pv) and thus there's no need to re-commit.Note many of the existing commits could likely be also removed as we have a tendency of over commiting. I'm hoping to tackle that as part of SIP-99B by way of transactions.
BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
TESTING INSTRUCTIONS
ADDITIONAL INFORMATION