net-imap 0.4.24 → 0.5.0

data/lib/net/imap/config.rb

@@ -129,25 +129,8 @@ module Net
       def self.global; @global if defined?(@global) end
 
       # A hash of hard-coded configurations, indexed by version number or name.
-      # Values can be accessed with any object that responds to +to_sym+ or
-      # +to_r+/+to_f+ with a non-zero number.
-      #
-      # Config::[] gets named or numbered versions from this hash.
-      #
-      # For example:
-      #     Net::IMAP::Config.version_defaults[0.5] == Net::IMAP::Config[0.5]
-      #     Net::IMAP::Config[0.5]       == Net::IMAP::Config[0.5r]     # => true
-      #     Net::IMAP::Config["current"] == Net::IMAP::Config[:current] # => true
-      #     Net::IMAP::Config["0.5.6"]   == Net::IMAP::Config[0.5r]     # => true
       def self.version_defaults; @version_defaults end
-      @version_defaults = Hash.new {|h, k|
-        # NOTE: String responds to both so the order is significant.
-        # And ignore non-numeric conversion to zero, because: "wat!?".to_r == 0
-        (h.fetch(k.to_r, nil) || h.fetch(k.to_f, nil) if k.is_a?(Numeric)) ||
-          (h.fetch(k.to_sym, nil) if k.respond_to?(:to_sym)) ||
-          (h.fetch(k.to_r,   nil) if k.respond_to?(:to_r) && k.to_r != 0r) ||
-          (h.fetch(k.to_f,   nil) if k.respond_to?(:to_f) && k.to_f != 0.0)
-      }
+      @version_defaults = {}
 
       # :call-seq:
       #  Net::IMAP::Config[number] -> versioned config
@@ -170,17 +153,18 @@ module Net
         elsif config.nil? && global.nil?   then nil
         elsif config.respond_to?(:to_hash) then new(global, **config).freeze
         else
-          version_defaults[config] or
+          version_defaults.fetch(config) do
             case config
             when Numeric
               raise RangeError, "unknown config version: %p" % [config]
-            when String, Symbol
+            when Symbol
               raise KeyError, "unknown config name: %p" % [config]
             else
               raise TypeError, "no implicit conversion of %s to %s" % [
                 config.class, Config
               ]
             end
+          end
         end
       end
 
@@ -207,13 +191,10 @@ module Net
 
       # Seconds to wait until a connection is opened.
       #
-      # Applied separately for establishing TCP connection and starting a TLS
-      # connection.
-      #
       # If the IMAP object cannot open a connection within this time,
       # it raises a Net::OpenTimeout exception.
       #
-      # See Net::IMAP.new and Net::IMAP#starttls.
+      # See Net::IMAP.new.
       #
       # The default value is +30+ seconds.
       attr_accessor :open_timeout, type: Integer
@@ -242,40 +223,29 @@ module Net
       #   Use +SASL-IR+ when it is supported by the server and the mechanism.
       attr_accessor :sasl_ir, type: :boolean
 
-      # The maximum allowed server response size.  When +nil+, there is no limit
-      # on response size.
+      # Controls the behavior of Net::IMAP#login when the +LOGINDISABLED+
+      # capability is present.  When enforced, Net::IMAP will raise a
+      # LoginDisabledError when that capability is present.
       #
-      # The default value (512 MiB, since +v0.5.7+) is <em>very high</em> and
-      # unlikely to be reached.  To use a lower limit, fetch message bodies in
-      # chunks rather than all at once.  A _much_ lower value should be used
-      # with untrusted servers (for example, when connecting to a user-provided
-      # hostname).
+      # <em>(Support for +LOGINDISABLED+ was added in +v0.5.0+.)</em>
       #
-      # <em>Please Note:</em> this only limits the size per response.  It does
-      # not prevent a flood of individual responses and it does not limit how
-      # many unhandled responses may be stored on the responses hash.  See
-      # Net::IMAP@Unbounded+memory+use.
-      #
-      # Socket reads are limited to the maximum remaining bytes for the current
-      # response: max_response_size minus the bytes that have already been read.
-      # When the limit is reached, or reading a +literal+ _would_ go over the
-      # limit, ResponseTooLargeError is raised and the connection is closed.
-      # See also #socket_read_limit.
+      # ==== Valid options
       #
-      # Note that changes will not take effect immediately, because the receiver
-      # thread may already be waiting for the next response using the previous
-      # value.  Net::IMAP#noop can force a response and enforce the new setting
-      # immediately.
+      # [+false+ <em>(original behavior, before support was added)</em>]
+      #   Send the +LOGIN+ command without checking for +LOGINDISABLED+.
       #
