Adding force flag.

Author: BernardIgiri

README.md

@@ -33,6 +33,8 @@ CfgCrypt or config crypt is a cli tool to encrypt values in a text configuration
     	Post string denoting end of value to be encrypted (default "}}#")
   -prefix string
     	Prefix string denoting start of value to be encrypted (default "#{{")
+  -force bool
+  	Overwrites key file if it exists
 ```
 
 ## Example

main.go

@@ -19,6 +19,7 @@ func main() {
 	encodedKey := cli.String("key", "", "Base64 encoded encryption key, if not specified one will be generated")
 	prefix := cli.String("prefix", "#{{", "Prefix string denoting start of value to be encrypted")
 	postfix := cli.String("postfix", "}}#", "Post string denoting end of value to be encrypted")
+	force := cli.Bool("force", false, "Overwrite key file if found")
 	if len(os.Args) < 2 {
 		os.Stderr.WriteString("Not enough arguments\n")
 		explainUsage(cli)
@@ -33,7 +34,7 @@ func main() {
 		explainUsage(cli)
 		os.Exit(1)
 	}
-	err := textValueEncryptor.EncryptTextFile(textfile, *prefix, *postfix, *encodedKey)
+	err := textValueEncryptor.EncryptTextFile(textfile, *prefix, *postfix, *encodedKey, *force)
 	if err != nil {
 		msg := fmt.Sprintf("Error encrypting file \"%s\":\n%s\n", textfile, err.Error())
 		os.Stderr.WriteString(msg)

textValueEncryptor/textValueEncryptor.go

@@ -19,9 +19,9 @@ const DEFAULT_KEY_SIZE = 16
 
 const MAX_FILE_SIZE = 1E7
 
-func generateKey(textFilePath string) (key []byte, err error) {
+func generateKey(textFilePath string, force bool) (key []byte, err error) {
 	keyPath := textFilePath + KEY_FILE_EXTENSION
-	if _, statErr := os.Stat(keyPath); !os.IsNotExist(statErr) {
+	if _, statErr := os.Stat(keyPath); !os.IsNotExist(statErr) && !force {
 		msg := fmt.Sprintf("Key file \"%s\" already exists", keyPath)
 		err = errors.New(msg)
 		return
@@ -38,10 +38,10 @@ func isPowerOf2(n int) bool {
 	return (n&(n-1)) == 0 && n > 0
 }
 
-func EncryptTextFile(textFilePath, prefix, postfix, encodedKey string) (err error) {
+func EncryptTextFile(textFilePath, prefix, postfix, encodedKey string, force bool) (err error) {
 	var key []byte
 	if encodedKey == "" {
-		key, err = generateKey(textFilePath)
+		key, err = generateKey(textFilePath, force)
 	} else {
 		key, err = base64.StdEncoding.DecodeString(encodedKey)
 	}