mongo 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b03a2e7ce5246f9d38690f731f53d29a5469d30
-  data.tar.gz: aaca95e6f570d466155c87d4c549a4f3c5bc0341
+  metadata.gz: 70bb36aedc302fa28a3103c1216e865448733b54
+  data.tar.gz: 05f39ba3e498bd4763f89ca4ac7b30d9d5b3537f
 SHA512:
-  metadata.gz: f6fa180a5c94bcb5d7a809d170c8ec12ec28d0d6035575ef0cc677b9f4c68ec81c26411948f071945b2b2d829b192e0312f29416d2c3a589830c5ee40f90b133
-  data.tar.gz: fce85899375de257592434225cd1db4e3d3971e8b85b6ec111ef30c967e0fa0e817569b843dc0f3c342d7e58749c259a8111cc2b9d741ef321dc335a1ad08bab
+  metadata.gz: 704bcf79dd037eeb329fd5e9120d9ead72b80f8bf4897e9260e2b624afad5c280feb0300228cee83b8ff639f97ef288e9dcf4ea7d6aa86b519e2e6f15853e688
+  data.tar.gz: c25ecaaee43f90ee59c501712aa8632802a31136deebc90cebaa6bb31ba419be5ba44ad9ad5f5f1c721bf36c722c6828e65bf340fdf34b41f967a91f0414e7bd

data/lib/mongo.rb

@@ -15,6 +15,7 @@
 require 'forwardable'
 require 'bson'
 require 'openssl'
+require 'mongo/bson'
 require 'mongo/options'
 require 'mongo/loggable'
 require 'mongo/monitoring'

data/lib/mongo/bson.rb

@@ -0,0 +1,32 @@
+# Copyright (C) 2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Patch for allowing deprecated symbols to be used.
+#
+# @since 2.2.1
+class Symbol
+
+  # Overrides the default BSON type to use the symbol type instead of a
+  # string type.
+  #
+  # @example Get the bson type.
+  #   :test.bson_type
+  #
+  # @return [ String ] The charater 14.
+  #
+  # @since 2.2.1
+  def bson_type
+    BSON::Symbol::BSON_TYPE
+  end
+end

data/lib/mongo/cursor.rb

@@ -33,9 +33,11 @@ module Mongo
   class Cursor
     extend Forwardable
     include Enumerable
+    include Retryable
 
     def_delegators :@view, :collection, :limit
     def_delegators :collection, :client, :database
+    def_delegators :@server, :cluster
 
     # @return [ Collection::View ] view The collection view.
     attr_reader :view
@@ -157,7 +159,9 @@ module Mongo
     end
 
     def get_more
-      process(get_more_operation.execute(@server.context))
+      read_with_retry do
+        process(get_more_operation.execute(@server.context))
+      end
     end
 
     def get_more_operation
@@ -169,7 +173,9 @@ module Mongo
     end
 
     def kill_cursors
-      kill_cursors_operation.execute(@server.context)
+      read_with_retry do
+        kill_cursors_operation.execute(@server.context)
+      end
     end
 
     def kill_cursors_operation

data/lib/mongo/error/operation_failure.rb

@@ -32,10 +32,12 @@ module Mongo
         "can't connect",
         'no master',
         'not master',
+        'could not contact primary',
         'connect failed',
         'error querying',
         'could not get last error',
-        'connection attempt failed'
+        'connection attempt failed',
+        'interrupted at shutdown'
       ].freeze
 
       # Can the operation that caused the error be retried?

data/lib/mongo/protocol/message.rb

@@ -67,6 +67,11 @@ module Mongo
       # @since 2.2.0
       Q = 'q'.freeze
 
+      # Default max message size of 48MB.
+      #
+      # @since 2.2.1
+      MAX_MESSAGE_SIZE = 50331648.freeze
+
       # Returns the request id for the message
       #
       # @return [Fixnum] The request id for this message
@@ -100,10 +105,19 @@ module Mongo
 
       # Deserializes messages from an IO stream
       #
