Refactor to support duplicate imports with different aliases (#865)

The existing code assumed imports to be either imported, or imported with an
alias. Badly formatted files may have duplicate imports for a package, using
different aliases.

This patch refactors the code, and;

Introduces a new `GetImportedNames` function, which returns all name(s) and
aliase(s) for a package, which effectively combines `GetAliasedName` and
`GetImportedName`, but adding support for duplicate imports.

The old `GetAliasedName` and `GetImportedName` functions have been rewritten to
use the new function and marked deprecated, but could be removed if there are no
external consumers.

With this patch, the linter is able to detect issues in files such as;

    package main

    import (
        crand "crypto/rand"
        "math/big"
        "math/rand"
        rand2 "math/rand"
        rand3 "math/rand"
    )

    func main() {
        _, _ = crand.Int(crand.Reader, big.NewInt(int64(2))) // good

        _ = rand.Intn(2) // bad
        _ = rand2.Intn(2)  // bad
        _ = rand3.Intn(2)  // bad
    }

Before this patch, only a single issue would be detected:

    gosec --quiet .

    [main.go:14] - G404 (CWE-338): Use of weak random number generator (math/rand instead of crypto/rand) (Confidence: MEDIUM, Severity: HIGH)
        13:
      > 14: 	_ = rand.Intn(2) // bad
        15: 	_ = rand2.Intn(2)  // bad

With this patch, all issues are identified:

    gosec --quiet .

    [main.go:16] - G404 (CWE-338): Use of weak random number generator (math/rand instead of crypto/rand) (Confidence: MEDIUM, Severity: HIGH)
        15: 	_ = rand2.Intn(2)  // bad
      > 16: 	_ = rand3.Intn(2)  // bad
        17: }

    [main.go:15] - G404 (CWE-338): Use of weak random number generator (math/rand instead of crypto/rand) (Confidence: MEDIUM, Severity: HIGH)
        14: 	_ = rand.Intn(2) // bad
      > 15: 	_ = rand2.Intn(2)  // bad
        16: 	_ = rand3.Intn(2)  // bad

    [main.go:14] - G404 (CWE-338): Use of weak random number generator (math/rand instead of crypto/rand) (Confidence: MEDIUM, Severity: HIGH)
        13:
      > 14: 	_ = rand.Intn(2) // bad
        15: 	_ = rand2.Intn(2)  // bad

While working on this change, I noticed that ImportTracker.TrackFile() was not able
to find import aliases;  Analyser.Check() called both ImportTracker.TrackFile() and
ast.Walk(), which (with the updated ImportTracker) resulted in importes to be in-
correctly included multiple times (once with the correct alias, once with the default).

I updated ImportTracker.TrackFile() to fix this, but with the updated ImportTracker,
Analyser.Check() no longer has to call ImportTracker.TrackFile() separately, as ast.Walk()
already handles the file, and will find all imports.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-10-17 10:59:18 +02:00 committed by GitHub
parent a2719d3248
commit 0ae0174c25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 71 additions and 78 deletions

View file

