Skip to content
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

Jump to bottom

nixos/sslh: make it possible (and the default) to listen on ipv6, plus regression test #77982

Merged
merged 2 commits into from Jun 24, 2020
Merged

nixos/sslh: make it possible (and the default) to listen on ipv6, plus regression test #77982

merged 2 commits into from Jun 24, 2020

Conversation

symphorien
Copy link
Member

Previously, sslh would only listen on ipv4 with no way to listen on both ipv6 and ipv4.

Things done

I added a regression test which tests ipv4, ipv6 and transparent proxying (as this is a tricky iptables setup, I think this is nice to have).

I also tested that listenAddress = "0.0.0.0" still works so this should be backward compatible.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@symphorien
Copy link
Member Author

cc @fpletz @k0ral as maintainers.

grahamc
grahamc reviewed Jan 18, 2020
View reviewed changes
Copy link
Member

@grahamc grahamc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At any rate, lgtm but the option needs to be renamed to indicate it is a list.

@symphorien symphorien force-pushed the sshl_ipv6 branch 2 times, most recently from 2c88333 to 90845aa Compare January 18, 2020 14:55
@symphorien
Copy link
Member Author

Option renamed with mkRenamedOptionModule.

@symphorien
Copy link
Member Author

Is there anything left to change?
I'd like to have an ipv6-compatible sslh in 20.03 :)

@fpletz
Copy link
Member

fpletz commented Feb 6, 2020

I've some intermittent NixOS test failures because grepping the journalctl fails.

@symphorien
Copy link
Member Author

I changed the implementation of the test to use $SSH_CONNECTION to find the apparent remote ip instead of journalctl. I expect this will solve the issues you experienced, @fpletz .

@symphorien symphorien mentioned this pull request Feb 28, 2020
Merged
10 tasks
@symphorien
Copy link
Member Author

bump

@symphorien symphorien requested a review from grahamc May 8, 2020 12:16
@symphorien
Copy link
Member Author

@GrahamcOfBorg build sslh.passthru.tests

@symphorien
Copy link
Member Author

rebased on current nixos-unstable
/marvin opt-in
/marvin needs_review

@marvin-mk2 marvin-mk2 bot added the marvin label Jun 20, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Jun 20, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@symphorien
Copy link
Member Author

/marvin needs_review

@symphorien
Copy link
Member Author

/status needs_review

@timokau
Copy link
Member

timokau commented Jun 23, 2020

/status needs_work

@symphorien
Copy link
Member Author

/status needs_review

@timokau
Copy link
Member

timokau commented Jun 24, 2020

Thank you!
/status needs_merge

@marvin-mk2 marvin-mk2 bot requested a review from timokau June 24, 2020 20:13
@timokau timokau merged commit 41ba255 into NixOS:master Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc Awaiting requested review from grahamc

@timokau timokau Awaiting requested review from timokau

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 awaiting_merger marvin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@symphorien @fpletz @timokau @grahamc