archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 40419: [Backport #8281]

Browse source 
* lib/net/imap.rb (getacl_response): parse the mailbox of an ACL
	  response correctly.  [ruby-core:54365] [Bug #8281]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-04-23 13:51:36 +00:00
parent 69da79fafc
commit 96de351eed
4 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Apr 23 22:33:16 2013 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (getacl_response): parse the mailbox of an ACL
response correctly. [ruby-core:54365] [Bug #8281]
Sun Apr 21 00:14:36 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Sun Apr 21 00:14:36 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path): * test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):

6
lib/net/imap.rb
View file

@ -1740,7 +1740,7 @@ module Net
# rights:: The access rights the indicated user has to the # rights:: The access rights the indicated user has to the
# mailbox. # mailbox.
# #
MailboxACLItem = Struct.new(:user, :rights) MailboxACLItem = Struct.new(:user, :rights, :mailbox)
# Net::IMAP::StatusData represents contents of the STATUS response. # Net::IMAP::StatusData represents contents of the STATUS response.
# #
@ -2807,6 +2807,7 @@ module Net
token = match(T_ATOM) token = match(T_ATOM)
name = token.value.upcase name = token.value.upcase
match(T_SPACE) match(T_SPACE)
mailbox = astring
data = [] data = []
token = lookahead token = lookahead
if token.symbol == T_SPACE if token.symbol == T_SPACE
@ -2822,8 +2823,7 @@ module Net
user = astring user = astring
match(T_SPACE) match(T_SPACE)
rights = astring rights = astring
##XXX data.push([user, rights]) data.push(MailboxACLItem.new(user, rights, mailbox))
data.push(MailboxACLItem.new(user, rights))
end end
end end
return UntaggedResponse.new(name, data, @str) return UntaggedResponse.new(name, data, @str)

14
test/net/imap/test_imap_response_parser.rb
View file

@ -180,4 +180,18 @@ EOF
* 1038 FETCH (BODY ("MIXED")) * 1038 FETCH (BODY ("MIXED"))
EOF EOF
end end
# [Bug #8281]
def test_acl
parser = Net::IMAP::ResponseParser.new
response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
* ACL "INBOX/share" "imshare2copy1366146467@xxxxxxxxxxxxxxxxxx.com" lrswickxteda
EOF
assert_equal("ACL", response.name)
assert_equal(1, response.data.length)
assert_equal("INBOX/share", response.data[0].mailbox)
assert_equal("imshare2copy1366146467@xxxxxxxxxxxxxxxxxx.com",
response.data[0].user)
assert_equal("lrswickxteda", response.data[0].rights)
end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-23" #define RUBY_RELEASE_DATE "2013-04-23"
#define RUBY_PATCHLEVEL 161 #define RUBY_PATCHLEVEL 162
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4