feat(build): add system CA root mode#2324
Open
politerealism wants to merge 2 commits into
Open
Conversation
Allow distro builds to use native trust stores for supervisor upstream TLS while keeping bundled Mozilla roots as the default. Avoid bundled root crates in system-ca-roots builds by using native-root TLS features and z3 0.20. Signed-off-by: Adam Miller <admiller@redhat.com>
The telemetry-off task uses --no-default-features which now disables bundled-ca-roots in addition to telemetry, triggering the compile_error guard. Re-enable bundled-ca-roots explicitly so the task verifies only telemetry compilation. Signed-off-by: Scott Burdine <sburdine@nvidia.com> Signed-off-by: politerealism <burdcat17@gmail.com>
politerealism
requested review from
a team,
derekwaynecarr,
maxamillion and
mrunalp
as code owners
July 16, 2026 18:50
|
Thank you for your interest in contributing to OpenShell, @politerealism. This project uses a vouch system for first-time contributors. Before submitting a pull request, you need to be vouched by a maintainer. To get vouched:
See CONTRIBUTING.md for details. |
|
All contributors have signed the DCO ✍️ ✅ |
Author
|
I have read the DCO document and I hereby sign the DCO. |
Author
|
recheck |
Collaborator
|
/ok to test 00c9b14 |
This file contains hidden or 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
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
bundled-ca-roots/system-ca-rootsfeature flags toopenshell-supervisor-networkandopenshell-sandbox, allowing Linux distribution builds to use the platform trust store instead of bundled Mozilla rootsrustls-tls-native-roots,tls-rustls-ring-native-roots) so RPM-built binaries respect the system trust store without feature flagsrust:verify:telemetry-offCI task to explicitly re-enablebundled-ca-rootswhen disabling default features, preventing the newcompile_error!guard from firingRelated Issue
Enables downstream RPM packaging (https://gitlab.com/redhat/hummingbird/rpms/-/merge_requests/2503) to build against system CA roots.
Changes
crates/openshell-supervisor-network/Cargo.toml: Makewebpki-rootsoptional behindbundled-ca-roots(default), addsystem-ca-rootsfeature gatingrustls-native-certscrates/openshell-supervisor-network/src/l7/tls.rs: Add compile-time guards enforcing exactly one CA root mode; refactorbuild_upstream_client_configto returnResultand support both modescrates/openshell-sandbox/Cargo.toml: Forwardbundled-ca-roots/system-ca-rootsfeatures to supervisor-network; setdefault-features = falseon the dependencytasks/rust.toml: Addrust:verify:system-ca-rootsCI task; fixrust:verify:telemetry-offto pass--features bundled-ca-rootsCargo.toml: Addrustls-native-certsto workspace dependencies; switchreqwest,sqlx,kubeto native root variantsTesting
mise run rust:verify:telemetry-offpasses (telemetry compiled out, CA root guard satisfied)mise run rust:verify:system-ca-rootspasses (system-ca-roots compiles, no webpki-roots in dep tree)cargo test -p openshell-supervisor-networkpasses under default featurescargo build --release --bin openshell --bin openshell-gateway) builds without feature flagsChecklist
compile_error!guards enforce mutual exclusionsystem-ca-rootsbuilds