Support uds and tcp in parallel #1009
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
engelmi
force-pushed
the
support-uds-and-tcp-in-parallel
branch
6 times, most recently
from
e2be276 to
24d361a
Compare
mwperina
reviewed
Dec 12, 2024
engelmi
force-pushed
the
support-uds-and-tcp-in-parallel
branch
2 times, most recently
from
3738e5e to
6f8171f
Compare
|
Looking at the size of this PR, I'd tackle the changes to SELinux and the documentation update (incl. updating our architecture diagrams, getting started guide, etc.) in dedicated PRs. Added these to the list of Acceptance Criteria in #997. |
engelmi
requested review from
alexlarsson,
mkemel and
rhatdan
as code owners
Relates to: eclipse-bluechi#997 In order to support to run TCP/IP and UDS (via systemds socket activation), an event source is being added to the loop for both methods. The systemd socket unit might be changed so that the used TCP/IP address collides with the configured ControllerPort. This is being detected and causes the controller to skip setting up the duplicated TCP/IP handler - socket activation has precedence. Additionally, to only accept connection requests via UDS, another configuration option UseTCP has been added. If set to true, setting up the handler for TCP/IP will be skipped. By default, TCP will be used. Additionally, integration tests were added to verify the socket activation as well as the new UseTCP configuration option. Signed-off-by: Michael Engel <[email protected]>
Relates to: eclipse-bluechi#997 Due to the systemd socket unit for the bluechi-controller multiple connection mechanisms such as TCP or UDS are supported. However, it is not possible to start BlueChi directly (or the systemd service) and use UDS since the FD for it gets passed from the socket unit. In order to support this, another connection handler has been added as well as the corresponding configuration option UseUDS, which is set to false by default. A collision of the systemd socket unit and the built-in UDS is being detected, logged and proceeded since the desired event source is available. Additionally, a meson option has been added to simplify using the same UDS path everywhere. Signed-off-by: Michael Engel <[email protected]>
engelmi
force-pushed
the
support-uds-and-tcp-in-parallel
branch
from
6f8171f to
5c8cbc4
Compare
|
I do think we might want to eventually reconsider defaulting tcp to off and be more aggressive towards doing network access via TLS proxies that then connect locally to the controller via UDS. But that is for the future. |
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.
Relates to: #997
Added UDS support without sock activation
Due to the systemd socket unit for the bluechi-controller multiple connection mechanisms such as TCP or UDS are supported. However, it is not possible to start BlueChi directly (or the systemd service) and use UDS since the FD for it gets passed from the socket unit. In order to support this, another connection handler has been added as well as the corresponding configuration option UseUDS, which is set to false by default. A collision of the systemd socket unit and the built-in UDS is being detected, logged and proceeded since the desired event source is available. Additionally, a meson option has been added to simplify using the same UDS path everywhere.
Add support to run TCP/IP and UDS (via socket activation) in parallel
In order to support to run TCP/IP and UDS (via systemds socket activation), an event source is being added to the loop for both methods. The systemd socket unit might be changed so that the used TCP/IP address collides with the configured ControllerPort. This is being detected and causes the controller to skip setting up the duplicated TCP/IP handler - socket activation has precedence. Additionally, to only accept connection requests via UDS, another configuration option UseTCP has been added. If set to true, setting up the handler for TCP/IP will be skipped. By default, TCP will be used. Additionally, integration tests were added to verify the socket activation as well as the new UseTCP configuration option.
Signed-off-by: Michael Engel [email protected]
Missing
- [ ] SELinux policy needs to be refined for UDS- [ ] Documentation has been updated