-      # @param io [IO] Stream containing a message
-      # @return [Message] Instance of a Message class
-      def self.deserialize(io)
+      # @param [ Integer ] max_message_size The max message size.
+      # @param [ IO ] io Stream containing a message
+      #
+      # @return [ Message ] Instance of a Message class
+      def self.deserialize(io, max_message_size = MAX_MESSAGE_SIZE)
         length = deserialize_header(BSON::ByteBuffer.new(io.read(16))).first
+
+        # Protection from potential DOS man-in-the-middle attacks. See
+        # DRIVERS-276.
+        if length > max_message_size
+          raise Error::MaxMessageSize.new(max_message_size)
+        end
+
         buffer = BSON::ByteBuffer.new(io.read(length - 16))
         message = allocate
         fields.each do |field|

data/lib/mongo/retryable.rb

@@ -24,6 +24,11 @@ module Mongo
     # @since 2.1.0
     NOT_MASTER = 'not master'.freeze
 
+    # Could not contact primary error message, seen on stepdowns
+    #
+    # @since 2.2.0
+    COULD_NOT_CONTACT_PRIMARY = 'could not contact primary'.freeze
+
     # Execute a read operation with a retry.
     #
     # @api private
@@ -83,7 +88,7 @@ module Mongo
       begin
         block.call
       rescue Error::OperationFailure => e
-        if e.message.include?(NOT_MASTER)
+        if e.message.include?(NOT_MASTER) || e.message.include?(COULD_NOT_CONTACT_PRIMARY)
           retry_operation(&block)
         else
           raise e

data/lib/mongo/server/connectable.rb

@@ -104,7 +104,7 @@ module Mongo
 
       def read
         ensure_connected do |socket|
-          Protocol::Reply.deserialize(socket)
+          Protocol::Reply.deserialize(socket, max_message_size)
         end
       end
     end

data/lib/mongo/server/connection.rb

@@ -168,7 +168,7 @@ module Mongo
       def ping
         ensure_connected do |socket|
           socket.write(PING_BYTES)
-          reply = Protocol::Reply.deserialize(socket)
+          reply = Protocol::Reply.deserialize(socket, max_message_size)
           reply.documents[0][Operation::Result::OK] == 1
         end
       end

data/lib/mongo/server/monitor/connection.rb

@@ -57,18 +57,6 @@ module Mongo
           end
         end
 
-        # Get the connection timeout.
-        #
-        # @example Get the connection timeout.
-        #   connection.timeout
-        #
-        # @return [ Float ] The connection timeout in seconds.
-        #
-        # @since 2.0.0
-        def timeout
-          @timeout ||= options[:connect_timeout] || CONNECT_TIMEOUT
-        end
-
         # Tell the underlying socket to establish a connection to the host.
         #
         # @example Connect to the host.
@@ -128,6 +116,18 @@ module Mongo
           @socket = nil
           @pid = Process.pid
         end
+
+        # Get the connection timeout.
+        #
+        # @example Get the connection timeout.
+        #   connection.timeout
+        #
+        # @return [ Float ] The connection timeout in seconds.
+        #
+        # @since 2.0.0
+        def timeout
+          @timeout ||= options[:connect_timeout] || CONNECT_TIMEOUT
+        end
       end
     end
   end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

data/spec/mongo/bson_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Symbol do
+
+  describe '#bson_type' do
+
+    it 'serializes to a symbol type' do
+      expect(:test.bson_type).to eq(14.chr)
+    end
+  end
+end

data/spec/mongo/cursor_spec.rb

@@ -61,13 +61,35 @@ describe Mongo::Cursor do
           authorized_collection.delete_many
         end
 
-        it 'returns the correct amount' do
-          expect(cursor.to_a.count).to eq(102)
+        context 'when a getmore gets a socket error' do
+
+          let(:op) do
+            double('operation')
+          end
+
+          before do
+            expect(cursor).to receive(:get_more_operation).and_return(op).ordered
+            expect(op).to receive(:execute).and_raise(Mongo::Error::SocketError).ordered
+            expect(cursor).to receive(:get_more_operation).and_call_original.ordered
+          end
+
+          it 'iterates the documents' do
+            cursor.each do |doc|
+              expect(doc).to have_key('field')
+            end
+          end
         end
 
