[PATCH] Fix StartTLS stripping vulnerability

Reported by Alexandr Savca in https://hackerone.com/reports/1178562

Co-authored-by: Shugo Maeda <shugo@ruby-lang.org>
Gbp-Pq: Name CVE-2021-32066.patch

diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 439ca1320602b830eb18a4b72874afacc0e1c2e5..2dc2f4c03388b66494e14a4bbe9198262d633e41 100644 (file)
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1192,12 +1192,14 @@ module Net
       end
       resp = @tagged_responses.delete(tag)
       case resp.name
+      when /\A(?:OK)\z/ni
+        return resp
       when /\A(?:NO)\z/ni
         raise NoResponseError, resp
       when /\A(?:BAD)\z/ni
         raise BadResponseError, resp
       else
-        return resp
+        raise UnknownResponseError, resp
       end
     end
 
@@ -3640,6 +3642,10 @@ module Net
     class ByeResponseError < ResponseError
     end
 
+    # Error raised upon an unknown response from the server.
+    class UnknownResponseError < ResponseError
+    end
+
     # Error raised when too many flags are interned to symbols.
     class FlagCountError < Error
     end

diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index cdd9323c10d366451707ec4b289e86e31bf5e231..2bee064a41f988418069022c288408bb23de8c30 100644 (file)
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -129,6 +129,16 @@ class IMAPTest < Test::Unit::TestCase
         imap.disconnect
       end
     end
+
+    def test_starttls_stripping
+      starttls_stripping_test do |port|
+        imap = Net::IMAP.new("localhost", :port => port)
+        assert_raise(Net::IMAP::UnknownResponseError) do
+          imap.starttls(:ca_file => CA_FILE)
+        end
+        imap
+      end
+    end
   end
 
   def test_unexpected_eof
@@ -603,6 +613,27 @@ class IMAPTest < Test::Unit::TestCase
     end
   end
 
+  def starttls_stripping_test
+    server = create_tcp_server
+    port = server.addr[1]
+    @threads << Thread.start do
+      sock = server.accept
+      begin
+        sock.print("* OK test server\r\n")
+        sock.gets
+        sock.print("RUBY0001 BUG unhandled command\r\n")
+      ensure
+        sock.close
+        server.close
+      end
+    end
+    begin
+      imap = yield(port)
+    ensure
+      imap.disconnect if imap && !imap.disconnected?
+    end
+  end
+
   def create_tcp_server
     return TCPServer.new(SERVER_ADDR, 0)
   end