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

openssh: 8.1p1 -> 8.2p1 #80196

Merged
merged 2 commits into from Feb 27, 2020
Merged

openssh: 8.1p1 -> 8.2p1 #80196

merged 2 commits into from Feb 27, 2020

Conversation

prusnak
Copy link
Member

@prusnak prusnak commented Feb 15, 2020

Motivation for this change
Things done
  • 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.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

please fix eval issues

@prusnak
Copy link
Member Author

prusnak commented Feb 16, 2020

I just realized that gssapi patchset does not apply and we need to wait until the package is updated the debian (where we fetch the gssapi patch from).

@edolstra
Copy link
Member

Or just disable the gssapi patchset. I don't think that should be a blocker for updating ssh.

@prusnak
Copy link
Member Author

prusnak commented Feb 17, 2020

I added another change in 464890f which keeps version 8.1p1 for openssh_gssapi. I kept openssh_hpn for now, because it was fixed by version update in 025217a.

If there is a reason to drop the hpnSupport completely because no one uses it, I can amend my
changes, but it seems it's not really required as it builds for now and the upstream seems active too.

@mmahut
Copy link
Member

mmahut commented Feb 19, 2020

@GrahamcOfBorg eval

@fatpat
Copy link
Contributor

fatpat commented Feb 20, 2020

tested with fido2 and a titan security key, works like a charm 👍

@prusnak
Copy link
Member Author

prusnak commented Feb 20, 2020

Can anyone help with the eval failure? I don't see what's wrong here ...

@mmahut
Copy link
Member

mmahut commented Feb 21, 2020

@prusnak can you please try to rebase on master?

@artemist
Copy link
Member

It looks like libfido2 needs IOKit if you haven't fixed it yet

@prusnak
Copy link
Member Author

prusnak commented Feb 21, 2020

Eval problems solved by disabling libfido2 feature for Darwin. This was caused because the libfido2 package does not build for Darwin at the moment (simply adding IOKit to libfido2 darwin package did not do the trick). That's why I limited libfido2 feature only to Linux.

Debian team meanwhile updated the gssapi patch for 8.2p1 so I also bumped openssh_gssapi to this version.

All is set for review. Also, we definitively want this in 20.03 as well.

@dtzWill
Copy link
Member

dtzWill commented Feb 24, 2020 via email

@artemist
Copy link
Member

This PR does need to add back a withFido2 option, which I think was in an earlier commit. I can't find it, but it should be in @prusnak's reflog. The option should probably default to stdenv.isUnix

https://www.openssh.com/txt/release-8.2

add libfido2 to enable hardware tokens support added in this release
fix build failure
@prusnak
Copy link
Member Author

prusnak commented Feb 25, 2020

I reintroduced the withFIDO option like suggested above by @artemist. However, there was no stdenv.isUnix attribute on my NixOS Linux system, so I used stdenv.hostPlatform.isUnix instead. Is that correct?

@mmahut
Copy link
Member

mmahut commented Feb 25, 2020

@GrahamcOfBorg test openssh

Copy link
Member

@mmahut mmahut left a comment

Choose a reason for hiding this comment

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

Successfully tested using my Trezor device following this guide.

@mmahut
Copy link
Member

mmahut commented Feb 25, 2020

Given we need openssh 8.2 on the server side as well for these new features to work. I would like to propose to backport this into release-20.03.

@FRidh FRidh changed the base branch from master to staging February 27, 2020 09:16
@FRidh FRidh added this to Ready in Staging Feb 27, 2020
@FRidh FRidh merged commit 205f42b into NixOS:staging Feb 27, 2020
Staging automation moved this from Ready to Done Feb 27, 2020
@prusnak prusnak mentioned this pull request Feb 27, 2020
@prusnak
Copy link
Member Author

prusnak commented Feb 27, 2020

@mmahut should we just create a PR to 20.03 branch or what exactly is the process for proposing a backport?

@worldofpeace
Copy link
Contributor

We discussed the possibility of backporting openssh 8.2p1 in #nixos-dev

my feelings were well expressed in this comment https://logs.nix.samueldr.com/nixos-dev/2020-02-27#3113665;

A question that was raised that would make the determination easier if answered was "how long will 8.1 get security updates?".

@prusnak
Copy link
Member Author

prusnak commented Feb 27, 2020

@worldofpeace I'll ask among the OpenSSH folks what's their security update strategy is.

@prusnak
Copy link
Member Author

prusnak commented Feb 27, 2020

@worldofpeace answer from Damien Miller of OpenSSH: "We don't do backported security fixes - we're a tiny team and so only maintain the current release."

@worldofpeace
Copy link
Contributor

@worldofpeace answer from Damien Miller of OpenSSH: "We don't do backported security fixes - we're a tiny team and so only maintain the current release."

I guess this makes the decision easy 😄

@worldofpeace
Copy link
Contributor

@prusnak Let's do it.

@prusnak
Copy link
Member Author

prusnak commented Feb 29, 2020

@worldofpeace Shall I prepare a PR? To which branch?

@worldofpeace
Copy link
Contributor

@worldofpeace Shall I prepare a PR? To which branch?

release-20.03

@prusnak prusnak deleted the openssh branch February 29, 2020 12:59
@prusnak prusnak mentioned this pull request Feb 29, 2020
10 tasks
@prusnak
Copy link
Member Author

prusnak commented Feb 29, 2020

Backport to 20.03 in #81368

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

10 participants