dmarcator 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6f88c01ff39e839792769a66063bd78cd312f51d5fba6917acf6777d034e0269
4
- data.tar.gz: 9b39f980958757f2a27718d157ad9925424a20da358a7100d3b87f9a3765af5f
3
+ metadata.gz: 7d31aa779b69d26db7ac26ef788eca2f9eca47cf5a9fc92e6522df2854e49f1f
4
+ data.tar.gz: 9100503cce7569587904afa95e680bd9fa0703863873a509475283c7a7f00b0a
5
5
  SHA512:
6
- metadata.gz: 4c5aa75a034fedffc21ad9100de83b82f049dc08416f66cdcf2056ec6f76a8f28415ccfee012ea6432d4cbbbd760279c5a0dbce32d614f0932a0d8e9cd9efa3e
7
- data.tar.gz: c1351578b215094ca74bb710725f2b66ad49f8e1c24ba14862ee32bc11099163f0d0e8cbb0736f5d23a614b6d1b801ea4fa9cd52e0a3f521f13ffffa21959897
6
+ metadata.gz: 3fe6fd5ba876573069c9802643e90c79f88ff07840f60abf00addb94564a7c4bb2ce9e6180bc1bbb0960def6fb7d36686815f9938cf8b43136927b040390cfed
7
+ data.tar.gz: 6238af25582f02123bf5a444522cc42b65947a443dcbcfd5cf251afa1c089a99287011dcc957e07cbc124b9d8511651541dd79ac1d6e47f852c2c827a451ace0
data/ChangeLog.md CHANGED
@@ -1,3 +1,11 @@
1
+ ### 1.1.0 / 2026-10-30
2
+
3
+ * Replace the Parslet grammar with a hand-written parser in `DMARCator::Internal`. Parsing behaviour is unchanged, verified differentially against the previous parser over 128 real-world and 47 edge-case records in both lenient and strict modes; record parsing is roughly 30x faster (0.84 ms to 0.03 ms per record).
4
+ * Remove the `parslet` runtime dependency. `nokogiri` is now the only runtime dependency.
5
+ * Messages for structurally malformed records now come from the parser itself (for example `invalid DMARC record: "..."`) and are truncated to 300 characters.
6
+ * `DMARCator::Internal::Parser::Transform` no longer exists. It was internal, so this is not covered by the compatibility promise.
7
+ * Reject records whose string encoding is invalid or not ASCII-compatible with `InvalidRecord`. Previously `Record.parse` could raise `ArgumentError` (invalid UTF-8) or `Encoding::CompatibilityError` (for example UTF-16), which escaped `rescue DMARCator::Error`. Binary strings from a DNS resolver, and other ASCII-compatible encodings such as ISO-8859-1, are unaffected.
8
+
1
9
  ### 1.0.0 / 2026-10-30
2
10
 
3
11
  The public API is now frozen.
data/README.md CHANGED
@@ -348,7 +348,6 @@ for the reporting policy and scope.
348
348
  ## Requirements
349
349
 
350
350
  * [Ruby] >= 3.3.13
351
- * [parslet] >= 1.0.0, < 3.0.0
352
351
  * [nokogiri] >= 1.10
353
352
 
354
353
  ## Testing
@@ -417,6 +416,5 @@ created by D Salko and released under the MIT License.
417
416
  [dmarc-parser-gem]: https://rubygems.org/gems/dmarc_parser
418
417
  [Trail of Bits]: https://www.trailofbits.com
419
418
  [Ruby]: https://www.ruby-lang.org
420
- [parslet]: https://kschiess.github.io/parslet/
421
419
  [nokogiri]: https://nokogiri.org
422
420
  [LICENSE.txt]: LICENSE.txt
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'strscan'
4
+ require 'uri'
5
+
3
6
  require_relative '../exceptions'
4
7
  require_relative '../uri'
5
8
 
6
- require 'parslet'
7
- require 'uri'
8
-
9
9
  module DMARCator
10
10
  #
11
11
  # Implementation details of the library. Nothing here is covered by the
@@ -15,342 +15,300 @@ module DMARCator
15
15
  #
16
16
  module Internal
17
17
  #
