Skip to content

Commit 67505da

Browse files
committed
authres: add error return value to Result.parse
Will be useful for next commit.
1 parent 6a5ed44 commit 67505da

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

authres/parse.go

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const (
2424

2525
// Result is an authentication result.
2626
type Result interface {
27-
parse(value ResultValue, params map[string]string)
27+
parse(value ResultValue, params map[string]string) error
2828
format() (value ResultValue, params map[string]string)
2929
}
3030

@@ -34,10 +34,11 @@ type AuthResult struct {
3434
Auth string
3535
}
3636

37-
func (r *AuthResult) parse(value ResultValue, params map[string]string) {
37+
func (r *AuthResult) parse(value ResultValue, params map[string]string) error {
3838
r.Value = value
3939
r.Reason = params["reason"]
4040
r.Auth = params["smtp.auth"]
41+
return nil
4142
}
4243

4344
func (r *AuthResult) format() (ResultValue, map[string]string) {
@@ -51,11 +52,12 @@ type DKIMResult struct {
5152
Identifier string
5253
}
5354

54-
func (r *DKIMResult) parse(value ResultValue, params map[string]string) {
55+
func (r *DKIMResult) parse(value ResultValue, params map[string]string) error {
5556
r.Value = value
5657
r.Reason = params["reason"]
5758
r.Domain = params["header.d"]
5859
r.Identifier = params["header.i"]
60+
return nil
5961
}
6062

6163
func (r *DKIMResult) format() (ResultValue, map[string]string) {
@@ -74,12 +76,13 @@ type DomainKeysResult struct {
7476
Sender string
7577
}
7678

77-
func (r *DomainKeysResult) parse(value ResultValue, params map[string]string) {
79+
func (r *DomainKeysResult) parse(value ResultValue, params map[string]string) error {
7880
r.Value = value
7981
r.Reason = params["reason"]
8082
r.Domain = params["header.d"]
8183
r.From = params["header.from"]
8284
r.Sender = params["header.sender"]
85+
return nil
8386
}
8487

8588
func (r *DomainKeysResult) format() (ResultValue, map[string]string) {
@@ -97,10 +100,11 @@ type IPRevResult struct {
97100
IP string
98101
}
99102

100-
func (r *IPRevResult) parse(value ResultValue, params map[string]string) {
103+
func (r *IPRevResult) parse(value ResultValue, params map[string]string) error {
101104
r.Value = value
102105
r.Reason = params["reason"]
103106
r.IP = params["policy.iprev"]
107+
return nil
104108
}
105109

106110
func (r *IPRevResult) format() (ResultValue, map[string]string) {
@@ -117,7 +121,7 @@ type SenderIDResult struct {
117121
HeaderValue string
118122
}
119123

120-
func (r *SenderIDResult) parse(value ResultValue, params map[string]string) {
124+
func (r *SenderIDResult) parse(value ResultValue, params map[string]string) error {
121125
r.Value = value
122126
r.Reason = params["reason"]
123127

@@ -128,6 +132,8 @@ func (r *SenderIDResult) parse(value ResultValue, params map[string]string) {
128132
break
129133
}
130134
}
135+
136+
return nil
131137
}
132138

133139
func (r *SenderIDResult) format() (value ResultValue, params map[string]string) {
@@ -144,11 +150,12 @@ type SPFResult struct {
144150
Helo string
145151
}
146152

147-
func (r *SPFResult) parse(value ResultValue, params map[string]string) {
153+
func (r *SPFResult) parse(value ResultValue, params map[string]string) error {
148154
r.Value = value
149155
r.Reason = params["reason"]
150156
r.From = params["smtp.mailfrom"]
151157
r.Helo = params["smtp.helo"]
158+
return nil
152159
}
153160

154161
func (r *SPFResult) format() (ResultValue, map[string]string) {
@@ -165,10 +172,11 @@ type DMARCResult struct {
165172
From string
166173
}
167174

168-
func (r *DMARCResult) parse(value ResultValue, params map[string]string) {
175+
func (r *DMARCResult) parse(value ResultValue, params map[string]string) error {
169176
r.Value = value
170177
r.Reason = params["reason"]
171178
r.From = params["header.from"]
179+
return nil
172180
}
173181

174182
func (r *DMARCResult) format() (ResultValue, map[string]string) {
@@ -184,9 +192,10 @@ type GenericResult struct {
184192
Params map[string]string
185193
}
186194

187-
func (r *GenericResult) parse(value ResultValue, params map[string]string) {
195+
func (r *GenericResult) parse(value ResultValue, params map[string]string) error {
188196
r.Value = value
189197
r.Params = params
198+
return nil
190199
}
191200

192201
func (r *GenericResult) format() (ResultValue, map[string]string) {
@@ -289,8 +298,8 @@ func parseResult(s string) (Result, error) {
289298
}
290299
}
291300

292-
r.parse(value, params)
293-
return r, nil
301+
err = r.parse(value, params)
302+
return r, err
294303
}
295304

296305
func parseParam(s string) (k string, v string, err error) {

0 commit comments

Comments
 (0)