dkim: reject tag-lists with duplicate tag names

Closes emersion#69
mimi89999 · Jan 11, 2025 · addeefe · addeefe
1 parent 999f438
commit addeefe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/dkim/header.go b/dkim/header.go
@@ -83,7 +83,12 @@ func parseHeaderParams(s string) (map[string]string, error) {
 			return params, errors.New("dkim: malformed header params")
 		}
 
-		params[strings.TrimSpace(key)] = strings.TrimSpace(value)
+		trimmedKey := strings.TrimSpace(key)
+		_, present := params[trimmedKey]
+		if present {
+			return params, errors.New("dkim: duplicate tag name")
+		}
+		params[trimmedKey] = strings.TrimSpace(value)
 	}
 	return params, nil
 }

diff --git a/dkim/query.go b/dkim/query.go
@@ -100,7 +100,7 @@ func queryDNSTXT(domain, selector string, txtLookup txtLookupFunc) (*queryResult
 func parsePublicKey(s string) (*queryResult, error) {
 	params, err := parseHeaderParams(s)
 	if err != nil {
-		return nil, permFailError("key syntax error: " + err.Error())
+		return nil, permFailError("key record error: " + err.Error())
 	}
 
 	res := new(queryResult)