-        it 'iterates the documents' do
-          cursor.each do |doc|
-            expect(doc).to have_key('field')
+        context 'when no errors occur' do
+
+          it 'returns the correct amount' do
+            expect(cursor.to_a.count).to eq(102)
+          end
+
+          it 'iterates the documents' do
+            cursor.each do |doc|
+              expect(doc).to have_key('field')
+            end
           end
         end
       end

data/spec/mongo/protocol/reply_spec.rb

@@ -86,6 +86,17 @@ describe Mongo::Protocol::Reply do
 
   describe '#deserialize' do
 
+    context 'when the message size is greater than the max message size' do
+
+      let(:length) { Mongo::Protocol::Message::MAX_MESSAGE_SIZE + 1 }
+
+      it 'raises a max message size error' do
+        expect {
+          reply
+        }.to raise_error(Mongo::Error::MaxMessageSize)
+      end
+    end
+
     describe 'response flags' do
 
       context 'no flags' do

data/spec/support/server_discovery_and_monitoring.rb

@@ -150,7 +150,7 @@ module Mongo
     # @since 2.0.0
     class Outcome
 
-      # @return [ Array<Array<String, Hash>>] servers The expecations for
+      # @return [ Hash ] servers The expecations for
       #   server states.
       attr_reader :servers
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -9,30 +9,8 @@ authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
-  ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE1MTIwNzE1MTcyNloXDTE2MTIwNjE1MTcyNlowQjEUMBIGA1UEAwwL
-  ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
-  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
-  bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
-  IQ+iI/9+E+ArJ+rbGV3dDPQ+SLl3mLT+vXjfjcxMqI2IW6UuVtt2U3Rxd4QU0kdT
-  JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
-  4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
-  5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
-  u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-  BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
-  QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAL/5shZXBvCGGJcJqXyD2CJieOOH4EGUt/UKvSZ58lMz
-  QkW5aKG22GJbXesMq+dMm/+gzUB2ea9TzttBEE5ZM/eNvoxyf7yNUcFyLQ365S6P
-  rtQOj1Ms7ud5ffrhZJn1o7ayfY2ljQU0xLI2Yoyzl9XJq8U0TztS6Vk5wYIoLwUX
-  NWGRSbETPJyR4mtUEbgI5A+N7pakJPUKKK1zXzADflsx51jjP5rZJJltnoVsBBgN
-  EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
-  wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
-  -----END CERTIFICATE-----
-date: 2015-12-07 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -59,6 +37,7 @@ files:
 - README.md
 - Rakefile
 - bin/mongo_console
+- lib/csasl/csasl.bundle
 - lib/mongo.rb
 - lib/mongo/address.rb
 - lib/mongo/address/ipv4.rb
@@ -76,6 +55,7 @@ files:
 - lib/mongo/auth/user/view.rb
 - lib/mongo/auth/x509.rb
 - lib/mongo/auth/x509/conversation.rb
+- lib/mongo/bson.rb
 - lib/mongo/bulk_write.rb
 - lib/mongo/bulk_write/combineable.rb
 - lib/mongo/bulk_write/ordered_combiner.rb
@@ -304,6 +284,7 @@ files:
 - spec/mongo/auth/user_spec.rb
 - spec/mongo/auth/x509_spec.rb
 - spec/mongo/auth_spec.rb
+- spec/mongo/bson_spec.rb
 - spec/mongo/bulk_write/ordered_combiner_spec.rb
 - spec/mongo/bulk_write/unordered_combiner_spec.rb
 - spec/mongo/bulk_write_spec.rb
@@ -568,7 +549,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
@@ -586,6 +567,7 @@ test_files:
 - spec/mongo/auth/user_spec.rb
 - spec/mongo/auth/x509_spec.rb
 - spec/mongo/auth_spec.rb
+- spec/mongo/bson_spec.rb
 - spec/mongo/bulk_write/ordered_combiner_spec.rb
 - spec/mongo/bulk_write/unordered_combiner_spec.rb
 - spec/mongo/bulk_write_spec.rb