summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-11-01 18:29:00 +0100
committersternenseemann <sternenseemann@systemli.org>2022-11-01 21:19:42 +0100
commitebb0a9b939409faf3b80c8c680812d69c2791271 (patch)
treeb7481b669be7bd4a0addbefb0b7ff5351525d596 /pkgs/development/tools
parenteeca5969b3f42ac943639aaec503816f053e5e53 (diff)
downloadnixpkgs-ebb0a9b939409faf3b80c8c680812d69c2791271.tar
nixpkgs-ebb0a9b939409faf3b80c8c680812d69c2791271.tar.gz
nixpkgs-ebb0a9b939409faf3b80c8c680812d69c2791271.tar.bz2
nixpkgs-ebb0a9b939409faf3b80c8c680812d69c2791271.tar.lz
nixpkgs-ebb0a9b939409faf3b80c8c680812d69c2791271.tar.xz
nixpkgs-ebb0a9b939409faf3b80c8c680812d69c2791271.tar.zst
nixpkgs-ebb0a9b939409faf3b80c8c680812d69c2791271.zip
buf: remove reliance of tests on git file transport
A recent git security update disabled the file transport by default,
see https://github.blog/2022-10-18-git-security-vulnerabilities-announced/#cve-2022-39253

We can pick an upstream patch which needed to be rebased unfortunately,
so we can't fetch it directly from GitHub.
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch51
-rw-r--r--pkgs/development/tools/buf/default.nix3
2 files changed, 54 insertions, 0 deletions
diff --git a/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch b/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch
new file mode 100644
index 00000000000..a26f41d7197
--- /dev/null
+++ b/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch
@@ -0,0 +1,51 @@
+commit e9219b88de5ed37af337ee2d2e71e7ec7c0aad1b
+Author: Robbert van Ginkel <rvanginkel@buf.build>
+Date:   Thu Oct 20 16:43:28 2022 -0400
+
+    Fix git unit test by using fake git server rather than file:// (#1518)
+    
+    More recent versions of git fix a CVE by disabling some usage of the
+    `file://` transport, see
+    https://github.blog/2022-10-18-git-security-vulnerabilities-announced/#cve-2022-39253.
+    We were using this transport in tests.
+    
+    Instead, use https://git-scm.com/docs/git-http-backend to serve up this
+    repository locally so we don't have to use the file protocol. This
+    should be a more accurate tests, since we mostly expect submodules to
+    come from servers.
+
+diff --git a/private/pkg/git/git_test.go b/private/pkg/git/git_test.go
+index 7b77b6cd..7132054e 100644
+--- a/private/pkg/git/git_test.go
++++ b/private/pkg/git/git_test.go
+@@ -17,6 +17,8 @@ package git
+ import (
+ 	"context"
+ 	"errors"
++	"net/http/cgi"
++	"net/http/httptest"
+ 	"os"
+ 	"os/exec"
+ 	"path/filepath"
+@@ -213,6 +215,21 @@ func createGitDirs(
+ 	runCommand(ctx, t, container, runner, "git", "-C", submodulePath, "add", "test.proto")
+ 	runCommand(ctx, t, container, runner, "git", "-C", submodulePath, "commit", "-m", "commit 0")
+ 
++	gitExecPath, err := command.RunStdout(ctx, container, runner, "git", "--exec-path")
++	require.NoError(t, err)
++	t.Log(filepath.Join(string(gitExecPath), "git-http-backend"))
++	// https://git-scm.com/docs/git-http-backend#_description
++	f, err := os.Create(filepath.Join(submodulePath, ".git", "git-daemon-export-ok"))
++	require.NoError(t, err)
++	require.NoError(t, f.Close())
++	server := httptest.NewServer(&cgi.Handler{
++		Path: filepath.Join(strings.TrimSpace(string(gitExecPath)), "git-http-backend"),
++		Dir:  submodulePath,
++		Env:  []string{"GIT_PROJECT_ROOT=" + submodulePath},
++	})
++	t.Cleanup(server.Close)
++	submodulePath = server.URL
++
+ 	originPath := filepath.Join(tmpDir, "origin")
+ 	require.NoError(t, os.MkdirAll(originPath, 0777))
+ 	runCommand(ctx, t, container, runner, "git", "-C", originPath, "init")
diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
index 5d5e4084085..28e56833856 100644
--- a/pkgs/development/tools/buf/default.nix
+++ b/pkgs/development/tools/buf/default.nix
@@ -26,6 +26,9 @@ buildGoModule rec {
     ./skip_test_requiring_network.patch
     # Skip TestWorkspaceGit which requires .git and commits.
     ./skip_test_requiring_dotgit.patch
+    # Remove reliance of tests on file protocol which is disabled in git by default now
+    # Rebased upstream change https://github.com/bufbuild/buf/commit/bcaa77f8bbb8f6c198154c7c8d53596da4506dab
+    ./buf-tests-dont-use-file-transport.patch
   ];
 
   nativeBuildInputs = [ installShellFiles ];