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.5.5 -> 12.6.2 #76193

Merged
merged 7 commits into from Jan 3, 2020
Merged

gitlab: 12.5.5 -> 12.6.2 #76193

merged 7 commits into from Jan 3, 2020

Conversation

@talyz
Copy link
Contributor

@talyz talyz commented Dec 23, 2019

Motivation for this change

Update GitLab to the latest version.

Gitaly is problematic in this release for two reasons:

  1. The version used in the gitlab repo is not tagged and as a result its commit id is used instead (reported here)
  2. A new permission check on hook files checks for write permission when only read and execute are needed (reported here)
Things done

Tried a few things manually in a VM:

  • Clone, commit and push to a repo
  • Remove and add ssh keys, making sure the executable path referenced in authorized_keys is correct
  • 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.
Notify maintainers

cc @flokli @globin @roblabla @fpletz @krav @petabyteboy

talyz added 5 commits Dec 22, 2019
For some reason this untagged commit is the one referred to in the
main repository; this might be a mistake, but we'll have to package it
for now to follow upstream.
GitLab Shell now has the go.mod and go.sum files in the root of the
repo; the go subdirectory has been removed and all the code in it has
been moved up to the root.
@talyz
Copy link
Contributor Author

@talyz talyz commented Dec 23, 2019

@GrahamcOfBorg test gitlab

@talyz talyz changed the title gitlab: 12.5.5 -> 12.6.0 gitlab: 12.5.5 -> 12.6.1 Dec 28, 2019
@talyz
Copy link
Contributor Author

@talyz talyz commented Dec 28, 2019

Updated to latest security update.

@GrahamcOfBorg test gitlab

 - CVE-2019-20146
 - CVE-2019-20143
 - CVE-2019-20147
 - CVE-2019-20145
 - CVE-2019-20142
 - CVE-2019-20148
 - CVE-2020-5197
@flokli
Copy link
Contributor

@flokli flokli commented Jan 2, 2020

Updated to the latest security update.

@talyz talyz changed the title gitlab: 12.5.5 -> 12.6.1 gitlab: 12.5.5 -> 12.6.2 Jan 3, 2020
@talyz
Copy link
Contributor Author

@talyz talyz commented Jan 3, 2020

The issues are reported; I've updated the description with links.

@flokli flokli merged commit cd9cbb1 into NixOS:master Jan 3, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
gitaly, gitlab, gitlab-shell, gitlab-workhorse on aarch64-linux Success
Details
gitaly, gitlab, gitlab-shell, gitlab-workhorse 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
@flokli
Copy link
Contributor

@flokli flokli commented Jan 3, 2020

Merged - especially considering the security fixes, let's not delay this any further.

@flokli
Copy link
Contributor

@flokli flokli commented Jan 3, 2020

backported to 19.09 in dbc7909, 9fc0570, 18469ac, 7ce433c, c93501d, fd7ce83, 7201d23.

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.