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

gitlab: 12.6.2 -> 12.6.4 #77645

Merged
merged 2 commits into from Jan 14, 2020
Merged

gitlab: 12.6.2 -> 12.6.4 #77645

merged 2 commits into from Jan 14, 2020

Conversation

@flokli
Copy link
Contributor

@flokli flokli commented Jan 13, 2020

Motivation for this change

CVE-2020-6832

Following up on https://gitlab.com/gitlab-org/gitlab/issues/194206, Gitaly seems to have a tag now, but they're now prefixed with v. Adressed this in the derivation.

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.
@flokli flokli requested a review from talyz Jan 13, 2020
@flokli
Copy link
Contributor Author

@flokli flokli commented Jan 13, 2020

@GrahamcOfBorg test gitlab

@ofborg ofborg bot requested review from fpletz, ehmry and globin Jan 14, 2020
@flokli flokli merged commit 8b44c1f into NixOS:master Jan 14, 2020
18 checks passed
18 checks passed
gitaly, gitlab on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
gitaly, gitlab on aarch64-linux Success
Details
gitaly, gitlab on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.gitlab on aarch64-linux Success
Details
tests.gitlab on x86_64-linux Success
Details
@flokli flokli deleted the flokli:gitlab-12.6.4 branch Jan 14, 2020
@flokli
Copy link
Contributor Author

@flokli flokli commented Jan 15, 2020

Backported to 19.09 in 644e25f, f79f998.

@talyz
Copy link
Contributor

@talyz talyz commented Jan 16, 2020

Sorry for replying so late - most things seem okay from my testing, but this suffers from the same issue as 12.6.3 (and possibly 12.6.2?) - when pushing to a repo you get warning messages about the json module being loaded multiple times:

remote: /nix/store/0wn3i5si4mmszzj09ciz6kvnkgh9qdwa-ruby2.6.5-json-2.2.0/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:100: warning: already initialized constant JSON::NaN
remote: /nix/store/py65868jzwx2bxdfh27c1byjkxy4x62b-gitaly-env/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:100: warning: previous definition of NaN was here
remote: /nix/store/0wn3i5si4mmszzj09ciz6kvnkgh9qdwa-ruby2.6.5-json-2.2.0/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:102: warning: already initialized constant JSON::Infinity
remote: /nix/store/py65868jzwx2bxdfh27c1byjkxy4x62b-gitaly-env/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:102: warning: previous definition of Infinity was here
remote: /nix/store/0wn3i5si4mmszzj09ciz6kvnkgh9qdwa-ruby2.6.5-json-2.2.0/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:104: warning: already initialized constant JSON::MinusInfinity
remote: /nix/store/py65868jzwx2bxdfh27c1byjkxy4x62b-gitaly-env/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:104: warning: previous definition of MinusInfinity was here
remote: /nix/store/0wn3i5si4mmszzj09ciz6kvnkgh9qdwa-ruby2.6.5-json-2.2.0/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:129: warning: already initialized constant JSON::UnparserError
remote: /nix/store/py65868jzwx2bxdfh27c1byjkxy4x62b-gitaly-env/lib/ruby/gems/2.6.0/gems/json-2.2.0/lib/json/common.rb:129: warning: previous definition of UnparserError was here

While this is probably not serious, it looks bad and will probably be confusing to end users. I've tried debugging this and have found where in the gitaly code it's triggered (in gitlab_logger.rb), but not why.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.