18
- # DMARC parser.
18
+ # Parses DMARC records (RFC 7489 section 6.4).
19
19
  #
20
- # An implementation detail: use {Record.parse} rather than this class.
20
+ # A hand-written parser rather than a parser-combinator grammar: the
21
+ # language is small, and this keeps record parsing allocation-light and
22
+ # free of a runtime dependency.
21
23
  #
22
- # @api private
24
+ # @see https://www.rfc-editor.org/rfc/rfc7489#section-6.4
23
25
  #
24
- # @see https://tools.ietf.org/html/rfc7489#section-6.4
26
+ # @api private
25
27
  #
26
- class Parser < Parslet::Parser
27
-
28
+ class Parser
28
29
  # Maximum accepted DMARC record size in bytes. Real records are far
29
30
  # smaller; the cap bounds parsing work on hostile input.
30
- #
31
31
  MAX_RECORD_BYTES = 4096
32
32
 
33
- root :dmarc_record
33
+ # Maximum length of error messages echoed from untrusted input.
34
+ MAX_ERROR_MESSAGE_LENGTH = 300
34
35
 
35
- rule(:dmarc_record) do
36
- dmarc_version.repeat(1,1) >>
37
- (dmarc_sep >> dmarc_tag).repeat >>
38
- dmarc_sep.maybe >>
39
- wsp?.maybe
40
- end
36
+ # Tags whose value is one keyword from a fixed set.
37
+ KEYWORD_TAGS = {
38
+ 'p' => %w[none quarantine reject],
39
+ 'sp' => %w[none quarantine reject],
40
+ 'adkim' => %w[r s],
41
+ 'aspf' => %w[r s],
42
+ 'rf' => %w[afrf iodef]
43
+ }.freeze
41
44
 
42
- rule(:dmarc_sep) { wsp? >> str(';') >> wsp? }
45
+ # Tags whose value is a decimal number of at most N digits.
46
+ DIGIT_TAGS = { 'ri' => 10, 'pct' => 3 }.freeze
43
47
 
44
- rule(:dmarc_version) do
45
- str('v') >> wsp? >>
46
- str('=') >> wsp? >>
47
- str('DMARC1').as(:v)
48
- end
48
+ # Tags whose value is a list of mailto URIs.
49
+ URI_TAGS = %w[rua ruf].freeze
49
50
 
50
- rule(:dmarc_tag) do
51
- dmarc_request |
52
- dmarc_srequest |
53
- dmarc_auri |
54
- dmarc_furi |
55
- dmarc_adkim |
56
- dmarc_aspf |
57
- dmarc_ainterval |
58
- dmarc_fo |
59
- dmarc_rfmt |
60
- dmarc_percent |
61
- unknown_tag
62
- end
51
+ # The `v=` tag, which may only appear first.
52
+ VERSION = /\Av[ \t]*=[ \t]*DMARC1\z/
63
53
 
64
- #
65
- # Defines a rule for a `tag=value` DMARC tag, capturing values that do not
66
- # match the rule as `:invalid_tag` so strict mode can reject them.
67
- #
68
- # @param [Symbol] name
69
- # The rule name, used as `dmarc_<name>`.
70
- #
71
- # @param [String] tag
72
- # The DMARC tag name.
73
- #
74
- # @yieldreturn [Parslet::Atoms::Base]
75
- # The parslet matching the tag's value.
76
- #
77
- # @api private
78
- #
79
- def self.tag_rule(name,tag,&block)
80
- rule(:"dmarc_#{name}") do
81
- (
82
- str(tag) >> wsp? >> str('=') >> wsp? >>
83
- instance_eval(&block).as(tag.to_sym)
84
- ) |
85
- (
86
- str(tag) >> wsp? >> str('=') >> wsp? >>
87
- match["^; \t"].repeat(1)
88
- ).as(:invalid_tag)
89
- end
90
- end
54
+ # Characters allowed in a mailto local part and domain.
55
+ ADDRESS = /[A-Za-z0-9._%+-]+@[A-Za-z0-9._%+-]+/
91
56
 
92
- tag_rule(:request,'p') do
93
- str('none') | str('quarantine') | str('reject')
94
- end
57
+ # Characters allowed between tags.
58
+ WSP = /[ \t]*/
95
59
 
