Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 138f2cc707d7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fe792ef27a62
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 4, 2019

  1. buildbot: fix CVE-2019-7313

    @veprbl
    veprbl committed Feb 4, 2019
    Copy the full SHA
    fe792ef View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/development/tools/build-managers/buildbot/default.nix
11 changes: 10 additions & 1 deletion pkgs/development/tools/build-managers/buildbot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
{ stdenv, lib, fetchpatch, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:

let
withPlugins = plugins: runCommand "wrapped-${package.name}" {
@@ -74,6 +74,15 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch

# CVE-2019-7313
# https://github.com/buildbot/buildbot/wiki/CRLF-injection-in-Buildbot-login-and-logout-redirect-code
# https://github.com/buildbot/buildbot/compare/v1.8.0...v1.8.1
(fetchpatch {
url = "https://github.com/buildbot/buildbot/commit/bdae9fea4e8978b19e12425776b2d083febd91a6.diff";
sha256 = "18fbcbqphs8jjmfvjjcbcnv5wj87mj6jv9lmx17lfhpi5hg2axph";
stripLen = 1;
})
];

postPatch = ''