Merge pull request #51 from moorereason/iss45

Handle multiple auth results
tierpod · Apr 14, 2024 · 96ba341 · 96ba341
2 parents 8caa163 + 9a8b613
commit 96ba341
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 218 deletions.
diff --git a/cmd/dmarc-report-converter/consts.go b/cmd/dmarc-report-converter/consts.go
diff --git a/pkg/dmarc/dmarc.go b/pkg/dmarc/dmarc.go
@@ -200,8 +200,8 @@ type Identifiers struct {
 
 // AuthResults represents feedback>record>auth_results section
 type AuthResults struct {
-	DKIM DKIMAuthResult `xml:"dkim" json:"dkim"`
-	SPF  SPFAuthResult  `xml:"spf" json:"spf"`
+	DKIM []DKIMAuthResult `xml:"dkim" json:"dkim"`
+	SPF  []SPFAuthResult  `xml:"spf" json:"spf"`
 }
 
 // DKIMAuthResult represnets feedback>record>auth_results>dkim sections

diff --git a/pkg/dmarc/dmarc_test.go b/pkg/dmarc/dmarc_test.go
@@ -43,15 +43,24 @@ var xmlRecord1 = Record{
 		EnvelopeFrom: "",
 	},
 	AuthResults: AuthResults{
-		DKIM: DKIMAuthResult{
-			Domain:   "test.net",
-			Result:   "pass",
-			Selector: "selector",
+		DKIM: []DKIMAuthResult{
+			{
+				Domain:   "test1.net",
+				Result:   "fail",
+				Selector: "selector1",
+			},
+			{
+				Domain:   "test2.net",
+				Result:   "pass",
+				Selector: "selector2",
+			},
 		},
-		SPF: SPFAuthResult{
-			Domain: "test.net",
-			Result: "pass",
-			Scope:  "mfrom",
+		SPF: []SPFAuthResult{
+			{
+				Domain: "test.net",
+				Result: "pass",
+				Scope:  "mfrom",
+			},
 		},
 	},
 }
@@ -71,15 +80,19 @@ var xmlRecord2 = Record{
 		EnvelopeFrom: "",
 	},
 	AuthResults: AuthResults{
-		DKIM: DKIMAuthResult{
-			Domain:   "test2.net",
-			Result:   "fail",
-			Selector: "selector",
+		DKIM: []DKIMAuthResult{
+			{
+				Domain:   "test2.net",
+				Result:   "fail",
+				Selector: "selector",
+			},
 		},
-		SPF: SPFAuthResult{
-			Domain: "test2.net",
-			Result: "softfail",
-			Scope:  "mfrom",
+		SPF: []SPFAuthResult{
+			{
+				Domain: "test2.net",
+				Result: "softfail",
+				Scope:  "mfrom",
+			},
 		},
 	},
 }
@@ -225,15 +238,13 @@ var xmlEmptyReport = Report{
 				EnvelopeFrom: "",
 			},
 			AuthResults: AuthResults{
-				DKIM: DKIMAuthResult{
-					Domain:   "",
-					Result:   "",
-					Selector: "",
-				},
-				SPF: SPFAuthResult{
-					Domain: "",
-					Result: "",
-					Scope:  "",
+				DKIM: nil,
+				SPF: []SPFAuthResult{
+					{
+						Domain: "",
+						Result: "",
+						Scope:  "",
+					},
 				},
 			},
 		},
@@ -259,6 +270,6 @@ func TestReadParse_Empty(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(out, xmlEmptyReport) {
-		t.Errorf("ReadParse(%v): parsed structs are invalid: %+v", testFile, out)
+		t.Errorf("ReadParse(%v): parsed structs are invalid:\nGOT:\n%#v\nWANT:\n%#v", testFile, out, xmlEmptyReport)
 	}
 }
diff --git a/pkg/dmarc/merge_test.go b/pkg/dmarc/merge_test.go
@@ -46,15 +46,19 @@ func TestReport_MergeRecord(t *testing.T) {
 			EnvelopeFrom: "",
 		},
 		AuthResults: AuthResults{
-			DKIM: DKIMAuthResult{
-				Domain:   "test3.net",
-				Result:   "fail",
-				Selector: "selector",
+			DKIM: []DKIMAuthResult{
+				{
+					Domain:   "test3.net",
+					Result:   "fail",
+					Selector: "selector",
+				},
 			},
-			SPF: SPFAuthResult{
-				Domain: "test3.net",
-				Result: "softfail",
-				Scope:  "mfrom",
+			SPF: []SPFAuthResult{
+				{
+					Domain: "test3.net",
+					Result: "softfail",
+					Scope:  "mfrom",
+				},
 			},
 		},
 	}

diff --git a/pkg/dmarc/testdata/test.xml b/pkg/dmarc/testdata/test.xml
@@ -32,9 +32,14 @@
     </identifiers>
     <auth_results>
       <dkim>
-        <domain>test.net</domain>
+        <domain>test1.net</domain>
+        <result>fail</result>
+        <selector>selector1</selector>
+      </dkim>
+      <dkim>
+        <domain>test2.net</domain>
         <result>pass</result>
-        <selector>selector</selector>
+        <selector>selector2</selector>
       </dkim>
       <spf>
         <domain>test.net</domain>

diff --git a/pkg/dmarc/testdata/test.xml.gz b/pkg/dmarc/testdata/test.xml.gz
diff --git a/pkg/dmarc/testdata/test.xml.gz.gz b/pkg/dmarc/testdata/test.xml.gz.gz
diff --git a/pkg/dmarc/testdata/test.xml.zip b/pkg/dmarc/testdata/test.xml.zip
diff --git a/pkg/dmarc/testdata/test2.xml b/pkg/dmarc/testdata/test2.xml
@@ -32,9 +32,14 @@
     </identifiers>
     <auth_results>
       <dkim>
-        <domain>test.net</domain>
+        <domain>test1.net</domain>
+        <result>fail</result>
+        <selector>selector1</selector>
+      </dkim>
+      <dkim>
+        <domain>test2.net</domain>
         <result>pass</result>
-        <selector>selector</selector>
+        <selector>selector2</selector>
       </dkim>
       <spf>
         <domain>test.net</domain>