Skip to content

BUG: SPF parsing no longer rejects the bare "ptr" mechanism #4640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuvamk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BUG: SPF parsing no longer rejects the bare "ptr" mechanism #4640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/spflib/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func Parse(text string, dnsres Resolver) (*SPFRecord, error) {
return nil, fmt.Errorf("in included SPF: %w", err)
}
}
} else if strings.HasPrefix(part, "exists:") || strings.HasPrefix(part, "ptr:") {
} else if strings.HasPrefix(part, "exists:") || part == "ptr" || strings.HasPrefix(part, "ptr:") {
p.IsLookup = true
} else {
return nil, fmt.Errorf("unsupported SPF part %s", part)
Expand Down
29 changes: 29 additions & 0 deletions pkg/spflib/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,35 @@ func TestParseQualifiedMechanisms(t *testing.T) {
}
}

func TestParsePtrMechanism(t *testing.T) {
tests := []struct {
input string
wantErr bool
lookups int
}{
{"v=spf1 ptr -all", false, 1},
{"v=spf1 a mx ptr -all", false, 3},
{"v=spf1 mx ptr ip4:107.161.151.0/24 ~all", false, 2},
{"v=spf1 +ptr -all", false, 1},
{"v=spf1 ~ptr -all", false, 1},
{"v=spf1 ?ptr -all", false, 1},
{"v=spf1 ptr:example.com -all", false, 1},
{"v=spf1 ptrfoo -all", true, 0},
{"v=spf1 ptrfoo:example.com -all", true, 0},
}
for _, tt := range tests {
t.Run(tt.input, func(t *testing.T) {
rec, err := Parse(tt.input, nil)
if (err != nil) != tt.wantErr {
t.Fatalf("Parse(%q) error = %v, wantErr %v", tt.input, err, tt.wantErr)
}
if err == nil && rec.Lookups() != tt.lookups {
t.Errorf("Parse(%q) lookups = %d, want %d", tt.input, rec.Lookups(), tt.lookups)
}
})
}
}

func TestParseRedirectLast(t *testing.T) {
dnsres, err := NewCache("testdata-dns1.json")
if err != nil {
Expand Down