DM-41424: Refactor to reduce complexity #889
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
Move construction of the auth URL for an Ingress created from a GafaelfawrIngress to the model, since it's a mechanical transformation of the ingress configuration. This eliminates a warning for an excessively complex method.
Separate the code to obtain groups from LDAP and possibly add GIDs from Firestore into a separate internal method to reduce the complexity of get_user_info_from_token in UserInfoService.
Move the construction of the attribute list to query into another method to simplify the get_data method of LDAPStorage.
The documentation for the generic auth functions still included some old handle terminology. We now only use tokens, although they come in two forms (internal tokens and JWTs).
Move the code to find the token into a private method to simplify the authenticate method.
Move the code for constructing a delegated token into a separate function to simplify build_success_headers in the /auth handler.
Bump the McCabe complexity threshold slightly, since handling a return from an authentication provider should not be simplified more than it already is. Add some more exclusions from the Nublado controller source.
Get handle_provider_return down to its minimal reasonable complexity by breaking te token construction into a separate method and unifying some of the error handling with a new exception.
Move portions of token auditing into private methods to reduce the complexity of the method. More of this could be done, but this gets the audit method below the complexity threshold, so good enough for now.
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.
Address all of the Ruff-diagnosed excess complexity by breaking up methods and functions, except for the transformation of
SettingstoConfig. That hasn't yet been addressed.