Merge branch 'master' into enumeration-progressbar

v2/internal/runner/runner.go

@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"net/http/cookiejar"
 	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 
@@ -174,65 +175,98 @@ func (r *Runner) RunEnumeration() {
 
 	// parses user input, handle file/directory cases and produce a list of unique templates
 	for _, t := range r.options.Templates {
-		// resolve and convert relative to absolute path
-		absPath, err := r.resolvePathIfRelative(t)
+		var absPath string
+		var err error
+
+		if strings.Contains(t, "*") {
+			dirs := strings.Split(t, "/")
+			priorDir := strings.Join(dirs[:len(dirs)-1], "/")
+			absPath, err = r.resolvePathIfRelative(priorDir)
+			absPath += "/" + dirs[len(dirs)-1]
+		} else {
+			// resolve and convert relative to absolute path
+			absPath, err = r.resolvePathIfRelative(t)
+		}
+
 		if err != nil {
 			gologger.Errorf("Could not find template file '%s': %s\n", t, err)
 			continue
 		}
 
-		// determine file/directory
-		isFile, err := isFilePath(absPath)
-		if err != nil {
-			gologger.Errorf("Could not stat '%s': %s\n", absPath, err)
-			continue
-		}
-
-		// test for uniqueness
-		if !isNewPath(absPath, processed) {
-			continue
-		}
-
-		// mark this absolute path as processed
-		// - if it's a file, we'll never process it again
-		// - if it's a dir, we'll never walk it again
-		processed[absPath] = true
-
-		if isFile {
-			allTemplates = append(allTemplates, absPath)
-		} else {
+		// Template input includes a wildcard
+		if strings.Contains(absPath, "*") {
 			matches := []string{}
-
-			// Recursively walk down the Templates directory and run all the template file checks
-			err = godirwalk.Walk(absPath, &godirwalk.Options{
-				Callback: func(path string, d *godirwalk.Dirent) error {
-					if !d.IsDir() && strings.HasSuffix(path, ".yaml") {
-						if isNewPath(path, processed) {
-							matches = append(matches, path)
-							processed[path] = true
-						}
-					}
-					return nil
-				},
-				ErrorCallback: func(path string, err error) godirwalk.ErrorAction {
-					return godirwalk.SkipNode
-				},
-				Unsorted: true,
-			})
-
-			// directory couldn't be walked
+			matches, err = filepath.Glob(absPath)
 			if err != nil {
-				gologger.Labelf("Could not find templates in directory '%s': %s\n", absPath, err)
+				gologger.Labelf("Wildcard found, but unable to glob '%s': %s\n", absPath, err)
 				continue
 			}
 
+			for _, i := range matches {
+				processed[i] = true
+			}
+
 			// couldn't find templates in directory
 			if len(matches) == 0 {
-				gologger.Labelf("Error, no templates were found in '%s'.\n", absPath)
+				gologger.Labelf("Error, no templates were found with '%s'.\n", absPath)
 				continue
+			} else {
+				gologger.Labelf("Identified %d templates\n", len(matches))
 			}
 
 			allTemplates = append(allTemplates, matches...)
+		} else {
+			// determine file/directory
+			isFile, err := isFilePath(absPath)
+			if err != nil {
+				gologger.Errorf("Could not stat '%s': %s\n", absPath, err)
+				continue
+			}
+			// test for uniqueness
+			if !isNewPath(absPath, processed) {
+				continue
+			}
+			// mark this absolute path as processed
+			// - if it's a file, we'll never process it again
+			// - if it's a dir, we'll never walk it again
+			processed[absPath] = true
+
+			if isFile {
+				allTemplates = append(allTemplates, absPath)
+			} else {
+				matches := []string{}
+
+				// Recursively walk down the Templates directory and run all the template file checks
+				err = godirwalk.Walk(absPath, &godirwalk.Options{
+					Callback: func(path string, d *godirwalk.Dirent) error {
+						if !d.IsDir() && strings.HasSuffix(path, ".yaml") {
+							if isNewPath(path, processed) {
+								matches = append(matches, path)
+								processed[path] = true
+							}
+						}
+						return nil
+					},
+					ErrorCallback: func(path string, err error) godirwalk.ErrorAction {
+						return godirwalk.SkipNode
+					},
+					Unsorted: true,
+				})
+
+				// directory couldn't be walked
+				if err != nil {
+					gologger.Labelf("Could not find templates in directory '%s': %s\n", absPath, err)
+					continue
+				}
+
+				// couldn't find templates in directory
+				if len(matches) == 0 {
+					gologger.Labelf("Error, no templates were found in '%s'.\n", absPath)
+					continue
+				}
+
+				allTemplates = append(allTemplates, matches...)
+			}
 		}
 	}