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.

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

git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028) #109569

Merged
merged 1 commit into from Jan 17, 2021
Merged

git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028) #109569

merged 1 commit into from Jan 17, 2021

Conversation

hartwork
Copy link
Contributor

Also propagates move of repository from https://github.com/esc/git-big-picture to https://github.com/git-big-picture/git-big-picture. Upstream change log for 1.0.0 is at https://github.com/git-big-picture/git-big-picture#changelog

Motivation for this change

Fix for vulnerability CVE-2021-3028 + bugfixes + new features

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.

@ofborg ofborg bot requested a review from nthorne January 16, 2021 22:10
SuperSandro2000
SuperSandro2000 reviewed Jan 17, 2021
View reviewed changes
pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix Outdated
@@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec {

meta = {
description = "Tool for visualization of Git repositories";
homepage = "https://github.com/esc/git-big-picture";
homepage = "https://github.com/git-big-picture/git-big-picture";
license = lib.licenses.gpl3;
Copy link
Member

Choose a reason for hiding this comment

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

gpl3Plus or gpl3Only?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nice to meet a fellow who cares about licensing too. It's gpl3Plus indeed. Fixed.

@SuperSandro2000
Copy link
Member 

hash mismatch in fixed-output derivation '/nix/store/1haqdfxiga6qf0c5pxlxv961agf6yy53-source':
  wanted: sha256:1yg3p64g817x46c39c66yra02fak7yax25yy7ff56wgw67qpa5rw
  got:    sha256:14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha

@hartwork
Copy link
Contributor Author 

hash mismatch in fixed-output derivation '/nix/store/1haqdfxiga6qf0c5pxlxv961agf6yy53-source':
  wanted: sha256:1yg3p64g817x46c39c66yra02fak7yax25yy7ff56wgw67qpa5rw
  got:    sha256:14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha

@SuperSandro2000 can you help me understand what's causing this and how to fix it? I'm not a user of nixOS and I don't see either SHA256 in the file or even in the whole repository anywhere. Thank you!

@hartwork
Copy link
Contributor Author

@SuperSandro2000 PS: I noticed that the old value in sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi"; is not a hex-digest SHA256 and that the Googling for it gives me things mentioning tool nix-hash and base32 but not a description of how to rebuild that hash on a non-nixOS system. I don't have nix-hash around so I'll need help here or someone taking over. Thank you!

SuperSandro2000
SuperSandro2000 reviewed Jan 17, 2021
View reviewed changes
pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix Outdated
repo = pname;
rev = "v${version}";
sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi";
sha256 = stdenv.lib.fakeSha256; # TODO
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
sha256 = stdenv.lib.fakeSha256; # TODO
sha256 = "14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha";

Copy link
Contributor Author

@hartwork hartwork Jan 17, 2021 •
edited

Choose a reason for hiding this comment

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

Thanks, I've put it in now to have the CI give it a try. Can you teach me how to derive a hash like that myself for next time using say plain Python on a non-nixOS Linux?

@SuperSandro2000
Copy link
Member

@SuperSandro2000 can you help me understand what's causing this and how to fix it? I'm not a user of nixOS and I don't see either SHA256 in the file or even in the whole repository anywhere. Thank you!

The one hash is base64 encoded and you need just nix to get it.

@hartwork
Copy link
Contributor Author

Now it asks for PyPI package scruf while that actually a test-only dependency. Any ideas how to make it ignore scruf?

@SuperSandro2000
Copy link
Member

Now it asks for PyPI package scruf while that actually a test-only dependency. Any ideas how to make it ignore scruf?

I took a look at the setup.py and it should be checkInputs only.

@hartwork
Copy link
Contributor Author

I took a look at the setup.py and it should be checkInputs only.

I'm not sure what "should be checkInputs only" means. What do you suggest for a change?

@hartwork hartwork mentioned this pull request Jan 17, 2021
Merged
@hartwork hartwork force-pushed the update-git-big-picture branch 2 times, most recently from efada1e to 423b8fe Compare January 17, 2021 22:57
@SuperSandro2000 SuperSandro2000 merged commit 4ae325d into NixOS:master Jan 17, 2021
@hartwork
Copy link
Contributor Author

@SuperSandro2000 thanks! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@nthorne nthorne Awaiting requested review from nthorne

Assignees
No one assigned
Labels
1.severity: security 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hartwork @SuperSandro2000 @Janik-Haag