96
- tag_rule(:srequest,'sp') do
97
- str('none') | str('quarantine') | str('reject')
98
- end
60
+ class << self
61
+ #
62
+ # Parses a DMARC record.
63
+ #
64
+ # @param [String] record
65
+ # The raw DMARC record to parse.
66
+ #
67
+ # @param [Boolean] strict (false)
68
+ # When `true`, raise on unknown tags or invalid tag values instead
69
+ # of silently ignoring them.
70
+ #
71
+ # @return [Hash{Symbol => Object}]
72
+ #
73
+ # @raise [InvalidRecord]
74
+ # The record is malformed, is too large, or (in strict mode)
75
+ # contains an unknown tag or invalid tag value.
76
+ #
77
+ def parse(record, strict: false)
78
+ unless record.is_a?(String)
79
+ raise InvalidRecord, "DMARC record must be a String, got #{record.class}"
80
+ end
99
81
 
100
- tag_rule(:auri, 'rua') do
101
- dmarc_uri >> (uri_list_sep.present? >> uri_list_sep).repeat >> (wsp? >> str(',')).absent?
102
- end
82
+ if record.bytesize > MAX_RECORD_BYTES
83
+ raise InvalidRecord, "DMARC record exceeds maximum size of #{MAX_RECORD_BYTES} bytes"
84
+ end
103
85
 
104
- tag_rule(:ainterval,'ri') { digit.repeat(1, 10) >> digit.absent? }
86
+ # Malformed or non-ASCII-compatible encodings make the regular
87
+ # expressions below raise ArgumentError or Encoding::CompatibilityError
88
+ # instead of InvalidRecord, which would escape `rescue DMARCator::Error`.
89
+ unless record.encoding.ascii_compatible?
90
+ raise InvalidRecord,
91
+ "DMARC record must be ASCII-compatible text, got #{record.encoding}"
92
+ end
105
93
 
106
- tag_rule(:furi,'ruf') do
107
- dmarc_uri >> (uri_list_sep.present? >> uri_list_sep).repeat >> (wsp? >> str(',')).absent?
108
- end
94
+ unless record.valid_encoding?
95
+ raise InvalidRecord, "DMARC record is not valid #{record.encoding} text"
96
+ end
109
97
 
110
- tag_rule(:fo,'fo') do
111
- fo_opt >> (wsp? >> str(':') >> wsp? >> fo_opt).repeat
112
- end
98
+ tags = { v: :DMARC1 }
113
99
 
114
- rule(:fo_opt) { match['01ds'].as(:fo_opt) }
100
+ split(record).each do |segment|
101
+ status, key, value = parse_segment(segment)
115
102
 
116
- tag_rule(:rfmt,'rf') { str('afrf') | str('iodef') }
103
+ case status
104
+ when :ok
105
+ raise InvalidRecord, "duplicate DMARC tag: #{key}" if tags.key?(key)
117
106
 
118
- tag_rule(:percent,'pct') { digit.repeat(1,3) >> digit.absent? }
107
+ tags[key] = value
108
+ when :unknown
109
+ if strict
110
+ raise InvalidRecord, "unknown DMARC tag: #{truncate(segment).inspect}"
111
+ end
112
+ when :invalid
113
+ if strict
114
+ raise InvalidRecord, "invalid DMARC tag value: #{truncate(segment).inspect}"
115
+ end
116
+ end
117
+ end
119
118
 
120
- tag_rule(:adkim, 'adkim') { match['rs'] }
121
- tag_rule(:aspf, 'aspf') { match['rs'] }
119
+ validate!(tags)
120
+ end
122
121
 
123
- rule(:unknown_tag) { match["^; \t"].repeat(1).as(:unknown_tag) }
122
+ private
124
123
 
125
- rule(:dmarc_uri) do
126
- mailto_uri.as(:uri) >> (
127
- str('!') >> digit.repeat(1, 10).as(:size) >> digit.absent? >> (
128
- match['kmgt']
129
- ).as(:unit).maybe
130
- ).maybe >> str('!').absent?
131
- end
124
+ #
125
+ # Splits a record into tag segments, validating the version tag.
126
+ #
127
+ def split(record)
128
+ separator = record.index(';')
129
+ version = (separator ? record[0, separator] : record).sub(/[ \t]+\z/, '')
130
+ rest = separator ? record[(separator + 1)..] : ''
132
131
 
