Skip to content

nspawn: support passing wireless interface to container #30956

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 14 commits into from
Jan 19, 2024
Merged

nspawn: support passing wireless interface to container #30956

merged 14 commits into from
Jan 19, 2024

Conversation

@yuwata
Copy link
Member

@yuwata yuwata commented Jan 16, 2024

Closes #7873.

@yuwata yuwata added the nspawn label Jan 16, 2024
@github-actions github-actions bot added sd-device please-review PR is ready for (re-)review by a maintainer labels Jan 16, 2024
@yuwata yuwata mentioned this pull request Jan 16, 2024
Closed
@poettering
Copy link
Member

poettering commented Jan 16, 2024

looks superficially good to me.

@poettering poettering added good-to-merge/waiting-for-reporter-feedback 👍 and removed please-review PR is ready for (re-)review by a maintainer labels Jan 16, 2024
@mrc0mmand mrc0mmand added the ci-fails/needs-rework 🔥 Please rework this, the CI noticed an issue with the PR label Jan 16, 2024
@yuwata yuwata force-pushed the nspawn-network-pass-wifi branch from 1da5f8a to 2fc6667 Compare January 17, 2024 05:17
@github-actions github-actions bot added udev util-lib tests sd-netlink please-review PR is ready for (re-)review by a maintainer and removed ci-fails/needs-rework 🔥 Please rework this, the CI noticed an issue with the PR labels Jan 17, 2024
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 17, 2024
View reviewed changes
@yuwata
Copy link
Member Author

yuwata commented Jan 17, 2024

This becomes much bigger than I initially expected. But, now renaming is also supported, and test cases are added. PTAL.

@yuwata yuwata force-pushed the nspawn-network-pass-wifi branch from 2fc6667 to 373018b Compare January 17, 2024 05:19
@yuwata
Copy link
Member Author

yuwata commented Jan 17, 2024

@Edu4rdSHL Please test again.

@yuwata yuwata mentioned this pull request Jan 17, 2024
Merged
@yuwata
Copy link
Member Author

yuwata commented Jan 17, 2024

(BTW, this is nice article: https://www.suse.com/c/creating-virtual-wlan-interfaces/)

@Edu4rdSHL
Copy link
Contributor

Edu4rdSHL commented Jan 17, 2024

I have tested it and everything works as expected. I did a few tests:

  • Passing the interface just to get network access: OK
  • Passing the interface to do WiFi pentesting tests (which include putting the interface in monitor mode, etc): OK
  • Passing the interface to create custom network configs inside the container: OK

poettering
poettering reviewed Jan 17, 2024
View reviewed changes
poettering
poettering reviewed Jan 17, 2024
View reviewed changes
poettering
poettering reviewed Jan 17, 2024
View reviewed changes
@poettering poettering added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks and removed please-review PR is ready for (re-)review by a maintainer labels Jan 17, 2024
@yuwata yuwata force-pushed the nspawn-network-pass-wifi branch from 373018b to aaf4211 Compare January 19, 2024 05:33
@yuwata yuwata force-pushed the nspawn-network-pass-wifi branch from c50a459 to d7bb49b Compare January 19, 2024 06:05
yuwata added 9 commits January 19, 2024 15:06
@yuwata
namespace-util: rename arguments to prefix 'ret_'
5178d4a 
Also reorder opening namespace fd to make it match with the order of the
arguments.
@yuwata
tree-wide: add short comments for namespace_open() and namespace_enter()
d2881ef 
Also use -EBADF when unspecified.
@yuwata
namespace-util: downgrade log level in userns_acquire()
cb566b5 
On failure, the caller logs the error in LOG_ERR.
@yuwata
process-util: introduce FORK_NEW_NETNS for safe_fork()
387f39e 
Similar to FORK_NEW_MOUNTNS or FORK_NEW_USERNS.
@yuwata
namespace-util: introduce netns_acquire()
3f53332 
Similar to userns_acquire(), but for network namespace.
@yuwata
udev-util: introduce reset_cached_udev_availability()
a3df693
@yuwata
sd-device: introduce device_get_sysattr_u32()
3e98379
@yuwata
sd-netlink: introduce rtnl_rename_link()
6e931bc
@yuwata
sd-netlink: add policy for NL80211_ATTR_NETNS_FD
d926864
poettering
poettering reviewed Jan 19, 2024
View reviewed changes
poettering
poettering reviewed Jan 19, 2024
View reviewed changes
@poettering
Copy link
Member

poettering commented Jan 19, 2024

lgtm, just some superficial comments about function names.

@poettering poettering added good-to-merge/with-minor-suggestions and removed please-review PR is ready for (re-)review by a maintainer labels Jan 19, 2024
yuwata added 5 commits January 19, 2024 19:05
@yuwata
nspawn-network: split out move_back_network_interfaces()
cdd9988 
No functional change, just refactoring and preparation for later
commits.
@yuwata
nspawn-network: split out move_network_interface_one()
38475ca 
This also changes to use sd_device to get some attributes.
So, on moving interfaces back to the parent, we need to populate sysfs
associated to the client netns.
That may look redundant and complicated, but it makes later change
easier, and hopefully faster.
@yuwata
nspawn-network: also check alternative names
326214b 
If the requested new name for a network interface is already assigned as a
alternative name, then it is not necessary to and cannot rename the
interface.
@yuwata
nspawn-network: support passing wireless interface to container
1c3e5b4 
Closes systemd#7873.
@yuwata
test-13-NSPAWN: add more test case for passing network interfaces
e8736fb 
- test interface renaming that conflicts with the current alternative
  network interface name,
- test passing wlan interfaces.
@yuwata yuwata force-pushed the nspawn-network-pass-wifi branch from d7bb49b to e8736fb Compare January 19, 2024 10:06
@yuwata
Copy link
Member Author

yuwata commented Jan 19, 2024

@poettering Thank you for the review. The functions are renamed. Upgrading the green label.

@yuwata yuwata added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed good-to-merge/with-minor-suggestions labels Jan 19, 2024
@bluca bluca merged commit 0d2e660 into systemd:main Jan 19, 2024
@github-actions github-actions bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jan 19, 2024
@yuwata yuwata deleted the nspawn-network-pass-wifi branch January 19, 2024 12:06
Edu4rdSHL added a commit to nspawn/nspawn.github.io that referenced this pull request Jan 25, 2024
@Edu4rdSHL
(post-update): Wireless adapters on systemd-nspawn containers
5c912b4 
Mention systemd/systemd#30956 which will fix this problem and we will not need workarounds.
This was referenced Jan 26, 2024
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@poettering poettering poettering left review comments

+1 more reviewer

@Edu4rdSHL Edu4rdSHL Edu4rdSHL approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

nspawn sd-bus sd-device sd-netlink tests udev util-lib

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

nspawn should support passing wifi adapters to containers, like other environments (LXC, …) apparently can do

5 participants

@yuwata @poettering @Edu4rdSHL @mrc0mmand @bluca