mongo 2.11.6 → 2.12.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f8d74abb00ab2e9753a3918841a7242a83e956c91f88fe5182febd2fba7897
-  data.tar.gz: 6de9cab3c254bec7adba15f964806188d8eb664100dd0aa1fe0d6608841ae2de
+  metadata.gz: 056e2cbfcb67349d4d1c9c530c110e8d27b9a7035b202b52665b8cddc3c5d3f7
+  data.tar.gz: cd3752037a07e808bb9c45714546cd9cb450d6cfdae632bb81c09bc269e88b71
 SHA512:
-  metadata.gz: 7c1e95f38f68232e57fc3f39195053dfaa7ac1aa1e0b2f80bea847bbaf0db108c671a4cca5ccdb92951822203de784bd4d8152d3721edf7424da43ed20586800
-  data.tar.gz: 1c7ce8ac18fb2a899166fca64831c9cc18fee6b217f60f0dbfb1006f6b7ef831b34a5d6e7e1a39414b3e1109cb6fc76e0eff90c2a359166b6cfb074bfceedd5a
+  metadata.gz: 13e11a08e91b16021e2fbe9663de2e1fe8319f547cebb3c101b6519ab45993eb3abdbbe18f8e48b3b7591a595c448f0cbb6d8077237c69331cbca8dcf6ff3a9f
+  data.tar.gz: a1bb9120bac5385a6adf16ee960c3f8529c1c7c075dfd77ada2e9e7370ef4aecd5bbf1a94df3c099966800066db9824158235a2ca69e6e7d3bf0864d0defc426

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-'?��iḫ����K�]��f�,VI8>H�썟��*��4��&�O�K>4u `+/�Ql
-m�2�z��xR��BY��*E�Y8�^���g��J���"l�b4&�S�ZE\9�g�>?&/��$Uc	�O��$=`�dB\.����~�ѵ�盀Z�Ug��88Q�<O �"`����0B����콰�-�mؑ���c�����~�6!(�w@�l-!�����~�Cڹa��mZ�f�2���1�'S�
+ z��$���l��C��$6�{᪑m|B{��B�R����1��?k��ڛ�ޑ��X����8uX��:��/*"�so	E��^��zU�%cD��ƺ���v���/���ý'Y�	�P����rPV��h�o%��3��zK�RYN�0g�������>%�';8�hހx�:����r�N3����M��n�e;�V�F
��ш�1�S#ߑ߯�eDr�����H�A�G���7i�@1�Ţ����
+6

data/CONTRIBUTING.md

@@ -23,7 +23,7 @@ Environment
 We recommend using [rbenv](https://github.com/sstephenson/rbenv) to set up
 the Ruby development and testing environments, though other tools like
 [RVM](https://rvm.io/) will also work. The driver currently supports
-MRI 2.3-2.6 and JRuby 9.2.
+MRI 2.3-2.7 and JRuby 9.2.
 
 A MongoDB cluster is required to run the tests. Setup procedures and
 recommendations for various clusters, as well as how to configure the

data/lib/mongo.rb

@@ -49,6 +49,7 @@ require 'mongo/cluster'
 require 'mongo/cursor'
 require 'mongo/collection'
 require 'mongo/database'
+require 'mongo/crypt'
 require 'mongo/client' # Purposely out-of-order so that database is loaded first
 require 'mongo/dbref'
 require 'mongo/grid'
@@ -58,7 +59,9 @@ require 'mongo/server_selector'
 require 'mongo/session'
 require 'mongo/socket'
 require 'mongo/srv'
+require 'mongo/timeout'
 require 'mongo/uri'
 require 'mongo/version'
 require 'mongo/write_concern'
 require 'mongo/lint'
+require 'mongo/client_encryption'

data/lib/mongo/address.rb

@@ -193,11 +193,22 @@ module Mongo
         connect_timeout: Server::CONNECT_TIMEOUT,
       }.update(options)
 
+      # When the driver connects to "localhost", it only attempts IPv4
+      # connections. When the driver connects to other hosts, it will
+      # attempt both IPv4 and IPv6 connections.
       family = (host == LOCALHOST) ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
       error = nil
-      ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).each do |info|
+      # Sometimes Socket#getaddrinfo returns the same info more than once
+      # (multiple identical items in the returned array). It does not make
+      # sense to try to connect to the same address more than once, thus
+      # eliminate duplicates here.
+      infos = ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM)
+      results = infos.map do |info|
+        [info[4], info[3]]
+      end.uniq
+      results.each do |family, address_str|
         begin
-          specific_address = FAMILY_MAP[info[4]].new(info[3], port, host)
+          specific_address = FAMILY_MAP[family].new(address_str, port, host)
           socket = specific_address.socket(socket_timeout, ssl_options, options)
           return socket
         rescue IOError, SystemCallError, Error::SocketTimeoutError, Error::SocketError => e

data/lib/mongo/auth.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/auth/credential_cache'
 require 'mongo/auth/cr'
 require 'mongo/auth/ldap'
 require 'mongo/auth/scram'

data/lib/mongo/auth/credential_cache.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2019 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.
+
+module Mongo
+  module Auth
+
+    # Cache store for computed SCRAM credentials.
+    #
+    # @api private
+    module CredentialCache
+
+      class << self
+        attr_reader :store
+      end
+
+      module_function def get(key)
+        @store ||= {}
+        @store[key]
+      end
+
+      module_function def set(key, value)
+        @store ||= {}
+        @store[key] = value
+      end
+
+      module_function def cache(key)
+        value = get(key)
+        if value.nil?
+          value = yield
+          set(key, value)
+        end
+        value
+      end
+
+      module_function def clear
+        @store = {}
+      end
+    end
+  end
+end

data/lib/mongo/auth/scram/conversation.rb

@@ -36,6 +36,7 @@ module Mongo
         # The client key string.
         #
         # @since 2.0.0
+        # @deprecated
         CLIENT_KEY = 'Client Key'.freeze
 
         # The key for the done field in the responses.
@@ -78,6 +79,7 @@ module Mongo
         # The server key string.
         #
         # @since 2.0.0
+        # @deprecated
         SERVER_KEY = 'Server Key'.freeze
 
         # The server signature verifier in the response.
@@ -113,12 +115,6 @@ module Mongo
         def continue(reply, connection)
           validate_first_message!(reply, connection.server)
 
-          # The salted password needs to be calculated now; otherwise, if the
-          # client key is cached from a previous authentication, the salt in the
-          # reply will no longer be available for when the salted password is
-          # needed to calculate the server key.
-          salted_password
-
           if connection && connection.features.op_msg_enabled?
             selector = CLIENT_CONTINUE_MESSAGE.merge(
               payload: client_final_message,
@@ -234,7 +230,6 @@ module Mongo
 
           @user = user
           @nonce = SecureRandom.base64
-          @client_key = user.send(:client_key)
           @mechanism = mechanism
         end
 
@@ -301,9 +296,9 @@ module Mongo
         #
         # @since 2.0.0
         def client_key
-          @client_key ||= hmac(salted_password, CLIENT_KEY)
-          user.instance_variable_set(:@client_key, @client_key) unless user.send(:client_key)
-          @client_key
+          @client_key ||= CredentialCache.cache(cache_key(:client_key)) do
+            hmac(salted_password, 'Client Key')
+          end
         end
 
         # Client proof algorithm implementation.
@@ -429,6 +424,11 @@ module Mongo
           @salt ||= payload_data.match(SALT)[1]
         end
 
+        # @api private
+        def cache_key(*extra)
+          [user.password, salt, iterations, @mechanism] + extra
+        end
+
         # Salted password algorithm implementation.
         #
         # @api private
@@ -437,11 +437,13 @@ module Mongo
         #
         # @since 2.0.0
         def salted_password
-          @salted_password ||= case @mechanism
-          when :scram256
-            hi(user.sasl_prepped_password)
-          else
-            hi(user.hashed_password)
+          @salted_password ||= CredentialCache.cache(cache_key(:salted_password)) do
+            case @mechanism
+            when :scram256
+              hi(user.sasl_prepped_password)
+            else
+              hi(user.hashed_password)
+            end
           end
         end
 
@@ -453,7 +455,9 @@ module Mongo
         #
         # @since 2.0.0
         def server_key
-          @server_key ||= hmac(salted_password, SERVER_KEY)
+          @server_key ||= CredentialCache.cache(cache_key(:server_key)) do
+            hmac(salted_password, 'Server Key')
+          end
         end
 
         # Server signature algorithm implementation.

data/lib/mongo/auth/user.rb

@@ -155,8 +155,6 @@ module Mongo
       #   If :password and :pwd are both specified, :password takes precedence.
       # @option options [ Symbol ] :auth_mech The authorization mechanism.
       # @option options [ Array<String>, Array<Hash> ] roles The user roles.
-      # @option options [ String ] :client_key The user's client key cached from a previous
-      #   authentication on the same connection.
       #
       # @since 2.0.0
       def initialize(options)
@@ -186,7 +184,6 @@ module Mongo
         end
         @auth_mech_properties = options[:auth_mech_properties] || {}
         @roles = options[:roles] || []
-        @client_key = options[:client_key]
       end
 
       # Get the specification for the user, used in creation.
@@ -207,11 +204,6 @@ module Mongo
 
       private
 
-      # The client key for the user.
-      #
-      # @return [ String ] The client key for the user.
-      attr_reader :client_key
-
       # Generate default auth source based on the URI and options
       #
       # @api private

data/lib/mongo/auth/user/view.rb

@@ -50,7 +50,7 @@ module Mongo
               db_name: database.name,
               session: session,
               write_concern: options[:write_concern] && WriteConcern.get(options[:write_concern]),
-            ).execute(next_primary(nil, session))
+            ).execute(next_primary(nil, session), client: client)
           end
         end
 
@@ -87,7 +87,7 @@ module Mongo
               db_name: database.name,
               session: session,
               write_concern: options[:write_concern] && WriteConcern.get(options[:write_concern]),
-            ).execute(next_primary(nil, session))
+            ).execute(next_primary(nil, session), client: client)
           end
         end
 
@@ -113,7 +113,7 @@ module Mongo
               db_name: database.name,
               session: session,
               write_concern: options[:write_concern] && WriteConcern.get(options[:write_concern]),
-            ).execute(next_primary(nil, session))
+            ).execute(next_primary(nil, session), client: client)
           end
         end
 
@@ -142,7 +142,7 @@ module Mongo
               user_name: name,
               db_name: database.name,
               session: session
-            ).execute(next_primary(nil, session))
+            ).execute(next_primary(nil, session), client: client)
           end
         end
 

data/lib/mongo/background_thread.rb

@@ -122,7 +122,7 @@ module Mongo
             @thread.join
           end
           break
-        rescue Timeout::Error
+        rescue ::Timeout::Error
         end
       end
 

data/lib/mongo/bulk_write.rb

@@ -203,28 +203,28 @@ module Mongo
 
     def delete_one(documents, server, operation_id, session, txn_num)
       spec = base_spec(operation_id, session).merge(:deletes => documents, :txn_num => txn_num)
-      Operation::Delete.new(spec).bulk_execute(server)
+      Operation::Delete.new(spec).bulk_execute(server, client: client)
     end
 
     def delete_many(documents, server, operation_id, session, txn_num)
       spec = base_spec(operation_id, session).merge(:deletes => documents)
-      Operation::Delete.new(spec).bulk_execute(server)
+      Operation::Delete.new(spec).bulk_execute(server, client: client)
     end
 
     def insert_one(documents, server, operation_id, session, txn_num)
       spec = base_spec(operation_id, session).merge(:documents => documents, :txn_num => txn_num)
-      Operation::Insert.new(spec).bulk_execute(server)
+      Operation::Insert.new(spec).bulk_execute(server, client: client)
     end
 
     def update_one(documents, server, operation_id, session, txn_num)
       spec = base_spec(operation_id, session).merge(:updates => documents, :txn_num => txn_num)
-      Operation::Update.new(spec).bulk_execute(server)
+      Operation::Update.new(spec).bulk_execute(server, client: client)
     end
     alias :replace_one :update_one
 
     def update_many(documents, server, operation_id, session, txn_num)
       spec = base_spec(operation_id, session).merge(:updates => documents)
-      Operation::Update.new(spec).bulk_execute(server)
+      Operation::Update.new(spec).bulk_execute(server, client: client)
     end
   end
 end

data/lib/mongo/client.rb

@@ -27,6 +27,7 @@ module Mongo
     #
     # @since 2.1.0
     CRUD_OPTIONS = [
+      :auto_encryption_options,
       :database,
       :read, :read_concern,
       :write, :write_concern,
@@ -53,6 +54,7 @@ module Mongo
       :auth_mech,
       :auth_mech_properties,
       :auth_source,
+      :auto_encryption_options,
       :cleanup,
       :compressors,
       :connect,
@@ -119,6 +121,10 @@ module Mongo
     # @return [ Hash ] options The configuration options.
     attr_reader :options
 
+    # @return [ Mongo::Crypt::AutoEncrypter ] The object that encapsulates
+    #   auto-encryption behavior
+    attr_reader :encrypter
+
     # Delegate command and collections execution to the current database.
     def_delegators :@database, :command, :collections
 
@@ -369,6 +375,44 @@ module Mongo
     #   See Ruby's Zlib module for valid levels.
     # @option options [ Hash ] :resolv_options For internal driver use only.
     #   Options to pass through to Resolv::DNS constructor for SRV lookups.
+    # @option options [ Hash ] :auto_encryption_options Auto-encryption related
+    #   options.
+    #   - :key_vault_client => Client | nil, a client connected to the MongoDB
+    #     instance containing the encryption key vault
+    #   - :key_vault_namespace => String, the namespace of the key vault in the
+    #     format database.collection
+    #   - :kms_providers => Hash, A hash of key management service configuration
+    #     information. Valid hash keys are :local or :aws. There may be more
+    #     than one kms provider specified.
+    #   - :schema_map => Hash | nil, JSONSchema for one or more collections
+    #     specifying which fields should be encrypted.
+    #     - Note: Schemas supplied in the schema_map only apply to configuring
+    #       automatic encryption for client side encryption. Other validation
+    #       rules in the JSON schema will not be enforced by the driver and will
+    #       result in an error.
+    #     - Note: Supplying a schema_map provides more security than relying on
+    #       JSON Schemas obtained from the server. It protects against a
+    #       malicious server advertising a false JSON Schema, which could trick
+    #       the client into sending unencrypted data that should be encrypted.
+    #   - :bypass_auto_encryption => Boolean, when true, disables auto encryption;
+    #     defaults to false.
+    #   - :extra_options => Hash | nil, options related to spawning mongocryptd
+    #     (this part of the API is subject to change).
+    #
+    #   Notes on automatic encryption:
+    #   - Automatic encryption is an enterprise only feature that only applies
+    #     to operations on a collection.
+    #   - Automatic encryption is not supported for operations on a database or
+    #     view.
+    #   - Automatic encryption requires the authenticated user to have the
+    #     listCollections privilege.
+    #   - At worst, automatic encryption may triple the number of connections
+    #     used by the Client at any one time.
+    #   - If automatic encryption fails on an operation, use a MongoClient
+    #     configured with bypass_auto_encryption: true and use
+    #     ClientEncryption.encrypt to manually encrypt values.
+    #   - Enabling Client Side Encryption reduces the maximum write batch size
+    #     and may have a negative performance impact.
     #
     # @since 2.0.0
     def initialize(addresses_or_uri, options = nil)
@@ -425,11 +469,21 @@ module Mongo
         sdam_proc.call(self)
       end
 
-      @cluster = Cluster.new(addresses, @monitoring, cluster_options.merge(srv_uri: srv_uri))
+      @connect_lock = Mutex.new
+      @connect_lock.synchronize do
+        @cluster = Cluster.new(addresses, @monitoring,
+          cluster_options.merge(srv_uri: srv_uri))
+      end
 
       # Unset monitoring, it will be taken out of cluster from now on
       remove_instance_variable('@monitoring')
 
+      if @options[:auto_encryption_options]
+        @connect_lock.synchronize do
+          build_encrypter
+        end
+      end
+
       yield(self) if block_given?
     end
 
@@ -616,6 +670,8 @@ module Mongo
     #
     # @api private
     def update_options(new_options)
+      old_options = @options
+
       validate_new_options!(new_options).tap do |opts|
         # Our options are frozen
         options = @options.dup
@@ -625,8 +681,25 @@ module Mongo
         if options[:write_concern] && opts[:write]
           options.delete(:write_concern)
         end
+
         options.update(opts)
         @options = options.freeze
+
+        auto_encryption_options_changed =
+          @options[:auto_encryption_options] != old_options[:auto_encryption_options]
+
+        # If there are new auto_encryption_options, create a new encrypter.
+        # Otherwise, allow the new client to share an encrypter with the
+        # original client.
+        #
+        # If auto_encryption_options are nil, set @encrypter to nil, but do not
+        # close the encrypter because it may still be used by the original client.
+        if @options[:auto_encryption_options] && auto_encryption_options_changed
+          build_encrypter
+        elsif @options[:auto_encryption_options].nil?
+          @encrypter = nil
+        end
+
         validate_options!
         validate_authentication_options!
       end
@@ -664,7 +737,18 @@ module Mongo
     #
     # @since 2.1.0
     def close
-      @cluster.disconnect!
+      @connect_lock.synchronize do
+        do_close
+      end
+      true
+    end
+
+    # Close encrypter and clean up auto-encryption resources.
+    #
+    # @return [ true ] Always true.
+    def close_encrypter
+      @encrypter.close if @encrypter
+
       true
     end
 
@@ -679,9 +763,16 @@ module Mongo
     def reconnect
       addresses = cluster.addresses.map(&:to_s)
 
-      @cluster.disconnect! rescue nil
+      @connect_lock.synchronize do
+        do_close rescue nil
+
+        @cluster = Cluster.new(addresses, monitoring, cluster_options)
+
+        if @options[:auto_encryption_options]
+          build_encrypter
+        end
+      end
 
-      @cluster = Cluster.new(addresses, monitoring, cluster_options)
       true
     end
 
@@ -805,6 +896,13 @@ module Mongo
 
     private
 
+    # Create a new encrypter object using the client's auto encryption options
+    def build_encrypter
+      @encrypter = Crypt::AutoEncrypter.new(
+        @options[:auto_encryption_options].merge(client: self)
+      )
+    end
+
     # Generate default client options based on the URI and options
     # passed into the Client constructor.
     def default_options(options)
@@ -822,6 +920,12 @@ module Mongo
       end
     end
 
+    # Implementation for #close, assumes the connect lock is already acquired.
+    def do_close
+      @cluster.disconnect!
+      close_encrypter
+    end
+
     # If options[:session] is set, validates that session and returns it.
     # If deployment supports sessions, creates a new session and returns it.
     # The session is implicit unless options[:implicit] is given.
@@ -911,7 +1015,11 @@ module Mongo
 
       if auth_mech.nil?
         if user && user.empty?
-          raise Mongo::Auth::InvalidConfiguration.new('empty username is not supported for default auth mechanism')
+          raise Mongo::Auth::InvalidConfiguration, 'Empty username is not supported for default auth mechanism'
+        end
+
+        if auth_source == ''
+          raise Mongo::Auth::InvalidConfiguration, 'Auth source cannot be empty for default auth mechanism'
         end
 
         return
@@ -922,23 +1030,30 @@ module Mongo
       end
 
       if user.nil? && auth_mech != :mongodb_x509
-        raise Mongo::Auth::InvalidConfiguration.new("user is required for mechanism #{auth_mech}")
+        raise Mongo::Auth::InvalidConfiguration, "Username is required for auth mechanism #{auth_mech}"
       end
 
       if password.nil? && ![:gssapi, :mongodb_x509].include?(auth_mech)
-        raise Mongo::Auth::InvalidConfiguration.new("password is required for mechanism #{auth_mech}")
+        raise Mongo::Auth::InvalidConfiguration, "Password is required for auth mechanism #{auth_mech}"
       end
 
       if password && auth_mech == :mongodb_x509
-        raise Mongo::Auth::InvalidConfiguration.new('password is not supported for mongodb_x509')
+        raise Mongo::Auth::InvalidConfiguration, 'Password is not supported for :mongodb_x509 auth mechanism'
       end
 
-      if !['$external', nil].include?(auth_source) && [:gssapi, :mongodb_x509].include?(auth_mech)
-        raise Mongo::Auth::InvalidConfiguration.new("#{auth_source} is an invalid auth source for #{auth_mech}; valid options are $external and nil")
+      if [:gssapi, :mongodb_x509].include?(auth_mech)
+        if !['$external', nil].include?(auth_source)
+          raise Mongo::Auth::InvalidConfiguration, "#{auth_source} is an invalid auth source for #{auth_mech}; valid options are $external and nil"
+        end
+      else
+        # Auth source is the database name, and thus cannot be the empty string.
+        if auth_source == ''
+          raise Mongo::Auth::InvalidConfiguration, "Auth source cannot be empty for auth mechanism #{auth_mech}"
+        end
       end
 
       if mech_properties && auth_mech != :gssapi
-        raise Mongo::Auth::InvalidConfiguration.new("mechanism_properties are not supported for #{auth_mech}")
+        raise Mongo::Auth::InvalidConfiguration, ":mechanism_properties are not supported for auth mechanism #{auth_mech}"
       end
     end