133
- rule(:uri_list_sep) { wsp? >> str(',') >> wsp? >> dmarc_uri }
132
+ unless version.match?(VERSION)
133
+ raise InvalidRecord, "invalid DMARC record: #{truncate(record).inspect}"
134
+ end
134
135
 
135
- rule(:mailto_uri) do
136
- match['mM'] >> match['aA'] >> match['iI'] >> match['lL'] >> match['tT'] >> match['oO'] >>
137
- str(':') >> mailto_address
138
- end
136
+ # At most one trailing separator, plus optional surrounding space.
137
+ rest = rest.sub(/[ \t]+\z/, '').sub(/;[ \t]*\z/, '').sub(/[ \t]+\z/, '')
139
138
 
140
- rule(:mailto_address) do
141
- mailto_local >> str('@') >> mailto_domain
142
- end
139
+ return [] if rest.empty?
143
140
 
144
- rule(:mailto_local) { mailto_char.repeat(1) }
145
- rule(:mailto_domain) { mailto_char.repeat(1) }
146
- rule(:mailto_char) { match["A-Za-z0-9._%+-"] }
147
-
148
- rule(:digit) { match('[0-9]') }
149
- rule(:wsp) { str(' ') | str("\t") }
150
- rule(:wsp?) { wsp.repeat }
151
-
152
- #
153
- # Converts the raw parse tree into tag attributes.
154
- #
155
- # @api private
156
- #
157
- class Transform < Parslet::Transform
158
-
159
- rule(fo_opt: simple(:fo_opt)) { fo_opt }
160
- rule(fo: simple(:fo_opt)) { {fo: [fo_opt]} }
161
-
162
- rule(v: simple(:version)) { {v: version.to_sym} }
163
- rule(p: simple(:p)) { {p: p.to_sym } }
164
- rule(sp: simple(:sp)) { {sp: sp.to_sym} }
165
- rule(rf: simple(:rf)) { {rf: rf.to_sym} }
166
- rule(adkim: simple(:adkim)) { {adkim: adkim.to_sym} }
167
- rule(aspf: simple(:aspf)) { {aspf: aspf.to_sym} }
168
-
169
- rule(pct: simple(:pct)) { {pct: pct.to_i} }
170
- rule(ri: simple(:ri)) { {ri: ri.to_i} }
171
-
172
- rule(uri: simple(:uri), size: simple(:size), unit: simple(:unit)) do
173
- Uri.new(
174
- Transform.parse_uri(uri),
175
- size.to_i,
176
- unit.to_sym
177
- )
178
- end
179
- rule(uri: simple(:uri), size: simple(:size)) do
180
- Uri.new(
181
- Transform.parse_uri(uri),
182
- size.to_i
183
- )
184
- end
185
- rule(uri: simple(:uri)) { Uri.new(Transform.parse_uri(uri)) }
186
- rule(rua: subtree(:uris)) { {rua: Array(uris)} }
187
- rule(ruf: subtree(:uris)) { {ruf: Array(uris)} }
141
+ rest.split(';', -1).map do |segment|
142
+ segment = segment.sub(/\A[ \t]+/, '').sub(/[ \t]+\z/, '')
188
143
 
189
- # Maximum length of error messages echoed from untrusted input.
190
- MAX_ERROR_MESSAGE_LENGTH = 300
144
+ if segment.empty?
145
+ raise InvalidRecord, "invalid DMARC record: #{truncate(record).inspect}"
146
+ end
147
+
148
+ segment
149
+ end
150
+ end
191
151
 
192
152
  #
193
- # Parses a `mailto:` URI from a parse tree slice.
194
- #
195
- # @param [Parslet::Slice] value
196
- #
197
- # @return [URI::MailTo]
153
+ # Classifies and parses one `tag=value` segment.
198
154
  #
