Merge branch 'master-3.2' into dist/3.2/bookworm

Author: sorah

.bundle/gems/net-imap-0.3.4.1/Gemfile renamed to .bundle/gems/net-imap-0.3.8/Gemfile

@@ -511,10 +511,8 @@ module Net
   #
   # - #greeting: The server's initial untagged response, which can indicate a
   #   pre-authenticated connection.
-  # - #responses: The untagged responses, as a hash.  Keys are the untagged
-  #   response type (e.g. "OK", "FETCH", "FLAGS") and response code (e.g.
-  #   "ALERT", "UIDVALIDITY", "UIDNEXT", "TRYCREATE", etc).  Values are arrays
-  #   of UntaggedResponse or ResponseCode.
+  # - #responses: A hash with arrays of unhandled <em>non-+nil+</em>
+  #   UntaggedResponse and ResponseCode +#data+, keyed by +#name+.
   # - #add_response_handler: Add a block to be called inside the receiver thread
   #   with every server response.
   # - #remove_response_handler: Remove a previously added response handler.
@@ -701,7 +699,7 @@ module Net
   # * {Character sets}[https://www.iana.org/assignments/character-sets/character-sets.xhtml]
   #
   class IMAP < Protocol
-    VERSION = "0.3.4.1"
+    VERSION = "0.3.8"
 
     include MonitorMixin
     if defined?(OpenSSL::SSL)
@@ -712,7 +710,9 @@ class IMAP < Protocol
     # Returns the initial greeting the server, an UntaggedResponse.
     attr_reader :greeting
 
-    # Returns recorded untagged responses.
+    # Returns a hash with arrays of unhandled <em>non-+nil+</em>
+    # UntaggedResponse#data keyed by UntaggedResponse#name, and
+    # ResponseCode#data keyed by ResponseCode#name.
     #
     # For example:
     #

.bundle/gems/net-imap-0.3.4.1/LICENSE.txt renamed to .bundle/gems/net-imap-0.3.8/LICENSE.txt

@@ -15,7 +15,7 @@ def process(challenge)
       @stage = STAGE_TWO
       sparams = {}
       c = StringScanner.new(challenge)
-      while c.scan(/(?:\s*,)?\s*(\w+)=("(?:[^\\"]+|\\.)*"|[^,]+)\s*/)
+      while c.scan(/(?:\s*,)?\s*(\w+)=("(?:[^\\"]|\\.)*"|[^,]+)\s*/)
         k, v = c[1], c[2]
         if v =~ /^"(.*)"$/
           v = $1
@@ -26,7 +26,7 @@ def process(challenge)
         sparams[k] = v
       end
 
