Base

Author: 231tr0n

.gitignore

@@ -22,4 +22,5 @@ go.work
 
 # bin folder
 bin
+# coverage folder
 coverage

.golangci.yml

@@ -4,12 +4,12 @@ linters:
     - varnamelen
     - funlen
     - cyclop
+    - gocyclo
     - paralleltest
     - gochecknoglobals
     - wsl
     - goerr113
     - gocognit
-    - wrapcheck
     - dupl
 
 issues:

Dockerfile

@@ -1,14 +1,23 @@
 FROM archlinux:latest
 
-RUN pacman -Syu --noconfirm
-RUN pacman -Syu go --noconfirm
+RUN pacman -Sy go --needed --noconfirm
 
 COPY . /root/vault
 
 WORKDIR /root/vault
 
-RUN go run github.com/go-task/task/v3/cmd/task@latest build
+RUN go build -o /usr/local/bin/vault cmd/vault/*.go
 
-ENTRYPOINT ["./bin/vault"]
+RUN go clean -r -modcache -cache -i -x -testcache -fuzzcache
+
+WORKDIR /root
+
+RUN rm -rf /root/vault
+RUN rm -rf /root/go
+
+RUN pacman -Rnsu go --noconfirm
+RUN pacman -Scc
+
+ENTRYPOINT ["vault"]
 
 CMD ["-help"]

Taskfile.yml

@@ -6,7 +6,7 @@ vars:
   GREETING: Hi!
   EXECUTABLE_NAME: vault
   DOCKER_IMAGE_NAME: vault
-  VAULT_DIR: /home/zeltron/.vault
+  VAULT_DIR: $HOME/.vault
   DOCKER_MOUNT_PATH: /root/.vault
 
 tasks:
@@ -15,6 +15,10 @@ tasks:
       - go fmt ./...
       - gofumpt -e -l -w -extra .
 
+  lint:
+    cmds:
+      - golangci-lint run --sort-results
+
   dockerbuild:
     cmds:
       - docker build -t {{.DOCKER_IMAGE_NAME}} .
@@ -23,34 +27,27 @@ tasks:
     cmds:
       - docker run -v {{.VAULT_DIR}}:{{.DOCKER_MOUNT_PATH}} -it {{.DOCKER_IMAGE_NAME}} {{.CLI_ARGS}}
 
-  lint:
-    cmds:
-      - staticcheck -checks all ./...
-      - golangci-lint run --sort-results
-
   coverprofile:
     cmds:
+      - mkdir -p coverage
       - go test -cover -coverprofile=coverage/cover.out ./...
 
   showcoverage:
     cmds:
       - go tool cover -html coverage/cover.out
 
-  vault-help:
-    cmds:
-      - go run cmd/vault/* -help
-
   docs:
     cmds:
       - go run golang.org/x/pkgsite/cmd/pkgsite@latest
 
   build:
     cmds:
       - go generate ./...
+      - mkdir -p bin
       - rm -rf bin/*
-      - GOOS=linux GOARCH=amd64 go build -o bin/{{.EXECUTABLE_NAME}}-linux cmd/vault/*
-      - GOOS=windows GOARCH=amd64 go build -o bin/{{.EXECUTABLE_NAME}}-windows cmd/vault/*
-      - GOOS=darwin GOARCH=amd64 go build -o bin/{{.EXECUTABLE_NAME}}-darwin cmd/vault/*
+      - GOOS=linux GOARCH=amd64 go build -o bin/{{.EXECUTABLE_NAME}}-linux cmd/vault/*.go
+      - GOOS=windows GOARCH=amd64 go build -o bin/{{.EXECUTABLE_NAME}}-windows cmd/vault/*.go
+      - GOOS=darwin GOARCH=amd64 go build -o bin/{{.EXECUTABLE_NAME}}-darwin cmd/vault/*.go
       - zip -r -j bin/vault.zip bin/*
 
   buildrun:
@@ -60,7 +57,7 @@ tasks:
   run:
     cmds:
       - go generate ./...
-      - go run cmd/vault/* {{.CLI_ARGS}}
+      - go run cmd/vault/*.go {{.CLI_ARGS}}
 
   test:
     cmds:

cmd/vault/README.md

@@ -9,22 +9,6 @@ With proper go installation, run the command `go install -v github.com/231tr0n/v
 
 ## Usage
 Use the flag `-help` for knowing all the options of the vault.
-```
-  -change
-    	Changes the vault password
-  -clear
-    	Clears all the passwords in the vault
-  -delete string
-    	Deletes the password in the vault
-  -generate int
-    	Generates a new random password of length given
-  -get string
-    	Gets the password from the vault
-  -list
-    	Lists all the passwords in the vault
-  -put string
-    	Puts the password in the vault
-```
 **Note:** You have to set the password using the `-change` argument initially since it is not set. Give an empty password when prompted for vault's old password.
 
 ## Backup

cmd/vault/main.go

@@ -16,7 +16,7 @@ func main() {
 		fmt.Println(err)
 		//nolint
 		fmt.Println("-----------------")
-		os.Exit(1)
+		os.Exit(0)
 	}
 
 	err = cli.Parse()
@@ -27,6 +27,6 @@ func main() {
 		fmt.Println(err)
 		//nolint
 		fmt.Println("-----------------")
-		os.Exit(1)
+		os.Exit(0)
 	}
 }

internal/cli/cli.go

@@ -5,6 +5,7 @@ import (
 	_ "bufio"
 	"flag"
 	"fmt"
+
 	// Used by the commented code.
 	_ "os"
 	"syscall"
@@ -18,7 +19,7 @@ import (
 
 // Init initlialises the passwdstore.
 func Init() error {
-	return errorwrap.ErrWrap(passwdstore.Init(config.GetPasswdStoreFilePath()))
+	return errorwrap.Wrap(passwdstore.Init(config.GetPasswdStoreFilePath()))
 }
 
 func readSecureInput(c string) ([]byte, error) {
@@ -35,18 +36,23 @@ func readSecureInput(c string) ([]byte, error) {
 	//nolint
 	s, err := term.ReadPassword(int(syscall.Stdin))
 
-	return s, errorwrap.ErrWrap(err)
+	//nolint
+	fmt.Println()
+
+	return s, errorwrap.Wrap(err)
 }
 
 // Parse parses the command line arguments and runs the respective functions accordingly.
 func Parse() error {
-	change := flag.Bool("change", false, "Changes the vault password")
-	list := flag.Bool("list", false, "Lists all the passwords in the vault")
-	clear := flag.Bool("clear", false, "Clears all the passwords in the vault")
-	get := flag.String("get", "", "Gets the password from the vault")
-	put := flag.String("put", "", "Puts the password in the vault")
-	del := flag.String("delete", "", "Deletes the password in the vault")
-	generate := flag.Int("generate", 0, "Generates a new random password of length given")
+	change := flag.Bool("change", false, "Changes the vault password.")
+	list := flag.Bool("list", false, "Lists all the password names in the vault.")
+	listAll := flag.Bool("list-all", false, "Lists all the passwords with names(dangerous) in the vault.")
+	clear := flag.Bool("clear", false, "Clears all the passwords in the vault.")
+	get := flag.String("get", "", "Gets the password from the vault.")
+	put := flag.String("put", "", "Puts the password in the vault.")
+	del := flag.String("delete", "", "Deletes the password in the vault.")
+	//nolint
+	generate := flag.Int("generate", 0, "Generates a new random password of length given. If this flag is passed along with put flag, it generates a random password and stores that in the vault.")
 
 	flag.Parse()
 
@@ -62,11 +68,11 @@ switch1:
 	case *clear:
 		pwd, err := readSecureInput("Enter vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 		err = passwdstore.Clear(pwd)
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		//nolint
@@ -77,47 +83,70 @@ switch1:
 	case *change:
 		oldPwd, err := readSecureInput("Enter old vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		newPwd, err := readSecureInput("Enter new vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
-		newPwdCheck, err := readSecureInput("Enter new vault password once again: ")
+		newPwdCheck, err := readSecureInput("Re-Enter new vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		if string(newPwd) != string(newPwdCheck) {
 			//nolint
 			fmt.Println("-----------------")
 			//nolint
-			fmt.Println("Passwords don't match")
+			fmt.Println("New vault passwords don't match")
 
 			break switch1
 		}
 
 		err = passwdstore.ChangePasswd(newPwd, oldPwd)
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		//nolint
 		fmt.Println("-----------------")
 		//nolint
 		fmt.Println("Vault password changed")
 
+	case *listAll:
+		pwd, err := readSecureInput("Enter vault password: ")
+		if err != nil {
+			return errorwrap.Wrap(err)
+		}
+
+		list, err := passwdstore.ListEntries(pwd)
+		if err != nil {
+			return errorwrap.Wrap(err)
+		}
+
+		//nolint
+		fmt.Println("-----------------")
+		//nolint
+		fmt.Println("List of passwords")
+		//nolint
+		fmt.Println("-----------------")
+
+		for i, val := range list {
+			//nolint
+			fmt.Println(i, val[0], val[1])
+		}
+
 	case *list:
 		pwd, err := readSecureInput("Enter vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
-		list, err := passwdstore.List(pwd)
+		list, err := passwdstore.ListKeys(pwd)
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		//nolint
@@ -135,12 +164,12 @@ switch1:
 	case *get != "":
 		pwd, err := readSecureInput("Enter vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		value, err := passwdstore.Get(*get, pwd)
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		//nolint
@@ -149,19 +178,32 @@ switch1:
 		fmt.Println("Password:", value)
 
 	case *put != "":
-		value, err := readSecureInput("Enter password for " + *put + ": ")
+		pwd, err := readSecureInput("Enter vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
-		pwd, err := readSecureInput("Enter vault password: ")
-		if err != nil {
-			return errorwrap.ErrWrap(err)
+		var value []byte
+
+		if *generate > 0 {
+			value, err = crypto.Generate(*generate)
+			if err != nil {
+				return errorwrap.Wrap(err)
+			}
+			//nolint
+			fmt.Println("-----------------")
+			//nolint
+			fmt.Println("Generated password:", string(value))
+		} else {
+			value, err = readSecureInput("Enter password for '" + *put + "': ")
+			if err != nil {
+				return errorwrap.Wrap(err)
+			}
 		}
 
 		err = passwdstore.Put(*put, string(value), pwd)
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		//nolint
@@ -172,12 +214,12 @@ switch1:
 	case *del != "":
 		pwd, err := readSecureInput("Enter vault password: ")
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		err = passwdstore.Delete(*del, pwd)
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		//nolint
@@ -188,7 +230,7 @@ switch1:
 	case *generate > 0:
 		pwd, err := crypto.Generate(*generate)
 		if err != nil {
-			return errorwrap.ErrWrap(err)
+			return errorwrap.Wrap(err)
 		}
 
 		//nolint