Address reopened issue trusteddomainproject#158: Allow for quotes whe…

…n parsing Received-SPF.

opendmarc/opendmarc.c

@@ -442,6 +442,7 @@ dmarcf_parse_received_spf(char *str, char *envfrom)
 {
 	_Bool in_result = TRUE;
 	_Bool escaped = FALSE;
+	_Bool quoting = FALSE;
 	int parens = 0;
 	char *p;
 	char *r;
@@ -466,15 +467,7 @@ dmarcf_parse_received_spf(char *str, char *envfrom)
 
 	for (p = str; *p != '\0'; p++)
 	{
-		if (*p == '(')
-		{
-			parens++;
-		}
-		else if (*p == ')' && parens > 0)
-		{
-			parens--;
-		}
-		else if (escaped)
+		if (escaped)
 		{
 			if (parens == 0 && r < end)
 				*r++ = *p;
@@ -484,11 +477,30 @@ dmarcf_parse_received_spf(char *str, char *envfrom)
 		{
 			escaped = TRUE;
 		}
+		else if (*p == '(')
+		{
+			parens++;
+		}
+		else if (*p == ')' && parens > 0)
+		{
+			parens--;
+		}
 		else if (parens == 0)
 		{
+			if (*p == '"')
+			{
+				/* entering/leaving a quoted substring */
+				quoting = !quoting;
+				continue;
+			}
+
 			/* a possibly meaningful character */
 			if (isascii(*p) && isspace(*p))
 			{
+				/* a space while quoting; just continue */
+				if (quoting)
+					continue;
+
 				if (in_result)
 				{
 					in_result = FALSE;

opendmarc/tests/t-verify-received-spf-good.lua

@@ -46,7 +46,7 @@ end
 
 -- send headers
 -- mt.rcptto() is called implicitly
-if mt.header(conn, "Received-SPF", "pass identity=mailfrom; [email protected]") ~= nil then
+if mt.header(conn, "Received-SPF", "pass identity=mailfrom; envelope-from=\"[email protected]\"") ~= nil then
 	error("mt.header(Received-SPF) failed")
 end
 if mt.getreply(conn) ~= SMFIR_CONTINUE then