Merge pull request #101 from projectdiscovery/check_comma_in_quotes

FileStringSliceOption read the cli input as rawstring if not file

slice_common.go

@@ -46,9 +46,14 @@ func ToString(slice []string) string {
 }
 
 type Options struct {
+	// IsFromFile determines if the values are from file
 	IsFromFile func(string) bool
-	IsEmpty    func(string) bool
-	Normalize  func(string) string
+	// IsEmpty determines if the values are empty
+	IsEmpty func(string) bool
+	// Normalize the value (eg. removing trailing spaces)
+	Normalize func(string) string
+	// RawString determines if the value should be considered as is
+	RawString bool
 }
 
 // ToStringSlice converts a value to string slice based on options
@@ -74,6 +79,8 @@ func ToStringSlice(value string, options Options) ([]string, error) {
 		for line := range linesChan {
 			addPartToResult(line)
 		}
+	} else if options.RawString {
+		addPartToResult(value)
 	} else {
 		index := 0
 		for index < len(value) {
@@ -101,7 +108,6 @@ func ToStringSlice(value string, options Options) ([]string, error) {
 			}
 		}
 	}
-
 	return result, nil
 }
 

string_slice_options.go

@@ -58,6 +58,7 @@ var FileStringSliceOptions = Options{
 	IsEmpty:    isEmpty,
 	Normalize:  normalizeTrailingParts,
 	IsFromFile: isFromFile,
+	RawString:  true,
 }
 
 // NormalizedStringSliceOptions represents a list of items

string_slice_test.go

@@ -1,7 +1,6 @@
 package goflags
 
 import (
-	"fmt"
 	"os"
 	"testing"
 
@@ -46,7 +45,6 @@ func TestNormalizedStringSlicePositive(t *testing.T) {
 
 	for value, expected := range slices {
 		result, err := ToStringSlice(value, NormalizedStringSliceOptions)
-		fmt.Println(result)
 		assert.Nil(t, err)
 		assert.Equal(t, result, expected)
 	}
@@ -96,6 +94,11 @@ func TestFileStringSliceOptions(t *testing.T) {
 	result, err := ToStringSlice(filename, FileStringSliceOptions)
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"value1,value2", "value3"}, result, "could not get correct path")
+
+	// command line input value
+	result, err = ToStringSlice("string:\"contains, comma and quotes.\"", FileStringSliceOptions)
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"string:\"contains, comma and quotes.\""}, result, "could not get correct path")
 }
 
 func TestFileNormalizedOriginalStringSliceOptions(t *testing.T) {