199
- # @raise [InvalidRecord]
200
- # The URI is not a valid `mailto:` URI.
155
+ # @return [Array(Symbol, Symbol, Object), Array(Symbol)]
201
156
  #
202
- # @api private
203
- #
204
- def self.parse_uri(value)
205
- uri = value.to_s
157
+ def parse_segment(segment)
158
+ name, value = segment.split('=', 2)
206
159
 
207
- begin
208
- parsed = URI.parse(uri)
209
- rescue URI::Error => error
210
- raise InvalidRecord, truncate(error.message)
211
- end
160
+ return [:unknown] if value.nil?
161
+
162
+ name = name.sub(/[ \t]+\z/, '').sub(/\A[ \t]+/, '')
163
+ value = value.sub(/\A[ \t]+/, '').sub(/[ \t]+\z/, '')
212
164
 
213
- unless parsed.is_a?(URI::MailTo)
214
- raise InvalidRecord, "invalid DMARC report URI (expected mailto): #{truncate(uri)}"
165
+ # A known tag with an empty value is not a tag at all.
166
+ return [:unknown] if value.empty?
167
+
168
+ if (keywords = KEYWORD_TAGS[name])
169
+ keyword(name, keywords, value)
170
+ elsif (max = DIGIT_TAGS[name])
171
+ digits(name, max, value)
172
+ elsif name == 'fo'
173
+ fo(value)
174
+ elsif URI_TAGS.include?(name)
175
+ uri_list(name, value, segment)
176
+ else
177
+ [:unknown]
215
178
  end
179
+ end
216
180
 
217
- parsed
181
+ def keyword(name, keywords, value)
182
+ return [:ok, name.to_sym, value.to_sym] if keywords.include?(value)
183
+
184
+ # A known keyword followed by junk is a malformed record, not an
185
+ # invalid value: the value grammar matched and the remainder did not.
186
+ malformed!(value) if keywords.any? { |keyword| value.start_with?(keyword) }
187
+
188
+ [:invalid]
218
189
  end
219
190
 
220
- #
221
- # Truncates an error message to a bounded length.
222
- #
223
- # @param [String] message
224
- #
225
- # @return [String]
226
- #
227
- # @api private
228
- #
229
- def self.truncate(message)
230
- message = message.to_s
191
+ def digits(name, max, value)
192
+ if value.match?(/\A\d+\z/)
193
+ return [:invalid] if value.length > max
231
194
 
232
- if message.length > MAX_ERROR_MESSAGE_LENGTH
233
- message[0, MAX_ERROR_MESSAGE_LENGTH] + "..."
234
- else
235
- message
195
+ return [:ok, name.to_sym, value.to_i]
236
196
  end
237
- end
238
197
 
239
- end
198
+ malformed!(value) if value.match?(/\A\d/)
240
199
 
241
- #
242
- # Parses a DMARC record.
243
- #
244
- # @param [String] record
245
- # The raw DMARC record to parse.
246
- #
247
- # @param [Boolean] strict (false)
248
- # When `true`, raise on unknown tags or invalid tag values instead of
249
- # silently ignoring them.
250
- #
251
- # @return [Hash{Symbol => Object}]
252
- # The Hash of tags within the record.
253
- #
254
- # @raise [InvalidRecord]
255
- # The record is not a String, is malformed, is too large, or (in strict
256
- # mode) contains an unknown tag or invalid tag value.
257
- #
258
- def self.parse(record, strict: false)
259
- unless record.is_a?(String)
260
- raise InvalidRecord, "DMARC record must be a String, got #{record.class}"
200
+ [:invalid]
261
201
  end
262
202
 
263
- if record.bytesize > MAX_RECORD_BYTES
264
- raise InvalidRecord, "DMARC record exceeds maximum size of #{MAX_RECORD_BYTES} bytes"
203
+ def fo(value)
204
+ return [:ok, :fo, value.split(':')] if value.match?(/\A[01ds](?::[01ds])*\z/)
205
+
206
+ malformed!(value) if value.match?(/\A[01ds](?::[01ds])*/)
207
+
208
+ [:invalid]
265
209
  end
266
210
 
