Skip to content

[SumDBVerify] Check for git ownership #153

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

Open
mhutchinson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[SumDBVerify] Check for git ownership #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions vindex/cmd/sumdbverify/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"net/http"
"net/url"
"os"
"os/exec"
"path/filepath"
"regexp"
"strconv"
Expand Down Expand Up @@ -380,6 +381,9 @@ func reportVersion(ctx context.Context, modRoot string, goModPath string, modNam
subdir = ""
}
if err := zip.CreateFromVCS(f, modVer, modRoot, hash.String(), subdir); err != nil {
if diagErr := diagnoseGitError(modRoot); diagErr != nil {
return report, fmt.Errorf("failed to create zip file: %v (diagnostics: %v)", err, diagErr)
}
return report, fmt.Errorf("failed to create zip file: %v", err)
}
report.gitZipHash, err = dirhash.HashZip(f.Name(), dirhash.Hash1)
Expand Down Expand Up @@ -508,3 +512,20 @@ func newInputLogClientFromFlags() *client.InputLogClient {
}
return c
}

// diagnoseGitError checks if the git command fails due to ownership issues
// and returns a helpful error if so.
func diagnoseGitError(dir string) error {
cmd := exec.Command("git", "rev-parse", "--git-dir")
cmd.Dir = dir
var stderr bytes.Buffer
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
stderrStr := stderr.String()
if strings.Contains(stderrStr, "detected dubious ownership") {
return errors.New(strings.TrimSpace(stderrStr))
}
}
return nil
}

Loading