-      # ==== Versioned Defaults
+      # [+:when_capabilities_cached+]
+      #   Enforce the requirement when Net::IMAP#capabilities_cached? is true,
+      #   but do not send a +CAPABILITY+ command to discover the capabilities.
       #
-      # Net::IMAP#max_response_size <em>was added in +v0.2.5+ and +v0.3.9+ as an
-      # attr_accessor, and in +v0.4.20+ and +v0.5.7+ as a delegator to this
-      # config attribute.</em>
+      # [+true+ <em>(default since +v0.5+)</em>]
+      #   Only send the +LOGIN+ command if the +LOGINDISABLED+ capability is not
+      #   present.  When capabilities are unknown, Net::IMAP will automatically
+      #   send a +CAPABILITY+ command first before sending +LOGIN+.
       #
-      # * original: +nil+ <em>(no limit)</em>
-      # * +0.5+: 512 MiB
-      attr_accessor :max_response_size, type: Integer?
+      attr_accessor :enforce_logindisabled, type: [
+        false, :when_capabilities_cached, true
+      ]
 
       # Controls the behavior of Net::IMAP#responses when called without any
       # arguments (+type+ or +block+).
@@ -303,7 +273,7 @@ module Net
       #   Raise an ArgumentError with the deprecation warning.
       #
       # Note: #responses_without_args is an alias for #responses_without_block.
-      attr_accessor :responses_without_block, type: Enum[
+      attr_accessor :responses_without_block, type: [
         :silence_deprecation_warning, :warn, :frozen_dup, :raise,
       ]
 
@@ -315,67 +285,6 @@ module Net
       #
       # Alias for responses_without_block
 
-      # Whether ResponseParser should use the deprecated UIDPlusData or
-      # CopyUIDData for +COPYUID+ response codes, and UIDPlusData or
-      # AppendUIDData for +APPENDUID+ response codes.
-      #
-      # UIDPlusData stores its data in arrays of numbers, which is vulnerable to
-      # a memory exhaustion denial of service attack from an untrusted or
-      # compromised server.  Set this option to +false+ to completely block this
-      # vulnerability.  Otherwise, parser_max_deprecated_uidplus_data_size
-      # mitigates this vulnerability.
-      #
-      # AppendUIDData and CopyUIDData are _mostly_ backward-compatible with
-      # UIDPlusData.  Most applications should be able to upgrade with little
-      # or no changes.
-      #
-      # <em>(Parser support for +UIDPLUS+ added in +v0.3.2+.)</em>
-      #
-      # <em>(Config option added in +v0.4.19+ and +v0.5.6+.)</em>
-      #
-      # <em>UIDPlusData will be removed in +v0.6+ and this config setting will
-      # be ignored.</em>
-      #
-      # ==== Valid options
-      #
-      # [+true+ <em>(original default)</em>]
-      #    ResponseParser only uses UIDPlusData.
-      #
-      # [+:up_to_max_size+ <em>(default since +v0.5.6+)</em>]
-      #    ResponseParser uses UIDPlusData when the +uid-set+ size is below
-      #    parser_max_deprecated_uidplus_data_size.  Above that size,
-      #    ResponseParser uses AppendUIDData or CopyUIDData.
-      #
-      # [+false+ <em>(planned default for +v0.6+)</em>]
-      #    ResponseParser _only_ uses AppendUIDData and CopyUIDData.
-      attr_accessor :parser_use_deprecated_uidplus_data, type: Enum[
-        true, :up_to_max_size, false
-      ]
-
-      # The maximum +uid-set+ size that ResponseParser will parse into
-      # deprecated UIDPlusData.  This limit only applies when
-      # parser_use_deprecated_uidplus_data is not +false+.
-      #
-      # <em>(Parser support for +UIDPLUS+ added in +v0.3.2+.)</em>
-      #
-      # <em>Support for limiting UIDPlusData to a maximum size was added in
-      # +v0.3.8+, +v0.4.19+, and +v0.5.6+.</em>
-      #
-      # <em>UIDPlusData will be removed in +v0.6+.</em>
-      #
-      # ==== Versioned Defaults
-      #
-      # Because this limit guards against a remote server causing catastrophic
-      # memory exhaustion, the versioned default (used by #load_defaults) also
-      # applies to versions without the feature.
-      #
-      # * +0.3+ and prior: <tt>10,000</tt>
-      # * +0.4+: <tt>1,000</tt>
-      # * +0.5+: <tt>100</tt>
-      # * +0.6+: <tt>0</tt>
-      #
-      attr_accessor :parser_max_deprecated_uidplus_data_size, type: Integer
-
       # Creates a new config object and initialize its attribute with +attrs+.
       #
       # If +parent+ is not given, the global config is used by default.
@@ -454,71 +363,38 @@ module Net
         open_timeout: 30,
         idle_response_timeout: 5,
         sasl_ir: true,
-        max_response_size: nil,
-        responses_without_block: :silence_deprecation_warning,
-        parser_use_deprecated_uidplus_data: true,
-        parser_max_deprecated_uidplus_data_size: 1000,
+        enforce_logindisabled: true,
+        responses_without_block: :warn,
       ).freeze
 
       @global = default.new
 
       version_defaults[:default] = Config[default.send(:defaults_hash)]
