-
Notifications
You must be signed in to change notification settings - Fork 81
NanVix: Preserve block-default networking with blockedHosts #1071
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Huzaifa Danish (huzaifa-d)
wants to merge
6
commits into
main
Choose a base branch
from
user/modanish/fix-issue-787
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4748b14
Validate legacy host lists centrally
huzaifa-msft 4dfbdaa
test: cover shared legacy host validation
huzaifa-msft 147909e
fix: correct legacy network consumers
huzaifa-msft 93eba4f
test: preserve Seatbelt validation coverage
huzaifa-msft 294b40f
test: preserve Bubblewrap control path
huzaifa-msft ef6844b
Merge remote-tracking branch 'origin/main' into user/modanish/fix-issβ¦
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -539,11 +539,18 @@ export function createConfigFromPolicy( | |
| ); | ||
| } | ||
| } | ||
| // Unix backends accept host lists without allowOutbound. Bubblewrap and | ||
| // LXC enforce them; WSLC does not (per-host filtering is non-functional β | ||
| // no in-kernel iptables + no CAP_NET_ADMIN β and is rejected at parse | ||
| // time); Seatbelt accepts them for SDK compatibility and leaves its | ||
| // limitations to native validation. | ||
| if ( | ||
| policy.network.blockedHosts?.length && | ||
| !policy.network.allowedHosts?.length && | ||
| !policy.network.allowOutbound | ||
| ) { | ||
| throw new Error( | ||
| "blockedHosts requires allowedHosts when network.defaultPolicy='block'", | ||
| ); | ||
| } | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm unclear on why this is needed at SDK layer, but changes otherwise look good! |
||
| // Unix backends accept allowlists without allowOutbound. Bubblewrap and | ||
| // LXC enforce them under a block default; WSLC and Seatbelt leave their | ||
| // backend-specific limitations to native validation. | ||
| const acceptsHostRulesWithoutOutbound = | ||
| containment === 'wslc' || | ||
| containment === 'seatbelt' || | ||
|
|
@@ -558,7 +565,10 @@ export function createConfigFromPolicy( | |
| } | ||
|
|
||
| config.network = { | ||
| defaultPolicy: policy.network.allowOutbound ? 'allow' : 'block', | ||
| defaultPolicy: | ||
| policy.network.allowOutbound && !policy.network.allowedHosts?.length | ||
| ? 'allow' | ||
| : 'block', | ||
| allowLocalNetwork: policy.network.allowLocalNetwork, | ||
| allowedHosts: policy.network.allowedHosts, | ||
| blockedHosts: policy.network.blockedHosts, | ||
|
|
||
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.