-      raise Net::IMAP::DataFormatError, "Bad Challenge: '#{challenge}'" unless c.eos?
+      raise Net::IMAP::DataFormatError, "Bad Challenge: '#{challenge}'" unless c.eos? and sparams['qop']
       raise Net::IMAP::Error, "Server does not support auth (qop = #{sparams['qop'].join(',')})" unless sparams['qop'].include?("auth")
 
       response = {

.bundle/gems/net-imap-0.3.4.1/README.md renamed to .bundle/gems/net-imap-0.3.8/README.md

@@ -7,7 +7,7 @@ def process(_data)
 
   private
 
-  def initialize(user, oauth2_token)
+  def initialize(user, oauth2_token, **_)
     @user = user
     @oauth2_token = oauth2_token
   end

.bundle/gems/net-imap-0.3.4.1/Rakefile renamed to .bundle/gems/net-imap-0.3.8/Rakefile

@@ -54,9 +54,9 @@ class IMAP < Protocol
     # Net::IMAP does _not_ automatically encode and decode
     # mailbox names to and from UTF-7.
     def self.decode_utf7(s)
-      return s.gsub(/&([^-]+)?-/n) {
-        if $1
-          ($1.tr(",", "/") + "===").unpack1("m").encode(Encoding::UTF_8, Encoding::UTF_16BE)
+      return s.gsub(/&([A-Za-z0-9+,]+)?-/n) {
+        if base64 = $1
+          (base64.tr(",", "/") + "===").unpack1("m").encode(Encoding::UTF_8, Encoding::UTF_16BE)
         else
           "&"
         end

.bundle/gems/net-imap-0.3.4.1/benchmarks/stringprep.yml renamed to .bundle/gems/net-imap-0.3.8/benchmarks/stringprep.yml

@@ -7,6 +7,8 @@ class IMAP < Protocol
 
     # Parses an \IMAP server response.
     class ResponseParser
+      MAX_UID_SET_SIZE = 10_000
+
       # :call-seq: Net::IMAP::ResponseParser.new -> Net::IMAP::ResponseParser
       def initialize
         @str = nil
@@ -1379,11 +1381,29 @@ def uid_set
         case token.symbol
         when T_NUMBER then [Integer(token.value)]
         when T_ATOM
-          token.value.split(",").flat_map {|range|
-            range = range.split(":").map {|uniqueid| Integer(uniqueid) }
-            range.size == 1 ? range : Range.new(range.min, range.max).to_a
+          entries = uid_set__ranges(token.value)
+          if (count = entries.sum(&:count)) > MAX_UID_SET_SIZE
+            parse_error("uid-set is too large: %d > 10k", count)
+          end
+          entries.flat_map(&:to_a)
+        end
+      end
+
+      # returns an array of ranges
+      def uid_set__ranges(uidset)
+        entries = []
+        uidset.split(",") do |entry|
+          uids = entry.split(":", 2).map {|uid|
+            unless uid =~ /\A[1-9][0-9]*\z/
+              parse_error("invalid uid-set uid: %p", uid)
+            end
+            uid = Integer(uid)
+            NumValidator.ensure_nz_number(uid)
+            uid
           }
+          entries << Range.new(*uids.minmax)
         end
+        entries
       end
 
       def nil_atom

.bundle/gems/net-imap-0.3.4.1/benchmarks/table-regexps.yml renamed to .bundle/gems/net-imap-0.3.8/benchmarks/table-regexps.yml

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(bin|test|spec|features)/}) }
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(bin|test|spec|features|rfcs)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

.bundle/gems/net-imap-0.3.4.1/docs/styles.css renamed to .bundle/gems/net-imap-0.3.8/docs/styles.css

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
-# stub: net-imap 0.3.4.1 ruby lib
+# stub: net-imap 0.3.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-imap".freeze
-  s.version = "0.3.4.1"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "homepage_uri" => "https://github.com/ruby/net-imap", "source_code_uri" => "https://github.com/ruby/net-imap" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Shugo Maeda".freeze, "nicholas a. evans".freeze]
   s.bindir = "exe".freeze
-  s.date = "2024-01-05"
+  s.date = "2025-02-07"
   s.description = "Ruby client api for Internet Message Access Protocol".freeze
   s.email = ["[email protected]".freeze, "[email protected]".freeze]
   s.files = [".github/dependabot.yml".freeze, ".github/workflows/test.yml".freeze, ".gitignore".freeze, "Gemfile".freeze, "LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "benchmarks/stringprep.yml".freeze, "benchmarks/table-regexps.yml".freeze, "docs/styles.css".freeze, "lib/net/imap.rb".freeze, "lib/net/imap/authenticators.rb".freeze, "lib/net/imap/authenticators/cram_md5.rb".freeze, "lib/net/imap/authenticators/digest_md5.rb".freeze, "lib/net/imap/authenticators/login.rb".freeze, "lib/net/imap/authenticators/plain.rb".freeze, "lib/net/imap/authenticators/xoauth2.rb".freeze, "lib/net/imap/command_data.rb".freeze, "lib/net/imap/data_encoding.rb".freeze, "lib/net/imap/errors.rb".freeze, "lib/net/imap/flags.rb".freeze, "lib/net/imap/response_data.rb".freeze, "lib/net/imap/response_parser.rb".freeze, "lib/net/imap/sasl.rb".freeze, "lib/net/imap/sasl/saslprep.rb".freeze, "lib/net/imap/sasl/saslprep_tables.rb".freeze, "lib/net/imap/sasl/stringprep.rb".freeze, "lib/net/imap/sasl/stringprep_tables.rb".freeze, "net-imap.gemspec".freeze, "rakelib/rdoc.rake".freeze, "rakelib/rfcs.rake".freeze, "rakelib/saslprep.rake".freeze, "rakelib/string_prep_tables_generator.rb".freeze]