security: fix security-config circular dependency #20821
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
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
v::config depends on v::security_config which is composed of config_bsl/rcl.cc which both include mtls.h which in turn depends on config headers for things like config::binding, creating a circular dependency on headers. this commit splits out tls::rule which is the only type needed by v::config and doesn't have dependences on any config headers. Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
dotnwat
commented
Jul 3, 2024
| @@ -22,8 +22,6 @@ | |||
|
|
|||
| #include <seastar/util/noncopyable_function.hh> | |||
|
|
|||
| #include <boost/intrusive/list.hpp> | |||
There was a problem hiding this comment.
unrelated to the purpose of the pr, just a vehicle for a trivial fix.
dotnwat
commented
Jul 3, 2024
Comment on lines
+7
to
+8
| gssapi_rule.cc | ||
| logger.cc |
There was a problem hiding this comment.
v::security_config also fills a role as a sort of v::security_common
v::config depends on v::security_config which is composed of config_bsl/rcl.cc one which include gssapi_principal_mapper.h which in turn depends on config headers for things like config::binding, creating a circular dependency on headers. this commit splits out gssapi_rule which is the only type needed by v::config and doesn't have dependences on any config headers. Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Before this change oidc_principal_mapping parsing and application from jwt to acl_principal were combined into one unit. However, v::config needs the parsing component to perform validation, but doesn't want to take on all of the transitive dependencies that come from acl.h etc... So we split out the parsing component and add a helper to handle the final apply logic. Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Depending on gssapi_principal_mapper.h for this meant bringing in config::binding dependency. but that is unnecessary after this commit moves the declaration into config.h. Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
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.
Fixes circular dependency between security and config libraries.
Backports Required
Release Notes