Skip to content

cmd/go/internal/load: trim ldflags paths instead of removing them #68544

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
wants to merge 3 commits into
base: master
Choose a base branch
from
+556 −9
Open

cmd/go/internal/load: trim ldflags paths instead of removing them #68544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3145a2f
Add tests for BuildInfo
LaurentGoderre Jul 17, 2024
7f6c9d5
trim paths from ldflags in BuildInfo instead of removing them
LaurentGoderre Jul 22, 2024
0092318
wip
LaurentGoderre Jul 22, 2024
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
28 changes: 19 additions & 9 deletions src/cmd/go/internal/load/pkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"os"
pathpkg "path"
"path/filepath"
"regexp"
"runtime"
"runtime/debug"
"slices"
Expand Down Expand Up @@ -142,6 +143,8 @@ type PackagePublic struct {
XTestEmbedFiles []string `json:",omitempty"` // files matched by XTestEmbedPatterns
}

var FromDir = vcs.FromDir

// AllFiles returns the names of all the files considered for the package.
// This is used for sanity and security checks, so we include all files,
// even IgnoredGoFiles, because some subcommands consider them.
Expand Down Expand Up @@ -2341,13 +2344,10 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
// since it can include system paths through various linker flags (notably
// -extar, -extld, and -extldflags).
//
// TODO: since we control cmd/link, in theory we can parse ldflags to
// determine whether they may refer to system paths. If we do that, we can
// redact only those paths from the recorded -ldflags setting and still
// record the system-independent parts of the flags.
if !cfg.BuildTrimpath {
appendSetting("-ldflags", ldflags)
if cfg.BuildTrimpath {
ldflags = trimPathsFromLdFlags(ldflags)
}
appendSetting("-ldflags", ldflags)
}
if cfg.BuildCover {
appendSetting("-cover", "true")
Expand Down Expand Up @@ -2429,7 +2429,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
// (so the bootstrap toolchain packages don't even appear to be in GOROOT).
goto omitVCS
}
repoDir, vcsCmd, err = vcs.FromDir(base.Cwd(), "", allowNesting)
repoDir, vcsCmd, err = FromDir(base.Cwd(), "", allowNesting)
if err != nil && !errors.Is(err, os.ErrNotExist) {
setVCSError(err)
return
Expand All @@ -2455,7 +2455,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
// repository. vcs.FromDir allows nested Git repositories, but nesting
// is not allowed for other VCS tools. The current directory may be outside
// p.Module.Dir when a workspace is used.
pkgRepoDir, _, err := vcs.FromDir(p.Dir, "", allowNesting)
pkgRepoDir, _, err := FromDir(p.Dir, "", allowNesting)
if err != nil {
setVCSError(err)
return
Expand All @@ -2467,7 +2467,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
}
goto omitVCS
}
modRepoDir, _, err := vcs.FromDir(p.Module.Dir, "", allowNesting)
modRepoDir, _, err := FromDir(p.Module.Dir, "", allowNesting)
if err != nil {
setVCSError(err)
return
Expand Down Expand Up @@ -2503,6 +2503,16 @@ omitVCS:
p.Internal.BuildInfo = info
}

// trimLdFlags removes system paths from the ldflag.
// since we control cmd/link, in theory we parse ldflags to
// determine whether they refer to system paths. We then can
// redact only those paths from the recorded -ldflags setting and still
// record the system-independent parts of the flags.
func trimPathsFromLdFlags(flags string) string {
re := regexp.MustCompile(`(?:(['"])|\s)(?:-[A-Z])?\/[aA-zZ0-9][^\s'"]+`)
return re.ReplaceAllString(flags, `$1`)
}

// SafeArg reports whether arg is a "safe" command-line argument,
// meaning that when it appears in a command-line, it probably
// doesn't have some special meaning other than its own name.
Expand Down
Loading