@ -172,9 +172,9 @@ func (gosec *Analyzer) Process(buildTags []string, packagePaths ...string) error
for { for {
select { select {
case s := <-j: case s := <-j:
packages, err := gosec.load(s, config) pkgs, err := gosec.load(s, config)
select { select {
case r <- result{pkgPath: s, pkgs: packages, err: err}: case r <- result{pkgPath: s, pkgs: pkgs, err: err}:
case <-quit: case <-quit:
// we've been told to stop, probably an error while // we've been told to stop, probably an error while
// processing a previous result. // processing a previous result.
@ -296,7 +296,6 @@ func (gosec *Analyzer) Check(pkg *packages.Package) {
gosec.context.Pkg = pkg.Types gosec.context.Pkg = pkg.Types
gosec.context.PkgFiles = pkg.Syntax gosec.context.PkgFiles = pkg.Syntax
gosec.context.Imports = NewImportTracker() gosec.context.Imports = NewImportTracker()
gosec.context.Imports.TrackFile(file)
gosec.context.PassedValues = make(map[string]interface{}) gosec.context.PassedValues = make(map[string]interface{})
ast.Walk(gosec, file) ast.Walk(gosec, file)
gosec.stats.NumFiles++ gosec.stats.NumFiles++
@ -434,6 +433,12 @@ func (gosec *Analyzer) Visit(n ast.Node) ast.Visitor {
} }
return gosec return gosec
} }
switch i := n.(type) {
case *ast.File:
// Using ast.File instead of ast.ImportSpec, so that we can track
// all imports at once.
gosec.context.Imports.TrackFile(i)
}
// Get any new rule exclusions. // Get any new rule exclusions.
ignoredRules := gosec.ignore(n) ignoredRules := gosec.ignore(n)
@ -453,9 +458,6 @@ func (gosec *Analyzer) Visit(n ast.Node) ast.Visitor {
// Push the new set onto the stack. // Push the new set onto the stack.
gosec.context.Ignores = append([]map[string][]SuppressionInfo{ignores}, gosec.context.Ignores...) gosec.context.Ignores = append([]map[string][]SuppressionInfo{ignores}, gosec.context.Ignores...)
// Track aliased and initialization imports
gosec.context.Imports.TrackImport(n)
for _, rule := range gosec.ruleset.RegisteredFor(n) { for _, rule := range gosec.ruleset.RegisteredFor(n) {
// Check if all rules are ignored. // Check if all rules are ignored.
generalSuppressions, generalIgnored := ignores[aliasOfAllRules] generalSuppressions, generalIgnored := ignores[aliasOfAllRules]

View file

@ -37,20 +37,20 @@ import (
// //
// node, matched := MatchCallByPackage(n, ctx, "math/rand", "Read") // node, matched := MatchCallByPackage(n, ctx, "math/rand", "Read")
func MatchCallByPackage(n ast.Node, c *Context, pkg string, names ...string) (*ast.CallExpr, bool) { func MatchCallByPackage(n ast.Node, c *Context, pkg string, names ...string) (*ast.CallExpr, bool) {
importedName, found := GetAliasedName(pkg, c) importedNames, found := GetImportedNames(pkg, c)
if !found {
importedName, found = GetImportedName(pkg, c)
if !found { if !found {
return nil, false return nil, false
} }
}
if callExpr, ok := n.(*ast.CallExpr); ok { if callExpr, ok := n.(*ast.CallExpr); ok {
packageName, callName, err := GetCallInfo(callExpr, c) packageName, callName, err := GetCallInfo(callExpr, c)
if err != nil { if err != nil {
return nil, false return nil, false
} }
if packageName == importedName { for _, in := range importedNames {
if packageName != in {
continue
}
for _, name := range names { for _, name := range names {
if callName == name { if callName == name {
return callExpr, true return callExpr, true
@ -247,48 +247,23 @@ func GetBinaryExprOperands(be *ast.BinaryExpr) []ast.Node {
return result return result
} }
// GetImportedName returns the name used for the package within the // GetImportedNames returns the name(s)/alias(es) used for the package within
// code. It will ignore initialization only imports. // the code. It ignores initialization-only imports.
func GetImportedName(path string, ctx *Context) (string, bool) { func GetImportedNames(path string, ctx *Context) (names []string, found bool) {
importName, imported := ctx.Imports.Imported[path] importNames, imported := ctx.Imports.Imported[path]
if !imported { return importNames, imported
return "", false
}
if _, initonly := ctx.Imports.InitOnly[path]; initonly {
return "", false
}
return importName, true
}
// GetAliasedName returns the aliased name used for the package within the
// code. It will ignore initialization only imports.
func GetAliasedName(path string, ctx *Context) (string, bool) {
importName, imported := ctx.Imports.Aliased[path]
if !imported {
return "", false
}
if _, initonly := ctx.Imports.InitOnly[path]; initonly {
return "", false
}
return importName, true
} }
// GetImportPath resolves the full import path of an identifier based on // GetImportPath resolves the full import path of an identifier based on
// the imports in the current context(including aliases). // the imports in the current context(including aliases).
func GetImportPath(name string, ctx *Context) (string, bool) { func GetImportPath(name string, ctx *Context) (string, bool) {
for path := range ctx.Imports.Imported { for path := range ctx.Imports.Imported {
if imported, ok := GetImportedName(path, ctx); ok && imported == name { if imported, ok := GetImportedNames(path, ctx); ok {
for _, n := range imported {
if n == name {
return path, true return path, true
} }
} }
for path := range ctx.Imports.Aliased {
if imported, ok := GetAliasedName(path, ctx); ok && imported == name {
return path, true
} }
} }

View file

@ -22,54 +22,51 @@ import (
// by a source file. It is able to differentiate between plain imports, aliased // by a source file. It is able to differentiate between plain imports, aliased
// imports and init only imports. // imports and init only imports.
type ImportTracker struct { type ImportTracker struct {
Imported map[string]string // Imported is a map of Imported with their associated names/aliases.
Aliased map[string]string Imported map[string][]string
InitOnly map[string]bool
} }
// NewImportTracker creates an empty Import tracker instance // NewImportTracker creates an empty Import tracker instance
func NewImportTracker() *ImportTracker { func NewImportTracker() *ImportTracker {
return &ImportTracker{ return &ImportTracker{
make(map[string]string), Imported: make(map[string][]string),
make(map[string]string),
make(map[string]bool),
} }
} }
// TrackFile track all the imports used by the supplied file // TrackFile track all the imports used by the supplied file
func (t *ImportTracker) TrackFile(file *ast.File) { func (t *ImportTracker) TrackFile(file *ast.File) {
for _, imp := range file.Imports { for _, imp := range file.Imports {
path := strings.Trim(imp.Path.Value, `"`) t.TrackImport(imp)
parts := strings.Split(path, "/")
if len(parts) > 0 {
name := parts[len(parts)-1]
t.Imported[path] = name
}
} }
} }
// TrackPackages tracks all the imports used by the supplied packages // TrackPackages tracks all the imports used by the supplied packages
func (t *ImportTracker) TrackPackages(pkgs ...*types.Package) { func (t *ImportTracker) TrackPackages(pkgs ...*types.Package) {
for _, pkg := range pkgs { for _, pkg := range pkgs {
t.Imported[pkg.Path()] = pkg.Name() t.Imported[pkg.Path()] = []string{pkg.Name()}
} }
} }
// TrackImport tracks imports and handles the 'unsafe' import // TrackImport tracks imports.
func (t *ImportTracker) TrackImport(n ast.Node) { func (t *ImportTracker) TrackImport(imported *ast.ImportSpec) {
if imported, ok := n.(*ast.ImportSpec); ok { importPath := strings.Trim(imported.Path.Value, `"`)
path := strings.Trim(imported.Path.Value, `"`)
if imported.Name != nil { if imported.Name != nil {
if imported.Name.Name == "_" { if imported.Name.Name == "_" {
// Initialization only import // Initialization only import
t.InitOnly[path] = true
} else { } else {
// Aliased import // Aliased import
t.Aliased[path] = imported.Name.Name t.Imported[importPath] = append(t.Imported[importPath], imported.Name.String())
}
}
if path == "unsafe" {
t.Imported[path] = path
} }
} else {
t.Imported[importPath] = append(t.Imported[importPath], importName(importPath))
} }
} }
func importName(importPath string) string {
parts := strings.Split(importPath, "/")
name := importPath
if len(parts) > 0 {
name = parts[len(parts)-1]
}
return name
}

View file

@ -27,7 +27,7 @@ var _ = Describe("Import Tracker", func() {
files := pkgs[0].Syntax files := pkgs[0].Syntax
Expect(files).Should(HaveLen(1)) Expect(files).Should(HaveLen(1))
tracker.TrackFile(files[0]) tracker.TrackFile(files[0])
Expect(tracker.Imported).Should(Equal(map[string]string{"fmt": "fmt"})) Expect(tracker.Imported).Should(Equal(map[string][]string{"fmt": {"fmt"}}))
}) })
It("should parse the named imports from file", func() { It("should parse the named imports from file", func() {
tracker := gosec.NewImportTracker() tracker := gosec.NewImportTracker()
@ -47,7 +47,7 @@ var _ = Describe("Import Tracker", func() {
files := pkgs[0].Syntax files := pkgs[0].Syntax
Expect(files).Should(HaveLen(1)) Expect(files).Should(HaveLen(1))
tracker.TrackFile(files[0]) tracker.TrackFile(files[0])
Expect(tracker.Imported).Should(Equal(map[string]string{"fmt": "fmt"})) Expect(tracker.Imported).Should(Equal(map[string][]string{"fmt": {"fm"}}))
}) })
}) })
}) })

View file

@ -3196,6 +3196,25 @@ func main() {
println(bad) println(bad)
} }
`}, 1, gosec.NewConfig()}, `}, 1, gosec.NewConfig()},
{[]string{`
package main
import (
crand "crypto/rand"
"math/big"
"math/rand"
rand2 "math/rand"
rand3 "math/rand"
)
func main() {
_, _ = crand.Int(crand.Reader, big.NewInt(int64(2))) // good
_ = rand.Intn(2) // bad
_ = rand2.Intn(2) // bad
_ = rand3.Intn(2) // bad
}
`}, 3, gosec.NewConfig()},
} }
// SampleCodeG501 - Blocklisted import MD5 // SampleCodeG501 - Blocklisted import MD5