Merge pull request #169 from caffix/default-output-dir

Changed the default output directory

amass/handlers/graph.go

@@ -21,11 +21,12 @@ import (
 	"github.com/cayleygraph/cayley/graph"
 	_ "github.com/cayleygraph/cayley/graph/kv/bolt" // Used by the cayley package
 	"github.com/cayleygraph/cayley/quad"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 const (
 	// DefaultGraphDBDirectory is the directory name used by default for the graph database.
-	DefaultGraphDBDirectory string = "amass_output"
+	DefaultGraphDBDirectory string = "amass"
 )
 
 // Graph is the object for managing a network infrastructure link graph.
@@ -39,9 +40,9 @@ type Graph struct {
 func NewGraph(path string) *Graph {
 	var err error
 
-	// If a directory was not specified, $PWD/amass_output/ will be used
+	// If a directory was not specified, $HOME/amass/ will be used
 	if path == "" {
-		path, err = os.Getwd()
+		path, err = homedir.Dir()
 		if err != nil {
 			return nil
 		}

cmd/amass.tracker/main.go

@@ -10,6 +10,7 @@ import (
 	"math/rand"
 	"os"
 	"path"
+	"path/filepath"
 	"sort"
 	"strings"
 	"time"
@@ -19,6 +20,7 @@ import (
 	"github.com/OWASP/Amass/amass/handlers"
 	"github.com/OWASP/Amass/amass/utils"
 	"github.com/fatih/color"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 const (
@@ -102,13 +104,17 @@ func main() {
 	}
 
 	rand.Seed(time.Now().UTC().UnixNano())
-	// Check that the default graph database directory exists in the CWD
+
 	if *dir == "" {
-		if finfo, err := os.Stat(handlers.DefaultGraphDBDirectory); os.IsNotExist(err) || !finfo.IsDir() {
-			r.Fprintln(color.Error, "Failed to open the graph database")
+		path, err := homedir.Dir()
+		if err != nil {
+			r.Fprintln(color.Error, "Failed to obtain the user home directory")
 			os.Exit(1)
 		}
-	} else if finfo, err := os.Stat(*dir); os.IsNotExist(err) || !finfo.IsDir() {
+		*dir = filepath.Join(path, handlers.DefaultGraphDBDirectory)
+	}
+	// Check that the default graph database directory exists
+	if finfo, err := os.Stat(*dir); os.IsNotExist(err) || !finfo.IsDir() {
 		r.Fprintln(color.Error, "Failed to open the graph database")
 		os.Exit(1)
 	}

cmd/amass.viz/main.go

@@ -11,12 +11,14 @@ import (
 	"math/rand"
 	"os"
 	"path"
+	"path/filepath"
 	"time"
 
 	"github.com/OWASP/Amass/amass"
 	"github.com/OWASP/Amass/amass/handlers"
 	"github.com/OWASP/Amass/amass/utils/viz"
 	"github.com/fatih/color"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 var (
@@ -73,17 +75,20 @@ func main() {
 			os.Exit(1)
 		}
 		defer os.RemoveAll(*dir)
-	} else {
-		// Check that the default graph database directory exists in the CWD
-		if *dir == "" {
-			if finfo, err := os.Stat(handlers.DefaultGraphDBDirectory); os.IsNotExist(err) || !finfo.IsDir() {
-				r.Fprintln(color.Error, "Failed to open the graph database")
-				os.Exit(1)
-			}
-		} else if finfo, err := os.Stat(*dir); os.IsNotExist(err) || !finfo.IsDir() {
-			r.Fprintln(color.Error, "Failed to open the graph database")
+	}
+
+	if *dir == "" {
+		path, err := homedir.Dir()
+		if err != nil {
+			r.Fprintln(color.Error, "Failed to obtain the user home directory")
 			os.Exit(1)
 		}
+		*dir = filepath.Join(path, handlers.DefaultGraphDBDirectory)
+	}
+	// Check that the default graph database directory exists
+	if finfo, err := os.Stat(*dir); os.IsNotExist(err) || !finfo.IsDir() {
+		r.Fprintln(color.Error, "Failed to open the graph database")
+		os.Exit(1)
 	}
 
 	graph := handlers.NewGraph(*dir)

cmd/amass/main.go

@@ -26,6 +26,7 @@ import (
 	"github.com/OWASP/Amass/amass/handlers"
 	"github.com/OWASP/Amass/amass/utils"
 	"github.com/fatih/color"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 const (
@@ -266,7 +267,12 @@ func main() {
 	// Prepare output file paths
 	*dir = enum.Config.Dir
 	if *dir == "" {
-		*dir = handlers.DefaultGraphDBDirectory
+		path, err := homedir.Dir()
+		if err != nil {
+			r.Fprintln(color.Error, "Failed to obtain the user home directory")
+			os.Exit(1)
+		}
+		*dir = filepath.Join(path, handlers.DefaultGraphDBDirectory)
 	}
 	// If the directory does not yet exist, create it
 	if err = os.MkdirAll(*dir, 0755); err != nil {