Capture list of MTA-STS domains

EFForg · Mar 7, 2019 · 3a6d3d0 · 3a6d3d0
1 parent a8f20d4
commit 3a6d3d0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/checker/totals.go b/checker/totals.go
@@ -17,8 +17,8 @@ type DomainTotals struct {
 	Source        string
 	Attempted     int
 	Connected     int // Connected to at least one mx
-	MTASTSTesting int
-	MTASTSEnforce int
+	MTASTSTesting []string
+	MTASTSEnforce []string
 }
 
 // Add the result of a single domain check to aggregated stats.
@@ -37,9 +37,9 @@ func (t *DomainTotals) HandleDomain(r DomainResult) {
 	if r.MTASTSResult != nil {
 		switch r.MTASTSResult.Mode {
 		case "enforce":
-			t.MTASTSEnforce += 1
+			t.MTASTSEnforce = append(t.MTASTSEnforce, r.Domain)
 		case "testing":
-			t.MTASTSTesting += 1
+			t.MTASTSTesting = append(t.MTASTSTesting, r.Domain)
 		}
 	}
 }

diff --git a/checker/totals_test.go b/checker/totals_test.go
@@ -18,15 +18,15 @@ func TestCheckCSV(t *testing.T) {
 		checkMTASTSOverride:   mockCheckMTASTS,
 	}
 	totals := DomainTotals{}
-	c.CheckCSV(reader, &totals)
+	c.CheckCSV(reader, &totals, 0)
 
 	if totals.Attempted != 6 {
 		t.Errorf("Expected 6 attempted connections, got %d", totals.Attempted)
 	}
 	if totals.Connected != 4 {
 		t.Errorf("Expected 4 successfully connecting domains, got %d", totals.Connected)
 	}
-	if totals.MTASTSTesting != 4 {
-		t.Errorf("Expected 4 domains in MTA-STS testing mode, got %d", totals.MTASTSTesting)
+	if len(totals.MTASTSTesting) != 4 {
+		t.Errorf("Expected 4 domains in MTA-STS testing mode, got %d", len(totals.MTASTSTesting))
 	}
 }
diff --git a/db/sqldb.go b/db/sqldb.go
@@ -354,6 +354,6 @@ func (db *SQLDatabase) PutHostnameScan(hostname string, result checker.HostnameR
 
 func (db *SQLDatabase) PutDomainTotals(totals checker.DomainTotals) error {
 	_, err := db.conn.Exec("INSERT INTO domain_totals(time, source, attempted, connected, mta_sts_testing, mta_sts_enforce) VALUES($1, $2, $3, $4, $5, $6)",
-		totals.Time, totals.Source, totals.Attempted, totals.Connected, totals.MTASTSTesting, totals.MTASTSEnforce)
+		totals.Time, totals.Source, totals.Attempted, totals.Connected, len(totals.MTASTSTesting), len(totals.MTASTSEnforce))
 	return err
 }
diff --git a/db/sqldb_test.go b/db/sqldb_test.go
@@ -434,8 +434,8 @@ func TestPutDomainTotals(t *testing.T) {
 		Source:        "Tom's Domain Emporium",
 		Attempted:     1000000000,
 		Connected:     10000,
-		MTASTSTesting: 1000,
-		MTASTSEnforce: 1000,
+		MTASTSTesting: []string{"a.com", "b.com", "c.com"},
+		MTASTSEnforce: []string{"d.com", "e.com", "f.com"},
 	}
 	err := database.PutDomainTotals(totals)
 	if err != nil {