README.md

@@ -1,38 +1,9 @@
 # GoPass
-
-An easy to use command-line password generator that creates secure passwords
+An easy to use command-line password generator that creates secure passwords (Version 1.1 adds proper cryptographic seeding of math/rand)
 
 # Usage:
-
-`./gopass [number of characters]`<br>
-or <br>
-`./gopass [number of characters] -r=[excluded characters] [-s to remove all symbols]`
-
+<code>./gopass [number of characters]</code><br>
 <hr>
-
-eg: `./gopass 32` <br>
-output: `E$bGOiiPASS*,ISl{!MJ&<\[COOL0eVw` <br>
-eg: (with excluded characters): `./gopass 32 -r=$,!` <br>
-output: `EYbGOiiPASS*2ISl{?MJ&<\[COOL0eVw` <- note the excluded characters are not present in the output <br>
-eg: `./gopass 32 -s` <br>
-output: `LEYbGOiiPASS2ISlMJCOOL0eRt3KPOVw` <- note the symbols are not present in the output <br>
-eg: `./gopass 32 -r=$,! -s` the -r and -s flags can be combined <br>
-
-# How to install/use for Windows:
-
-1. Download Windows binary, it may be helpful to simply rename it to "gopass.exe" (make sure to add .exe, this won't
-   need to
-   be typed to execute the file from the CLI, but it is required for Windows to recognize the binary) to keep
-   commands shorter.
-2. Move the file to your `C:\Users\[Username]` directory
-3. Opening the console *without* Administrator privileges will put you in the directory mentioned above by default
-4. Now type `gopass [number of characters]` (Ex. `gopass 64`) to generate a new password!
-
-# How to install/use for Linux:
-
-1. Download Linux binary, it may be helpful to simply rename it to "gopass" to keep commands shorter.
-2. Move the file to your home directory.
-3. `chmod +x gopass` if necessary
-3. Opening your terminal should put you in your home directory by default, if not, just type `cd` to get sent back to
-   home.
-4. Now type `./gopass [number of characters]` (Ex. `./gopass 64`) to generate a new password!
+eg:
+<code>./gopass 32</code><br>
+output: <code>E$bGOiiPASS*,ISl{!MJ&<\[COOL0eVw</code>

go.mod

@@ -1,3 +1,3 @@
 module GoPass
 
-go 1.20
+go 1.19

main.go

@@ -1,131 +1,45 @@
 // GoPass
 // Author: Maximilian Patterson
+// Version: 1.1
 package main
 
 import (
-	"crypto/rand"
+	cryptorand "crypto/rand"
+	"encoding/binary"
 	"fmt"
-	"math/big"
+	mathrand "math/rand"
 	"os"
-	"runtime"
 	"strconv"
-	"strings"
 )
 
-var allowedCharacters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890`~!@#$%^&*()_+[]\\{}|;':,./<>?")
+var runes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890`~!@#$%^&*()_+[]\\{}|;':,./<>?")
 
-const (
-	Version   = "1.3.1"
-	symbols   = "`~!@#$%^&*()_+[]\\{}|;':,./<>?"
-	chunkSize = 16 // The size of each chunk of the password to be generated by the worker goroutines
-)
+func main() {
+	// Take OS arg (only accepts one arg)
+	arg := os.Args[1]
 
-func matchArguments(args []string) string {
-	// If there are no arguments
-	if len(args) == 0 {
-		return "No password length specified! (ex: gopass 16)"
+	// Convert String arg to int
+	size, err := strconv.Atoi(arg)
+	if err != nil {
+		panic(err)
 	}
 
-	// First argument is special, must be an integer, -v, or -h
-	var size = 0 // Password length
-	switch args[0] {
-	case "-v":
-		return "GoPass version " + Version
-	case "-h":
-		return "GoPass - A simple password generator written in Go\n" +
-			"Usage: gopass [length] [disallowed characters] [optional remove symbols -s]\n" +
-			"     Example: gopass 16\n" +
-			"     Example: gopass 16 -r=abc123!@#\n" +
-			"     Example: gopass 16 -s\n" +
-			"\nFor help (this output): gopass -h\n" +
-			"For version: gopass -v\n"
-	default:
-		err := error(nil)
-		size, err = strconv.Atoi(args[0])
-		if err != nil {
-			return "Invalid first argument (\"" + args[0] + "\") supplied! (Type gopass -h for help)"
-		}
-	}
-
-	for i := 1; i < len(args); i++ {
-		v := args[i]
-		switch {
-		case v == "-s":
-			removeDisallowed([]rune(symbols))
-		case strings.HasPrefix(v, "-r="):
-			// Remove all characters after the = until next whitespace
-			removeDisallowed([]rune(v[2:]))
-		default:
-			return "Invalid argument (\"" + v + "\") supplied! (Type gopass -h for help)"
-		}
-	}
-
-	if size <= 0 {
-		return "No/invalid password length specified! (ex: gopass 16)"
-	} else {
-		return generatePassword(size)
-	}
-}
-
-// Remove all disallowed characters from the allowedCharacters slice
-func removeDisallowed(disallowed []rune) {
-	disallowedMap := make(map[rune]bool, len(disallowed))
-	for _, r := range disallowed {
-		disallowedMap[r] = true
-	}
-
-	i := 0
-	for _, v := range allowedCharacters {
-		if !disallowedMap[v] {
-			allowedCharacters[i] = v
-			i++
-		}
-	}
-	allowedCharacters = allowedCharacters[:i]
-}
-
-func generatePassword(size int) string {
 	// Make empty array of runes with size of size
 	pass := make([]rune, size)
 
-	// Create a channel to receive chunks of the password
-	passChan := make(chan []rune)
+	// Seed rand with time
+	var b [8]byte
+	_, err = cryptorand.Read(b[:])
+	if err != nil {
+		panic("Error securely seeding rand!")
+	}
+	mathrand.Seed(int64(binary.LittleEndian.Uint64(b[:])))
 
-	// Determine the number of worker goroutines to use
-	numWorkers := runtime.NumCPU()
-
-	// Launch the worker goroutines
-	for i := 0; i < numWorkers; i++ {
-		go func() {
-			allowedLen := len(allowedCharacters)
-			for {
-				// Generate a chunk of the password
-				chunk := make([]rune, chunkSize)
-				for i := range chunk {
-					index, err := rand.Int(rand.Reader, big.NewInt(int64(allowedLen)))
-					if err != nil {
-						println("Error securely generating random character chunk!")
-						return
-					}
-					chunk[i] = allowedCharacters[index.Int64()]
-				}
-
-				// Send the chunk of the password to the main goroutine
-				passChan <- chunk
-			}
-		}()
+	// Assign every slot of pass to a random rune (generate rand int of length runes to select)
+	for i := range pass {
+		pass[i] = runes[mathrand.Intn(len(runes))]
 	}
 
-	// Collect the chunks of the password from the channel
-	for i := 0; i < size; i += chunkSize {
-		chunk := <-passChan
-		copy(pass[i:], chunk)
-	}
-
-	return string(pass)
-}
-
-func main() {
-	// Process arguments
-	fmt.Println(matchArguments(os.Args[1:]))
+	// Print the pass :D
+	fmt.Println(string(pass))
 }

makefile

@@ -1,87 +0,0 @@
-# The current version number of the program
-VERSION := 1.3.1
-
-# List of OS and architecture combinations to build
-BUILD_OS_ARCH := \
-	darwin/amd64 \
-	freebsd/386 \
-	freebsd/amd64 \
-	freebsd/arm \
-	linux/386 \
-	linux/amd64 \
-	linux/arm \
-	plan9/386 \
-	plan9/amd64 \
-	plan9/arm \
-	windows/386 \
-	windows/amd64 \
-	windows/arm
-
-# Build all targets
-all: $(BUILD_OS_ARCH)
-
-# Build targets in the form of `OS/ARCH`
-darwin/amd64:
-	GOOS=darwin \
-	GOARCH=amd64 \
-	go build -ldflags="-s -w" -o "gopass-darwin-amd64-$(VERSION)" main.go
-
-freebsd/386:
-	GOOS=freebsd \
-	GOARCH=386 \
-	go build -ldflags="-s -w" -o "gopass-freebsd-386-$(VERSION)" main.go
-
-freebsd/amd64:
-	GOOS=freebsd \
-	GOARCH=amd64 \
-	go build -ldflags="-s -w" -o "gopass-freebsd-amd64-$(VERSION)" main.go
-
-freebsd/arm:
-	GOOS=freebsd \
-	GOARCH=arm \
-	go build -ldflags="-s -w" -o "gopass-freebsd-arm-$(VERSION)" main.go
-
-linux/386:
-	GOOS=linux \
-	GOARCH=386 \
-	go build -ldflags="-s -w" -o "gopass-linux-386-$(VERSION)" main.go
-
-linux/amd64:
-	GOOS=linux \
-	GOARCH=amd64 \
-	go build -ldflags="-s -w" -o "gopass-linux-amd64-$(VERSION)" main.go
-
-linux/arm:
-	GOOS=linux \
-	GOARCH=arm \
-	go build -ldflags="-s -w" -o "gopass-linux-arm-$(VERSION)" main.go
-
-plan9/386:
-	GOOS=plan9 \
-	GOARCH=386 \
-	go build -ldflags="-s -w" -o "gopass-plan9-386-$(VERSION)" main.go
-
-plan9/amd64:
-	GOOS=plan9 \
-	GOARCH=amd64 \
-	go build -ldflags="-s -w" -o "gopass-plan9-amd64-$(VERSION)" main.go
-
-plan9/arm:
-	GOOS=plan9 \
-	GOARCH=arm \
-	go build -ldflags="-s -w" -o "gopass-plan9-arm-$(VERSION)" main.go
-
-windows/386:
-	GOOS=windows \
-	GOARCH=386 \
-	go build -ldflags="-s -w" -o "gopass-windows-386-$(VERSION)" main.go
-
-windows/amd64:
-	GOOS=windows \
-	GOARCH=amd64 \
-	go build -ldflags="-s -w" -o "gopass-windows-amd64-$(VERSION)" main.go
-
-windows/arm:
-	GOOS=windows \
-	GOARCH=arm \
-	go build -ldflags="-s -w" -o "gopass-windows-arm-$(VERSION)" main.go