+      version_defaults[:current] = Config[:default]
 
-      version_defaults[0r] = Config[:default].dup.update(
+      version_defaults[0] = Config[:current].dup.update(
         sasl_ir: false,
-        max_response_size: nil,
-        parser_use_deprecated_uidplus_data: true,
-        parser_max_deprecated_uidplus_data_size: 10_000,
+        responses_without_block: :silence_deprecation_warning,
+        enforce_logindisabled: false,
       ).freeze
-      version_defaults[0.0r] = Config[0r]
-      version_defaults[0.1r] = Config[0r]
-      version_defaults[0.2r] = Config[0r]
-      version_defaults[0.3r] = Config[0r]
+      version_defaults[0.0] = Config[0]
+      version_defaults[0.1] = Config[0]
+      version_defaults[0.2] = Config[0]
+      version_defaults[0.3] = Config[0]
 
-      version_defaults[0.4r] = Config[0.3r].dup.update(
+      version_defaults[0.4] = Config[0.3].dup.update(
         sasl_ir: true,
-        parser_max_deprecated_uidplus_data_size: 1000,
       ).freeze
 
-      version_defaults[0.5r] = Config[0.4r].dup.update(
-        max_response_size: 512 << 20, # 512 MiB
-        responses_without_block: :warn,
-        parser_use_deprecated_uidplus_data: :up_to_max_size,
-        parser_max_deprecated_uidplus_data_size: 100,
-      ).freeze
+      version_defaults[0.5] = Config[:current]
 
-      version_defaults[0.6r] = Config[0.5r].dup.update(
+      version_defaults[0.6] = Config[0.5].dup.update(
         responses_without_block: :frozen_dup,
-        parser_use_deprecated_uidplus_data: false,
-        parser_max_deprecated_uidplus_data_size: 0,
-      ).freeze
-
-      version_defaults[0.7r] = Config[0.6r].dup.update(
       ).freeze
-
-      # Safe conversions one way only:
-      #   0.6r.to_f == 0.6  # => true
-      #   0.6 .to_r == 0.6r # => false
-      version_defaults.to_a.each do |k, v|
-        next unless k.is_a? Rational
-        version_defaults[k.to_f] = v
-      end
-
-      current = VERSION.to_r
-      version_defaults[:original] = Config[0]
-      version_defaults[:current]  = Config[current]
-      version_defaults[:next]     = Config[current + 0.1r]
-
-      version_defaults[:future]   = Config[0.7r]
+      version_defaults[:next] = Config[0.6]
+      version_defaults[:future] = Config[:next]
 
       version_defaults.freeze
-
-      if ($VERBOSE || $DEBUG) && self[:current].to_h != self[:default].to_h
-        warn "Misconfigured Net::IMAP::Config[:current] => %p,\n" \
-             " not equal to Net::IMAP::Config[:default] => %p" % [
-                self[:current].to_h, self[:default].to_h
-              ]
-      end
     end
   end
 end

data/lib/net/imap/data_encoding.rb

@@ -186,7 +186,7 @@ module Net
 
       # Ensure argument is 'number' or raise DataFormatError
       def ensure_number(num)
-        return if valid_number?(num)
+        return num if valid_number?(num)
 
         msg = "number must be unsigned 32-bit integer: #{num}"
         raise DataFormatError, msg
@@ -194,7 +194,7 @@ module Net
 
       # Ensure argument is 'nz_number' or raise DataFormatError
       def ensure_nz_number(num)
-        return if valid_nz_number?(num)
+        return num if valid_nz_number?(num)
 
         msg = "nz_number must be non-zero unsigned 32-bit integer: #{num}"
         raise DataFormatError, msg
@@ -202,7 +202,7 @@ module Net
 
       # Ensure argument is 'mod_sequence_value' or raise DataFormatError
       def ensure_mod_sequence_value(num)
-        return if valid_mod_sequence_value?(num)
+        return num if valid_mod_sequence_value?(num)
 
         msg = "mod_sequence_value must be unsigned 64-bit integer: #{num}"
         raise DataFormatError, msg

data/lib/net/imap/deprecated_client_options.rb

@@ -83,10 +83,12 @@ module Net
         elsif deprecated.empty?
           super host, port: port_or_options
         elsif deprecated.shift
-          warn "DEPRECATED: Call Net::IMAP.new with keyword options", uplevel: 1
+          warn("DEPRECATED: Call Net::IMAP.new with keyword options",
+               uplevel: 1, category: :deprecated)
           super host, port: port_or_options, ssl: create_ssl_params(*deprecated)
         else
-          warn "DEPRECATED: Call Net::IMAP.new with keyword options", uplevel: 1
+          warn("DEPRECATED: Call Net::IMAP.new with keyword options",
+               uplevel: 1, category: :deprecated)
           super host, port: port_or_options, ssl: false
         end
       end
@@ -113,7 +115,8 @@ module Net
         elsif deprecated.first.respond_to?(:to_hash)
           super(**Hash.try_convert(deprecated.first))
         else
-          warn "DEPRECATED: Call Net::IMAP#starttls with keyword options", uplevel: 1
+          warn("DEPRECATED: Call Net::IMAP#starttls with keyword options",
+               uplevel: 1, category: :deprecated)
           super(**create_ssl_params(*deprecated))
         end
       end

data/lib/net/imap/errors.rb

@@ -7,41 +7,14 @@ module Net
     class Error < StandardError
     end
 
-    # Error raised when data is in the incorrect format.
-    class DataFormatError < Error
-    end
-
-    # Error raised when the socket cannot be read, due to a Config limit.
-    class ResponseReadError < Error
-    end
-
-    # Error raised when a response is larger than IMAP#max_response_size.
-    class ResponseTooLargeError < ResponseReadError
-      attr_reader :bytes_read, :literal_size
-      attr_reader :max_response_size
-
-      def initialize(msg = nil, *args,
-                     bytes_read:        nil,
-                     literal_size:      nil,
-                     max_response_size: nil,
-                     **kwargs)
-        @bytes_read        = bytes_read
-        @literal_size      = literal_size
-        @max_response_size = max_response_size
-        msg ||= [
-          "Response size", response_size_msg, "exceeds max_response_size",
-          max_response_size && "(#{max_response_size}B)",
-        ].compact.join(" ")
-        super(msg, *args, **kwargs)
+    class LoginDisabledError < Error
+      def initialize(msg = "Remote server has disabled the LOGIN command", ...)
+        super
       end
+    end
 
-      private
-
-      def response_size_msg
-        if bytes_read && literal_size
-          "(#{bytes_read}B read + #{literal_size}B literal)"
-        end
-      end
+    # Error raised when data is in the incorrect format.
+    class DataFormatError < Error
     end
 
     # Error raised when a response from the server is non-parsable.

data/lib/net/imap/response_data.rb

@@ -5,9 +5,6 @@ module Net
     autoload :FetchData,        "#{__dir__}/fetch_data"
     autoload :SearchResult,     "#{__dir__}/search_result"
     autoload :SequenceSet,      "#{__dir__}/sequence_set"
-    autoload :UIDPlusData,      "#{__dir__}/uidplus_data"
-    autoload :AppendUIDData,    "#{__dir__}/uidplus_data"
-    autoload :CopyUIDData,      "#{__dir__}/uidplus_data"
 
     # Net::IMAP::ContinuationRequest represents command continuation requests.
     #
@@ -295,14 +292,6 @@ module Net
     #   because the server doesn't allow deletion of mailboxes with children.
     #   #data is +nil+.
     #
-    # ==== <tt>QUOTA=RES-*</tt> response codes
-    # See {[RFC9208]}[https://www.rfc-editor.org/rfc/rfc9208.html#section-4.3].
-    # * +OVERQUOTA+ (also in RFC5530[https://www.rfc-editor.org/rfc/rfc5530]),
-    #   with a tagged +NO+ response to an +APPEND+/+COPY+/+MOVE+ command when
-    #   the command would put the target mailbox over any quota, and with an
-    #   untagged +NO+ when a mailbox exceeds a soft quota (which may be caused
-    #   be external events).  #data is +nil+.
-    #
     # ==== +CONDSTORE+ extension
     # See {[RFC7162]}[https://www.rfc-editor.org/rfc/rfc7162.html].
     # * +NOMODSEQ+, when selecting a mailbox that does not support
@@ -335,6 +324,60 @@ module Net
       # code data can take.
     end
 
+    # Net::IMAP::UIDPlusData represents the ResponseCode#data that accompanies
+    # the +APPENDUID+ and +COPYUID+ response codes.
+    #
+    # See [[UIDPLUS[https://www.rfc-editor.org/rfc/rfc4315.html]].
+    #
+    # ==== Capability requirement
+    #
+    # The +UIDPLUS+ capability[rdoc-ref:Net::IMAP#capability] must be supported.
+    # A server that supports +UIDPLUS+ should send a UIDPlusData object inside
+    # every TaggedResponse returned by the append[rdoc-ref:Net::IMAP#append],
+    # copy[rdoc-ref:Net::IMAP#copy], move[rdoc-ref:Net::IMAP#move], {uid
+    # copy}[rdoc-ref:Net::IMAP#uid_copy], and {uid
+    # move}[rdoc-ref:Net::IMAP#uid_move] commands---unless the destination
+    # mailbox reports +UIDNOTSTICKY+.
+    #
+    #--
+    # TODO: support MULTIAPPEND
+    #++
+    #
+    class UIDPlusData < Struct.new(:uidvalidity, :source_uids, :assigned_uids)
+      ##
+      # method: uidvalidity
+      # :call-seq: uidvalidity -> nonzero uint32
+      #
+      # The UIDVALIDITY of the destination mailbox.
+
+      ##
+      # method: source_uids
+      # :call-seq: source_uids -> nil or an array of nonzero uint32
+      #
+      # The UIDs of the copied or moved messages.
+      #
+      # Note:: Returns +nil+ for Net::IMAP#append.
+
+      ##
+      # method: assigned_uids
+      # :call-seq: assigned_uids -> an array of nonzero uint32
+      #
+      # The newly assigned UIDs of the copied, moved, or appended messages.
+      #
+      # Note:: This always returns an array, even when it contains only one UID.
+
+      ##
+      # :call-seq: uid_mapping -> nil or a hash
+      #
+      # Returns a hash mapping each source UID to the newly assigned destination
+      # UID.
+      #
+      # Note:: Returns +nil+ for Net::IMAP#append.
+      def uid_mapping
+        source_uids&.zip(assigned_uids)&.to_h
+      end
+    end
+
     # Net::IMAP::MailboxList represents contents of the LIST response,
     # representing a single mailbox path.
     #
@@ -377,24 +420,12 @@ module Net
     # Net::IMAP#getquotaroot returns an array containing both MailboxQuotaRoot
     # and MailboxQuota objects.
     #
-    # ==== Required capability
-    #
-    # Requires +QUOTA+ [RFC2087[https://www.rfc-editor.org/rfc/rfc2087]]
-    # or <tt>QUOTA=RES-STORAGE</tt>
-    # [RFC9208[https://www.rfc-editor.org/rfc/rfc9208]] capability.
     class MailboxQuota < Struct.new(:mailbox, :usage, :quota)
       ##
       # method: mailbox
       # :call-seq: mailbox -> string
       #
-      # The quota root with the associated quota.
-      #
-      # NOTE: this was mistakenly named "mailbox".  But the quota root's name may
-      # differ from the mailbox.  A single quota root may cover multiple
-      # mailboxes, and a single mailbox may be governed by multiple quota roots.
-
-      # The quota root with the associated quota.
-      alias quota_root mailbox
+      # The mailbox with the associated quota.
 
       ##
       # method: usage
@@ -406,7 +437,7 @@ module Net
       # method: quota
       # :call-seq: quota -> Integer
       #
-      # Storage limit imposed on the mailbox.
+      # Quota limit imposed on the mailbox.
       #
     end
 
@@ -908,7 +939,8 @@ module Net
       # for something else?
       #++
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        warn("media_subtype is obsolete, use subtype instead.\n",
+             uplevel: 1, category: :deprecated)
         return subtype
       end
     end
@@ -953,7 +985,8 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        warn("media_subtype is obsolete, use subtype instead.\n",
+             uplevel: 1, category: :deprecated)
         return subtype
       end
     end
@@ -1009,77 +1042,6 @@ module Net
       end
     end
 
-    # BodyTypeAttachment is not used and will be removed in an upcoming release.
-    #
-    # === Bug Analysis
-    #
-    # \IMAP body structures are parenthesized lists and assign their fields
-    # positionally, so missing fields change the interpretation of all
-    # following fields.  Additionally, different body types have a different
-    # number of required fields, followed by optional "extension" fields.
-    #
-    # BodyTypeAttachment was previously returned when a "message/rfc822" part,
-    # which should be sent as <tt>body-type-msg</tt> with ten required fields,
-    # was actually sent as a <tt>body-type-basic</tt> with _seven_ required
-    # fields.
-    #
-    #   basic => type, subtype, param, id, desc, enc, octets, md5=nil,  dsp=nil, lang=nil, loc=nil, *ext
-    #   msg   => type, subtype, param, id, desc, enc, octets, envelope, body,    lines,    md5=nil, ...
-    #
-    # Normally, +envelope+ and +md5+ are incompatible, but Net::IMAP leniently
-    # allowed buggy servers to send +NIL+ for +envelope+.  As a result, when a
-    # server sent a <tt>message/rfc822</tt> part with +NIL+ for +md5+ and a
-    # non-<tt>NIL</tt> +dsp+, Net::IMAP misinterpreted the
-    # <tt>Content-Disposition</tt> as if it were a strange body type.  In all
-    # reported cases, the <tt>Content-Disposition</tt> was "attachment", so
-    # BodyTypeAttachment was created as the workaround.
-    #
-    # === Current behavior
-    #
-    # When interpreted strictly, +envelope+ and +md5+ are incompatible.  So the
-    # current parsing algorithm peeks ahead after it has received the seventh
-    # body field.  If the next token is not the start of an +envelope+, we assume
-    # the server has incorrectly sent us a <tt>body-type-basic</tt> and return
-    # BodyTypeBasic.  As a result, what was previously BodyTypeMessage#body =>
-    # BodyTypeAttachment is now BodyTypeBasic#disposition => ContentDisposition.
-    #
-    class BodyTypeAttachment < Struct.new(:dsp_type, :_unused_, :param)
-      # *invalid for BodyTypeAttachment*
-      def media_type
-        warn(<<~WARN, uplevel: 1)
-          BodyTypeAttachment#media_type is obsolete.  Use dsp_type instead.
-        WARN
-        dsp_type
-      end
-
-      # *invalid for BodyTypeAttachment*
-      def subtype
-        warn("BodyTypeAttachment#subtype is obsolete.\n", uplevel: 1)
-        nil
-      end
-
-      ##
-      # method: dsp_type
-      # :call-seq: dsp_type -> string
-      #
-      # Returns the content disposition type, as defined by
-      # [DISPOSITION[https://tools.ietf.org/html/rfc2183]].
-
-      ##
-      # method: param
-      # :call-seq: param -> hash
-      #
-      # Returns a hash representing parameters of the Content-Disposition
-      # field, as defined by [DISPOSITION[https://tools.ietf.org/html/rfc2183]].
-
-      ##
-      def multipart?
-        return false
-      end
-    end
-
-    deprecate_constant :BodyTypeAttachment
-
     # Net::IMAP::BodyTypeMultipart represents body structures of messages and
     # message parts, when <tt>Content-Type</tt> is <tt>multipart/*</tt>.
     class BodyTypeMultipart < Struct.new(:media_type, :subtype,
@@ -1151,29 +1113,11 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        warn("media_subtype is obsolete, use subtype instead.\n",
+             uplevel: 1, category: :deprecated)
         return subtype
       end
     end
 
-    # === Obsolete
-    # BodyTypeExtension is not used and will be removed in an upcoming release.
-    #
-    # >>>
-    #   BodyTypeExtension was (incorrectly) used for <tt>message/*</tt> parts
-    #   (besides <tt>message/rfc822</tt>, which correctly uses BodyTypeMessage).
-    #
-    #   Net::IMAP now (correctly) parses all message types (other than
-    #   <tt>message/rfc822</tt> or <tt>message/global</tt>) as BodyTypeBasic.
-    class BodyTypeExtension < Struct.new(:media_type, :subtype,
-                                         :params, :content_id,
-                                         :description, :encoding, :size)
-      def multipart?
-        return false
-      end
-    end
-
-    deprecate_constant :BodyTypeExtension
-
   end
 end