267
- tree = parser.parse(record)
211
+ def uri_list(name, value, _segment)
212
+ uris = []
213
+ scanner = StringScanner.new(value)
268
214
 
269
- if strict
270
- tree.each do |node|
271
- next unless ignored?(node)
215
+ loop do
216
+ uri = parse_uri(scanner)
272
217
 
273
- if node.key?(:unknown_tag)
274
- raise InvalidRecord, "unknown DMARC tag: #{Transform.truncate(node[:unknown_tag].to_s).inspect}"
275
- else
276
- raise InvalidRecord, "invalid DMARC tag value: #{Transform.truncate(node[:invalid_tag].to_s).inspect}"
277
- end
218
+ # Any failure inside a URI makes the whole tag invalid.
219
+ return [:invalid] if uri.nil?
220
+
221
+ uris << uri
222
+
223
+ scanner.skip(WSP)
224
+
225
+ break if scanner.eos?
226
+
227
+ # A valid URI followed by junk is a malformed record.
228
+ malformed!(value) unless scanner.scan(/,/)
229
+
230
+ scanner.skip(WSP)
231
+
232
+ # A trailing comma leaves no URI to parse.
233
+ return [:invalid] if scanner.eos?
278
234
  end
235
+
236
+ [:ok, name.to_sym, uris]
279
237
  end
280
238
 
281
- tags = transform.apply(tree.reject { |node| ignored?(node) })
282
- hash = {}
239
+ #
240
+ # Parses one `mailto:` URI, with its optional size and unit.
241
+ #
242
+ # @return [Uri, nil]
243
+ # The URI, or `nil` when the value is not a valid DMARC URI.
244
+ #
245
+ def parse_uri(scanner)
246
+ start = scanner.pos
283
247
 
284
- tags.each do |tag|
285
- tag.each_key do |key|
286
- if hash.key?(key)
287
- raise InvalidRecord, "duplicate DMARC tag: #{key}"
288
- end
248
+ return nil unless scanner.scan(/mailto:/i) && scanner.scan(ADDRESS)
249
+
250
+ uri_text = scanner.string.byteslice(start, scanner.pos - start)
251
+ size = unit = nil
252
+
253
+ if scanner.scan(/!/)
254
+ digits = scanner.scan(/\d{1,10}/)
255
+
256
+ # A bare `!` or more than ten digits is an invalid value.
257
+ return nil if digits.nil? || scanner.match?(/\d/)
258
+
259
+ size = digits.to_i
260
+ unit = scanner.scan(/[kmgt]/)&.to_sym
261
+
262
+ # A second `!` is an invalid value.
263
+ return nil if scanner.match?(/!/)
289
264
  end
290
265
 
291
- hash.merge!(tag)
292
- end
266
+ parsed = begin
267
+ URI.parse(uri_text)
268
+ rescue URI::Error
269
+ return nil
270
+ end
293
271
 
294
- validate!(hash)
272
+ return nil unless parsed.is_a?(URI::MailTo)
295
273
 
296
- return hash
297
- end
274
+ Uri.new(parsed, size, unit)
275
+ end
298
276
 
299
- #
300
- # Determines whether a parse-tree node represents a tag that the lenient
301
- # parser dropped because it was unknown or had an invalid value.
302
- #
303
- # @param [Object] node
304
- # The parse-tree node.
305
- #
306
- # @return [Boolean]
307
- #
308
- def self.ignored?(node)
309
- node.is_a?(Hash) && (node.key?(:unknown_tag) || node.key?(:invalid_tag))
310
- end
277
+ #
278
+ # Raises for input whose valid prefix was followed by junk.
279
+ #
280
+ def malformed!(value)
281
+ raise InvalidRecord, "invalid DMARC record: #{truncate(value).inspect}"
282
+ end
311
283
 
312
- #
313
- # The memoized parser instance. Parslet caches rules per instance, so
314
- # reusing it avoids rebuilding the grammar on every call.
315
- #
316
- # @return [Parser]
317
- #
318
- # @api private
319
- #
320
- def self.parser
321
- @parser ||= new
322
- end
284
+ #
285
+ # Validates parsed tag values that have a range.
286
+ #
287
+ def validate!(tags)
288
+ if tags[:pct] && !tags[:pct].between?(0, 100)
289
+ raise InvalidRecord, 'pct must be an integer between 0 and 100'
290
+ end
323
291
 
