Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions lib/net/imap/command_data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ def validate_data(data)
when nil
when String
when Integer
NumValidator.ensure_number(data)
# Covers modseq-valzer, which is the largest valid IMAP integer
if data.negative?
raise DataFormatError, "Integer argument must be unsigned: #{data}"
elsif 0xffff_ffff_ffff_ffff < data
raise DataFormatError, "Integer argument must fit in 64 bits: #{data}"
end
when Array
if data[0] == 'CHANGEDSINCE'
NumValidator.ensure_mod_sequence_value(data[1])
else
data.each do |i|
validate_data(i)
end
data.each do |i|
validate_data(i)
end
when Time, Date, DateTime
when Symbol
Expand Down
16 changes: 14 additions & 2 deletions test/net/imap/test_imap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ def test_default_port
assert_equal(993, Net::IMAP.default_imaps_port)
end

def test_send_invalid_number
def test_send_integer
with_fake_server do |server, imap|
server.on "TEST", &:done_ok

Expand All @@ -650,10 +650,22 @@ def test_send_invalid_number
imap.__send__(:send_command, "TEST", 2**32 - 1)
assert_equal (2**32 - 1).to_s, server.commands.pop.args

imap.__send__(:send_command, "TEST", 2**32)
assert_equal (2**32).to_s, server.commands.pop.args

imap.__send__(:send_command, "TEST", 2**64 - 1)
assert_equal (2**64 - 1).to_s, server.commands.pop.args

assert_raise(Net::IMAP::DataFormatError) do
imap.__send__(:send_command, "TEST", 2**32)
imap.__send__(:send_command, "TEST", 2**64)
end
assert_empty server.commands
end
end

def test_send_sequence_set
with_fake_server do |server, imap|
server.on "TEST", &:done_ok

# SequenceSet numbers may be non-zero uint3, and -1 is translated to *
imap.__send__(:send_command, "TEST", Net::IMAP::SequenceSet.new(-1))
Expand Down
Loading