mongo 2.18.0 → 2.18.2

data/lib/mongo/crypt/handle.rb

@@ -50,6 +50,15 @@ module Mongo
       #     and schemaMap, an error will be raised.
       # @option options [ Boolean | nil ] :bypass_query_analysis When true
       #   disables automatic analysis of outgoing commands.
+      # @option options [ String | nil ] :crypt_shared_lib_path Path that should
+      #   be  the used to load the crypt shared library. Providing this option
+      #   overrides default crypt shared library load paths for libmongocrypt.
+      # @option options [ Boolean | nil ] :crypt_shared_lib_required Whether
+      #   crypt_shared library is required. If 'true', an error will be raised
+      #   if a crypt_shared library cannot be loaded by libmongocrypt.
+      # @option options [ Boolean | nil ] :explicit_encryption_only Whether this
+      #   handle is going to be used only for explicit encryption. If true,
+      #   libmongocrypt is instructed not to load crypt shared library.
       # @option options [ Logger ] :logger A Logger object to which libmongocrypt logs
       #   will be sent
       def initialize(kms_providers, kms_tls_options, options={})
@@ -70,13 +79,29 @@ module Mongo
         @bypass_query_analysis = options[:bypass_query_analysis]
         set_bypass_query_analysis if @bypass_query_analysis
 
+        @crypt_shared_lib_path = options[:crypt_shared_lib_path]
+        @explicit_encryption_only = options[:explicit_encryption_only]
+        if @crypt_shared_lib_path
+          Binding.setopt_set_crypt_shared_lib_path_override(self, @crypt_shared_lib_path)
+        elsif !@bypass_query_analysis && !@explicit_encryption_only
+          Binding.setopt_append_crypt_shared_lib_search_path(self, "$SYSTEM")
+        end
+
         @logger = options[:logger]
         set_logger_callback if @logger
 
         set_crypto_hooks
 
         Binding.setopt_kms_providers(self, kms_providers.to_document)
+
         initialize_mongocrypt
+
+        @crypt_shared_lib_required = !!options[:crypt_shared_lib_required]
+        if @crypt_shared_lib_required && crypt_shared_lib_version == 0
+          raise Mongo::Error::CryptError.new(
+            "Crypt shared library is required, but cannot be loaded  according to libmongocrypt"
+          )
+        end
       end
 
       # Return the reference to the underlying @mongocrypt object
@@ -96,6 +121,14 @@ module Mongo
         @kms_tls_options.fetch(provider, {})
       end
 
+      def crypt_shared_lib_version
+        Binding.crypt_shared_lib_version(self)
+      end
+
+      def crypt_shared_lib_available?
+        crypt_shared_lib_version != 0
+      end
+
       private
 
       # Set the schema map option on the underlying mongocrypt_t object

data/lib/mongo/crypt/kms.rb

