rand: use a MatchCallByPackage helper

holyspectral · Nov 6, 2016 · afb84ff · afb84ff
1 parent 8a473c7
commit afb84ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 37 deletions.
diff --git a/core/helpers.go b/core/helpers.go
@@ -52,11 +52,11 @@ func MatchCall(n ast.Node, r *regexp.Regexp) *ast.CallExpr {
 // package and identifier name matches the passed in parameters.
 //
 // Usage:
-// 	node, obj := MatchCall(n, ctx, "math/rand", "Read")
+// 	node, obj := MatchCallByPackage(n, ctx, "math/rand", "Read")
 //
-func MatchCallByObject(n ast.Node, c *Context, pkg, name string) (*ast.CallExpr, types.Object) {
+func MatchCallByPackage(n ast.Node, c *Context, pkg, name string) (*ast.CallExpr, types.Object) {
 	call, obj := GetCallObject(n, c)
-	if obj != nil && obj.Pkg().Path() == pkg && obj.Name() == name {
+	if obj != nil && obj.Pkg() != nil && obj.Pkg().Path() == pkg && obj.Name() == name {
 		return call, obj
 	}
 	return nil, nil

diff --git a/rules/rand.go b/rules/rand.go
@@ -16,50 +16,20 @@ package rules
 
 import (
 	"go/ast"
-	"go/types"
-	"regexp"
 
 	gas "github.com/GoASTScanner/gas/core"
 )
 
 type WeakRand struct {
 	gas.MetaData
-	pattern     *regexp.Regexp
+	funcName    string
 	packagePath string
 }
 
-func matchFuncCall(n ast.Node, c *gas.Context) (types.Object, *ast.Ident) {
-	call, ok := n.(*ast.CallExpr)
-	if !ok {
-		return nil, nil
-	}
-
-	sel, ok := call.Fun.(*ast.SelectorExpr)
-	if !ok {
-		return nil, nil
-	}
-
-	id, ok := sel.X.(*ast.Ident)
-	if !ok {
-		return nil, nil
-	}
-
-	return c.Info.ObjectOf(id), sel.Sel
-}
-
 func (w *WeakRand) Match(n ast.Node, c *gas.Context) (*gas.Issue, error) {
-	o, f := matchFuncCall(n, c)
-
-	if o == nil || f == nil {
-		return nil, nil
-	}
-
-	pkg, ok := o.(*types.PkgName)
-	if !ok {
-		return nil, nil
-	}
+	node, _ := gas.MatchCallByPackage(n, c, w.packagePath, w.funcName)
 
-	if pkg.Imported().Path() == w.packagePath && w.pattern.MatchString(f.String()) {
+	if node != nil {
 		return gas.NewIssue(c, n, w.What, w.Severity, w.Confidence), nil
 	}
 
@@ -68,7 +38,7 @@ func (w *WeakRand) Match(n ast.Node, c *gas.Context) (*gas.Issue, error) {
 
 func NewWeakRandCheck(conf map[string]interface{}) (r gas.Rule, n ast.Node) {
 	r = &WeakRand{
-		pattern:     regexp.MustCompile(`^Read$`),
+		funcName:    "Read",
 		packagePath: "math/rand",
 		MetaData: gas.MetaData{
 			Severity:   gas.High,