324
- #
325
- # The memoized transform instance.
326
- #
327
- # @return [Transform]
328
- #
329
- # @api private
330
- #
331
- def self.transform
332
- @transform ||= Transform.new
333
- end
292
+ if tags[:ri] && !tags[:ri].between?(0, 2**32 - 1)
293
+ raise InvalidRecord, 'ri must be an integer between 0 and 4294967295'
294
+ end
334
295
 
335
- #
336
- # Validates the parsed tags.
337
- #
338
- # @param [Hash{Symbol => Object}] tags
339
- # The parsed tags.
340
- #
341
- # @raise [InvalidRecord]
342
- # One of the tags has an invalid value.
343
- #
344
- def self.validate!(tags)
345
- if tags[:pct] && !(tags[:pct].is_a?(Integer) && tags[:pct].between?(0, 100))
346
- raise InvalidRecord, "pct must be an integer between 0 and 100"
296
+ tags
347
297
  end
348
298
 
349
- if tags[:ri] && !(tags[:ri].is_a?(Integer) && tags[:ri].between?(0, 2**32 - 1))
350
- raise InvalidRecord, "ri must be an integer between 0 and 4294967295"
299
+ #
300
+ # Truncates an error message to a bounded length.
301
+ #
302
+ def truncate(message)
303
+ message = message.to_s
304
+
305
+ if message.length > MAX_ERROR_MESSAGE_LENGTH
306
+ message[0, MAX_ERROR_MESSAGE_LENGTH] + '...'
307
+ else
308
+ message
309
+ end
351
310
  end
352
311
  end
353
-
354
312
  end
355
313
  end
356
314
  end
@@ -284,36 +284,8 @@ module DMARCator
284
284
  end
285
285
 
286
286
  new(attributes)
287
- rescue Parslet::ParseFailed => error
288
- # Raising inside the rescue sets this error as the cause automatically.
289
- raise InvalidRecord, truncate_error_message(error.message)
290
287
  end
291
288
 
292
- # Maximum length of error messages echoed from parsing untrusted input.
293
- MAX_ERROR_MESSAGE_LENGTH = 500
294
-
295
- #
296
- # Truncates error messages to avoid echoing large amounts of untrusted
297
- # input in exceptions.
298
- #
299
- # @param [String] message
300
- # The error message to truncate.
301
- #
302
- # @return [String]
303
- # The truncated error message.
304
- #
305
- def self.truncate_error_message(message)
306
- message = message.to_s
307
-
308
- if message.length > MAX_ERROR_MESSAGE_LENGTH
309
- message[0, MAX_ERROR_MESSAGE_LENGTH] + "..."
310
- else
311
- message
312
- end
313
- end
314
-
315
- private_class_method :truncate_error_message
316
-
317
289
  #
318
290
  # Looks up and parses the DMARC record for a domain.
319
291
  #
@@ -2,5 +2,5 @@
2
2
 
3
3
  module DMARCator
4
4
  # dmarcator version
5
- VERSION = '1.0.0'
5
+ VERSION = '1.1.0'
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dmarcator
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Noah Berman
@@ -9,26 +9,6 @@ bindir: bin
9
9
  cert_chain: []
10
10
  date: 1980-01-02 00:00:00.000000000 Z
11
11
  dependencies:
12
- - !ruby/object:Gem::Dependency
13
- name: parslet
14
- requirement: !ruby/object:Gem::Requirement
15
- requirements:
16
- - - ">="
17
- - !ruby/object:Gem::Version
18
- version: 1.0.0
19
- - - "<"
20
- - !ruby/object:Gem::Version
21
- version: 3.0.0
22
- type: :runtime
23
- prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- requirements:
26
- - - ">="
27
- - !ruby/object:Gem::Version
28
- version: 1.0.0
29
- - - "<"
30
- - !ruby/object:Gem::Version
31
- version: 3.0.0
32
12
  - !ruby/object:Gem::Dependency
33
13
  name: nokogiri
34
14
  requirement: !ruby/object:Gem::Requirement