refact: refactored to use islazy and updated deps

Author: evilsocket

Gopkg.lock

@@ -77,10 +77,6 @@
   name = "github.com/malfunkt/iprange"
   version = "0.9.0"
 
-[[constraint]]
-  name = "github.com/mattn/go-isatty"
-  version = "0.0.3"
-
 [[constraint]]
   branch = "master"
   name = "github.com/mdlayher/dhcp6"

Gopkg.toml

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/bettercap/bettercap/core"
+	"github.com/evilsocket/islazy/str"
 )
 
 const (
@@ -26,8 +26,8 @@ var (
 )
 
 func init() {
-	for _, path := range core.SepSplit(core.Trim(os.Getenv(EnvVarName)), ":") {
-		if path = core.Trim(path); len(path) > 0 {
+	for _, path := range str.SplitBy(str.Trim(os.Getenv(EnvVarName)), ":") {
+		if path = str.Trim(path); len(path) > 0 {
 			LoadPaths = append(LoadPaths, path)
 		}
 	}

caplets/env.go

@@ -9,7 +9,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/bettercap/bettercap/core"
+	"github.com/evilsocket/islazy/fs"
+	"github.com/evilsocket/islazy/str"
 )
 
 var (
@@ -62,7 +63,7 @@ func Load(name string) (error, *Caplet) {
 	}
 
 	for _, filename := range names {
-		if core.Exists(filename) {
+		if fs.Exists(filename) {
 			cap := &Caplet{
 				Path: filename,
 				Code: make([]string, 0),
@@ -77,7 +78,7 @@ func Load(name string) (error, *Caplet) {
 			scanner := bufio.NewScanner(input)
 			scanner.Split(bufio.ScanLines)
 			for scanner.Scan() {
-				line := core.Trim(scanner.Text())
+				line := str.Trim(scanner.Text())
 				if line == "" || line[0] == '#' {
 					continue
 				}

caplets/manager.go

@@ -1,29 +1,13 @@
 package core
 
 import (
-	"archive/zip"
 	"fmt"
-	"io"
-	"os"
 	"os/exec"
-	"os/user"
-	"path/filepath"
 	"sort"
-	"strings"
-)
 
-const (
-	defaultTrimSet = "\r\n\t "
+	"github.com/evilsocket/islazy/str"
 )
 
-func Trim(s string) string {
-	return strings.Trim(s, defaultTrimSet)
-}
-
-func TrimRight(s string) string {
-	return strings.TrimRight(s, defaultTrimSet)
-}
-
 func UniqueInts(a []int, sorted bool) []int {
 	tmp := make(map[int]bool)
 	uniq := make([]int, 0)
@@ -43,22 +27,6 @@ func UniqueInts(a []int, sorted bool) []int {
 	return uniq
 }
 
-func SepSplit(sv string, sep string) []string {
-	filtered := make([]string, 0)
-	for _, part := range strings.Split(sv, sep) {
-		part = Trim(part)
-		if part != "" {
-			filtered = append(filtered, part)
-		}
-	}
-	return filtered
-
-}
-
-func CommaSplit(csv string) []string {
-	return SepSplit(csv, ",")
-}
-
 func ExecSilent(executable string, args []string) (string, error) {
 	path, err := exec.LookPath(executable)
 	if err != nil {
@@ -69,7 +37,7 @@ func ExecSilent(executable string, args []string) (string, error) {
 	if err != nil {
 		return "", err
 	} else {
-		return Trim(string(raw)), nil
+		return str.Trim(string(raw)), nil
 	}
 }
 
@@ -80,72 +48,3 @@ func Exec(executable string, args []string) (string, error) {
 	}
 	return out, err
 }
-
-func Exists(path string) bool {
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return false
-	}
-	return true
-}
-
-func ExpandPath(path string) (string, error) {
-	// Check if path is empty
-	if path != "" {
-		if strings.HasPrefix(path, "~") {
-			usr, err := user.Current()
-			if err != nil {
-				return "", err
-			} else {
-				// Replace only the first occurrence of ~
-				path = strings.Replace(path, "~", usr.HomeDir, 1)
-			}
-		}
-		return filepath.Abs(path)
-	}
-	return "", nil
-}
-
-// Unzip will decompress a zip archive, moving all files and folders
-// within the zip file (parameter 1) to an output directory (parameter 2).
-// Credits to https://golangcode.com/unzip-files-in-go/
-func Unzip(src string, dest string) ([]string, error) {
-	var filenames []string
-
-	r, err := zip.OpenReader(src)
-	if err != nil {
-		return filenames, err
-	}
-	defer r.Close()
-
-	for _, f := range r.File {
-		rc, err := f.Open()
-		if err != nil {
-			return filenames, err
-		}
-		defer rc.Close()
-
-		// Store filename/path for returning and using later on
-		fpath := filepath.Join(dest, f.Name)
-
-		// Check for ZipSlip. More Info: https://snyk.io/research/zip-slip-vulnerability#go
-		if !strings.HasPrefix(fpath, filepath.Clean(dest)+string(os.PathSeparator)) {
-			return filenames, fmt.Errorf("%s: illegal file path", fpath)
-		}
-
-		filenames = append(filenames, fpath)
-		if f.FileInfo().IsDir() {
-			os.MkdirAll(fpath, os.ModePerm)
-		} else if err = os.MkdirAll(filepath.Dir(fpath), os.ModePerm); err != nil {
-			return filenames, err
-		} else if outFile, err := os.OpenFile(fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode()); err != nil {
-			return filenames, err
-		} else {
-			defer outFile.Close()
-			if _, err = io.Copy(outFile, rc); err != nil {
-				return filenames, err
-			}
-		}
-	}
-
-	return filenames, nil
-}