@@ -89,7 +89,6 @@ module Mongo
             %i(
               ssl_verify_certificate
               ssl_verify_hostname
-              ssl_verify_ocsp_endpoint
             ).each do |opt|
               if provider_opts[opt] == false
                 raise ArgumentError.new(

data/lib/mongo/cursor.rb

@@ -251,7 +251,12 @@ module Mongo
     #
     # @since 2.2.0
     def batch_size
-      @view.batch_size && @view.batch_size > 0 ? @view.batch_size : limit
+      value = @view.batch_size && @view.batch_size > 0 ? @view.batch_size : limit
+      if value == 0
+        nil
+      else
+        value
+      end
     end
 
     # Is the cursor closed?

data/lib/mongo/error/invalid_read_option.rb

@@ -31,7 +31,7 @@ module Mongo
       #
       # @since 2.6.0
       def initialize(read_option, msg)
-        super("Invalid read option: #{read_option}: #{msg}")
+        super("Invalid read preference value: #{read_option.inspect}: #{msg}")
       end
     end
   end

data/lib/mongo/operation/aggregate.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/aggregate/command'
 require 'mongo/operation/aggregate/op_msg'
 require 'mongo/operation/aggregate/result'
 
@@ -33,7 +32,7 @@ module Mongo
     # @since 2.0.0
     class Aggregate
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/collections_info.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/collections_info/command'
 require 'mongo/operation/collections_info/result'
 
 module Mongo
@@ -28,23 +27,12 @@ module Mongo
     # @since 2.0.0
     class CollectionsInfo
       include Specifiable
-      include PolymorphicOperation
-      include PolymorphicLookup
+      include OpMsgExecutable
 
       private
 
-      def final_operation(connection)
-         op_class = if connection.features.list_collections_enabled?
-          if connection.features.op_msg_enabled?
-            ListCollections::OpMsg
-          else
-            ListCollections::Command
-          end
-        else
-          CollectionsInfo::Command
-        end
-
-        op_class.new(spec)
+      def final_operation
+        ListCollections::OpMsg.new(spec)
       end
     end
   end

data/lib/mongo/operation/command.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/command/command'
 require 'mongo/operation/command/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class Command
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/count.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/count/command'
 require 'mongo/operation/count/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class Count
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/create.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/create/command'
 require 'mongo/operation/create/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class Create
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/create_index.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/create_index/command'
 require 'mongo/operation/create_index/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class CreateIndex
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/create_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/create_user/command'
 require 'mongo/operation/create_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class CreateUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/delete.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/delete/command'
 require 'mongo/operation/delete/op_msg'
 require 'mongo/operation/delete/result'
 require 'mongo/operation/delete/bulk_result'

data/lib/mongo/operation/distinct.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/distinct/command'
 require 'mongo/operation/distinct/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.5.0
     class Distinct
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/drop.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/drop/command'
 require 'mongo/operation/drop/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.4.0
     class Drop
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/drop_database.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/drop_database/command'
 require 'mongo/operation/drop_database/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.4.0
     class DropDatabase
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/drop_index.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/drop_index/command'
 require 'mongo/operation/drop_index/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class DropIndex
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/explain.rb

@@ -17,8 +17,6 @@
 
 require 'mongo/operation/explain/result'
 require 'mongo/operation/explain/op_msg'
-require 'mongo/operation/explain/command'
-require 'mongo/operation/explain/legacy'
 
 module Mongo
   module Operation
@@ -30,7 +28,7 @@ module Mongo
     # @since 2.5.0
     class Explain
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/find/builder.rb

@@ -17,5 +17,4 @@
 
 require 'mongo/operation/find/builder/command'
 require 'mongo/operation/find/builder/flags'
-require 'mongo/operation/find/builder/legacy'
 require 'mongo/operation/find/builder/modifiers'

data/lib/mongo/operation/find.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/find/command'
 require 'mongo/operation/find/op_msg'
-require 'mongo/operation/find/legacy'
 require 'mongo/operation/find/result'
 require 'mongo/operation/find/builder'
 
@@ -31,7 +29,7 @@ module Mongo
     # @since 2.0.0
     class Find
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/get_more.rb

@@ -16,9 +16,7 @@
 # limitations under the License.
 
 require 'mongo/operation/get_more/command_builder'
-require 'mongo/operation/get_more/command'
 require 'mongo/operation/get_more/op_msg'
-require 'mongo/operation/get_more/legacy'
 require 'mongo/operation/get_more/result'
 
 module Mongo
@@ -31,7 +29,7 @@ module Mongo
     # @since 2.5.0
     class GetMore
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/indexes.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/indexes/command'
 require 'mongo/operation/indexes/op_msg'
-require 'mongo/operation/indexes/legacy'
 require 'mongo/operation/indexes/result'
 
 module Mongo
@@ -30,21 +28,7 @@ module Mongo
     # @since 2.0.0
     class Indexes
       include Specifiable
-      include PolymorphicOperation
-      include PolymorphicLookup
-
-      private
-
-      def final_operation(connection)
-        cls = if connection.features.op_msg_enabled?
-          polymorphic_class(self.class.name, :OpMsg)
-        elsif connection.features.list_indexes_enabled?
-          polymorphic_class(self.class.name, :Command)
-        else
-          polymorphic_class(self.class.name, :Legacy)
-        end
-        cls.new(spec)
-      end
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/insert.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/insert/command'
 require 'mongo/operation/insert/op_msg'
 require 'mongo/operation/insert/result'
 require 'mongo/operation/insert/bulk_result'

data/lib/mongo/operation/kill_cursors.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 
 require 'mongo/operation/kill_cursors/command_builder'
-require 'mongo/operation/kill_cursors/command'
 require 'mongo/operation/kill_cursors/op_msg'
 
 module Mongo
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class KillCursors
       include Specifiable
-      include OpMsgOrFindCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/list_collections.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/list_collections/command'
 require 'mongo/operation/list_collections/op_msg'
 require 'mongo/operation/list_collections/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class ListCollections
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/map_reduce.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/map_reduce/command'
 require 'mongo/operation/map_reduce/op_msg'
 require 'mongo/operation/map_reduce/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.5.0
     class MapReduce
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/parallel_scan.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/parallel_scan/command'
 require 'mongo/operation/parallel_scan/op_msg'
 require 'mongo/operation/parallel_scan/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class ParallelScan
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/remove_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/remove_user/command'
 require 'mongo/operation/remove_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class RemoveUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/shared/{polymorphic_operation.rb → op_msg_executable.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-# Copyright (C) 2021 MongoDB Inc.
+# Copyright (C) 2018-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 module Mongo
   module Operation
 
-    # Shared behavior of implementing an operation differently based on
-    # the server that will be executing the operation.
+    # Shared behavior of executing the operation as an OpMsg.
     #
     # @api private
-    module PolymorphicOperation
+    module OpMsgExecutable
+      include PolymorphicLookup
 
       # Execute the operation.
       #
@@ -46,8 +46,13 @@ module Mongo
       #
       # @return [ Mongo::Operation::Result ] The operation result.
       def execute_with_connection(connection, context:, options: {})
-        operation = final_operation(connection)
-        operation.execute(connection, context: context, options: options)
+        final_operation.execute(connection, context: context, options: options)
+      end
+
+      private
+
+      def final_operation
+        polymorphic_class(self.class.name, :OpMsg).new(spec)
       end
     end
   end

data/lib/mongo/operation/shared/sessions_supported.rb

@@ -257,10 +257,14 @@ module Mongo
         super.tap do |message|
           if session = context.session
             # Serialize the message to detect client-side problems,
-            # such as invalid BSON keys. The message will be serialized again
+            # such as invalid BSON keys or too large messages.
+            # The message will be serialized again
             # later prior to being sent to the connection.
-            message.serialize(BSON::ByteBuffer.new)
-
+            buf = BSON::ByteBuffer.new
+            message.serialize(buf)
+            if buf.length > connection.max_message_size
+              raise Error::MaxMessageSize.new(connection.max_message_size)
+            end
             session.update_state!
           end
         end

data/lib/mongo/operation/update.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/update/command'
 require 'mongo/operation/update/op_msg'
 require 'mongo/operation/update/result'
 require 'mongo/operation/update/bulk_result'

data/lib/mongo/operation/update_user.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/update_user/command'
 require 'mongo/operation/update_user/op_msg'
 
 module Mongo
@@ -28,7 +27,7 @@ module Mongo
     # @since 2.0.0
     class UpdateUser
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/users_info.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/users_info/command'
 require 'mongo/operation/users_info/op_msg'
 require 'mongo/operation/users_info/result'
 
@@ -29,7 +28,7 @@ module Mongo
     # @since 2.0.0
     class UsersInfo
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation/write_command.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/write_command/command'
 require 'mongo/operation/write_command/op_msg'
 
 module Mongo
@@ -26,7 +25,7 @@ module Mongo
     # @api private
     class WriteCommand
       include Specifiable
-      include OpMsgOrCommand
+      include OpMsgExecutable
     end
   end
 end

data/lib/mongo/operation.rb

@@ -9,7 +9,6 @@ require 'mongo/operation/shared/executable'
 require 'mongo/operation/shared/executable_no_validate'
 require 'mongo/operation/shared/executable_transaction_label'
 require 'mongo/operation/shared/polymorphic_lookup'
-require 'mongo/operation/shared/polymorphic_operation'
 require 'mongo/operation/shared/polymorphic_result'
 require 'mongo/operation/shared/read_preference_supported'
 require 'mongo/operation/shared/bypass_document_validation'
@@ -22,8 +21,7 @@ require 'mongo/operation/shared/idable'
 require 'mongo/operation/shared/specifiable'
 require 'mongo/operation/shared/validatable'
 require 'mongo/operation/shared/object_id_generator'
-require 'mongo/operation/shared/op_msg_or_command'
-require 'mongo/operation/shared/op_msg_or_find_command'
+require 'mongo/operation/shared/op_msg_executable'
 
 require 'mongo/operation/op_msg_base'
 require 'mongo/operation/command'

data/lib/mongo/protocol.rb

@@ -10,12 +10,9 @@ require 'mongo/protocol/caching_hash'
 
 # Client Requests
 require 'mongo/protocol/compressed'
-require 'mongo/protocol/delete'
 require 'mongo/protocol/get_more'
-require 'mongo/protocol/insert'
 require 'mongo/protocol/kill_cursors'
 require 'mongo/protocol/query'
-require 'mongo/protocol/update'
 require 'mongo/protocol/msg'
 
 # Server Responses