handle escaping more comprehensively

godotenv.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"regexp"
 	"strings"
 )
 
@@ -218,7 +219,11 @@ func parseLine(line string) (key string, value string, err error) {
 	key = strings.Trim(key, " ")
 
 	// Parse the value
-	value = splitString[1]
+	value = parseValue(splitString[1])
+	return
+}
+
+func parseValue(value string) string {
 
 	// trim
 	value = strings.Trim(value, " ")
@@ -230,15 +235,23 @@ func parseLine(line string) (key string, value string, err error) {
 		if first == last && strings.ContainsAny(first, `"'`) {
 			// pull the quotes off the edges
 			value = strings.Trim(value, `"'`)
-
+			// handle escapes
-			// expand quotes
+			escapeRegex := regexp.MustCompile(`\\.`)
-			value = strings.Replace(value, `\"`, `"`, -1)
+			value = escapeRegex.ReplaceAllStringFunc(value, func(match string) string {
-			// expand newlines
+				c := strings.TrimPrefix(match, `\`)
-			value = strings.Replace(value, `\n`, "\n", -1)
+				switch c {
+				case "n":
+					return "\n"
+				case "r":
+					return "\r"
+				default:
+					return c
+				}
+			})
 		}
 	}
 
-	return
+	return value
 }
 
 func isIgnoredLine(line string) bool {

godotenv_test.go

@@ -238,6 +238,11 @@ func TestParsing(t *testing.T) {
 	parseAndCompare(t, `FOO="ba#r"`, "FOO", "ba#r")
 	parseAndCompare(t, "FOO='ba#r'", "FOO", "ba#r")
 
+	//newlines and backslashes should be escaped
+	parseAndCompare(t, `FOO="bar\n\ b\az"`, "FOO", "bar\n baz")
+	parseAndCompare(t, `FOO="bar\\\n\ b\az"`, "FOO", "bar\\\n baz")
+	parseAndCompare(t, `FOO="bar\\r\ b\az"`, "FOO", "bar\\r baz")
+
 	// it 'throws an error if line format is incorrect' do
 	// expect{env('lol$wut')}.to raise_error(Dotenv::FormatError)
 	badlyFormattedLine := "lol$wut"