net-imap 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e933100b505623a478f75c60fa9daab5da7a67c0e68a5b0cf83db20e4a362f65
-  data.tar.gz: 79e288f7011385db37f53be45d801cc4fc96b2ba5a08db9c3b7b0bed462989d1
+  metadata.gz: da8cb634d9ee1613035c81a25d28ae9f36b3d0985bcb61da9a38aacb87854a5f
+  data.tar.gz: e504b145415da3a025c6f4ab973b212764c75ef4214d0fed485fdb0b17e83752
 SHA512:
-  metadata.gz: c4d1fa03ef8db7e5311437c04ee11d4f22017d1a289e63eb8c9c0a64b0816722cb68793c92313ace4b738675eb7bad091007e914c9b381e1e61df35a5dd12ccd
-  data.tar.gz: 6532ed39b47bc4fa70be3430d64f385c19a07087ee5c223a066ce42b00c77d5c99661d78a32347e32475175b8431fbabfcb1b8c351b9fb9b931ff5d859e25f87
+  metadata.gz: 0cef39a5ac6454ded84c395fb2671df678e17611d7eff42665113c21f955ebcb6ffdf9035dd1e6fdb3de38aa38f43431537ded3d484ffba7d699b478bb8c3e1e
+  data.tar.gz: 23f777092b2940b725685285a6372b56744a9968fcc76872ebf9ef3136fb3665a89a85174dc34636e547b90d8d3a1945627ce79390f10122aadb57b57004f789

data/lib/net/imap/response_parser/parser_utils.rb

@@ -15,6 +15,7 @@ module Net
 
           # we can skip lexer for single character matches, as a shortcut
           def def_char_matchers(name, char, token)
+            byte = char.ord
             match_name = name.match(/\A[A-Z]/) ? "#{name}!" : name
             char = char.dump
             class_eval <<~RUBY, __FILE__, __LINE__ + 1
@@ -27,7 +28,7 @@ module Net
 
               # use token or string peek
               def peek_#{name}?
-                @token ? @token.symbol == #{token} : @str[@pos] == #{char}
+                @token ? @token.symbol == #{token} : @str.getbyte(@pos) == #{byte}
               end
 
               # like accept(token_symbols); returns token or nil
@@ -35,7 +36,7 @@ module Net
                 if @token&.symbol == #{token}
                   #{SHIFT_TOKEN}
                   #{char}
-                elsif !@token && @str[@pos] == #{char}
+                elsif !@token && @str.getbyte(@pos) == #{byte}
                   @pos += 1
                   #{char}
                 end
@@ -46,7 +47,7 @@ module Net
                 if @token&.symbol == #{token}
                   #{SHIFT_TOKEN}
                   #{char}
-                elsif !@token && @str[@pos] == #{char}
+                elsif !@token && @str.getbyte(@pos) == #{byte}
                   @pos += 1
                   #{char}
                 else
@@ -109,7 +110,6 @@ module Net
                 end
               end
             RUBY
-
           end
 
         end

data/lib/net/imap/response_parser.rb

@@ -1101,47 +1101,32 @@ module Net
       end
 
       # RFC3501 & RFC9051:
-      # header-fld-name = astring
+      #   header-fld-name = astring
+      #
+      # NOTE: Previously, Net::IMAP recreated the raw original source string.
+      # Now, it grabs the raw encoded value using @str and @pos.  A future
+      # version may simply return the decoded astring value.  Although that is
+      # technically incompatible, it should almost never make a difference: all
+      # standard header field names are valid atoms:
+      #
+      # https://www.iana.org/assignments/message-headers/message-headers.xhtml
       #
       # Although RFC3501 allows any astring, RFC5322-valid header names are one
       # or more of the printable US-ASCII characters, except SP and colon.  So
       # empty string isn't valid, and literals aren't needed and should not be
-      # used.  This syntax is unchanged by [I18N-HDRS] (RFC6532).
+      # used.  This is explicitly unchanged by [I18N-HDRS] (RFC6532).
       #
       # RFC5233:
-      # optional-field  =   field-name ":" unstructured CRLF
-      # field-name      =   1*ftext
-      # ftext           =   %d33-57 /          ; Printable US-ASCII
-      #                     %d59-126           ;  characters not including
-      #                                        ;  ":".
-      #
-      # Atom and quoted should be sufficient.
-      #
-      # TODO: Use original source string, rather than decode and re-encode.
-      # TODO: or at least, DRY up this code with the send_command formatting.
+      #     optional-field  =   field-name ":" unstructured CRLF
+      #     field-name      =   1*ftext
+      #     ftext           =   %d33-57 /          ; Printable US-ASCII
+      #                         %d59-126           ;  characters not including
+      #                                            ;  ":".
       def header_fld_name
-        case (str = astring)
-        when ""
-          warn '%s header-fld-name is an invalid RFC5322 field-name: ""' %
-            [self.class]
-          return '""'
-        when /[\x80-\xff\r\n]/n
-          warn "%s header-fld-name %p has invalid RFC5322 field-name char: %p" %
-            [self.class, str, $&]
-          # literal
-          return "{" + str.bytesize.to_s + "}" + CRLF + str
-        when /[^\x21-\x39\x3b-\xfe]/n
-          warn "%s header-fld-name %p has invalid RFC5322 field-name char: %p" %
-            [self.class, str, $&]
-          # invalid quoted string
-          return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
-        when /[(){ \x00-\x1f\x7f%*"\\]/n
-          # quoted string
-          return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
-        else
-          # atom
-          return str
-        end
+        assert_no_lookahead
+        start = @pos
+        astring
+        @str[start...@pos - 1]
       end
 
       # mailbox-data    =  "FLAGS" SP flag-list / "LIST" SP mailbox-list /

data/lib/net/imap.rb

@@ -662,7 +662,7 @@ module Net
   # * {IMAP URLAUTH Authorization Mechanism Registry}[https://www.iana.org/assignments/urlauth-authorization-mechanism-registry/urlauth-authorization-mechanism-registry.xhtml]
   #
   class IMAP < Protocol
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
 
     # Aliases for supported capabilities, to be used with the #enable command.
     ENABLE_ALIASES = {
@@ -2188,7 +2188,7 @@ module Net
         .join(' ')
       synchronize do
         send_command("ENABLE #{capabilities}")
-        result = clear_responses("ENABLED").last
+        result = clear_responses("ENABLED").last || []
         @utf8_strings ||= result.include? "UTF8=ACCEPT"
         @utf8_strings ||= result.include? "IMAP4REV2"
         result
@@ -2642,7 +2642,7 @@ module Net
         else
           send_command(cmd, *keys)
         end
-        clear_responses("SEARCH").last
+        clear_responses("SEARCH").last || []
       end
     end
 
@@ -2691,7 +2691,7 @@ module Net
       normalize_searching_criteria(search_keys)
       synchronize do
         send_command(cmd, sort_keys, charset, *search_keys)
-        clear_responses("SORT").last
+        clear_responses("SORT").last || []
       end
     end
 
@@ -2704,7 +2704,7 @@ module Net
       normalize_searching_criteria(search_keys)
       synchronize do
         send_command(cmd, algorithm, charset, *search_keys)
-        clear_responses("THREAD").last
+        clear_responses("THREAD").last || []
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-imap
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Shugo Maeda
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-protocol