mongo 2.19.3 → 2.20.1

data/lib/mongo/session.rb

@@ -123,6 +123,23 @@ module Mongo
     # @since 2.5.0
     attr_reader :operation_time
 
+    # Sets the dirty state to the given value for the underlying server
+    # session. If there is no server session, this does nothing.
+    #
+    # @param [ true | false ] mark whether to mark the server session as
+    #   dirty, or not.
+    def dirty!(mark = true)
+      @server_session&.dirty!(mark)
+    end
+
+    # @return [ true | false | nil ] whether the underlying server session is
+    #   dirty. If no server session exists for this session, returns nil.
+    #
+    # @api private
+    def dirty?
+      @server_session&.dirty?
+    end
+
     # @return [ Hash ] The options for the transaction currently being executed
     # on this session.
     #
@@ -538,6 +555,8 @@ module Mongo
     #
     # @since 2.6.0
     def start_transaction(options = nil)
+      check_transactions_supported!
+
       if options
         Lint.validate_read_concern_option(options[:read_concern])
 
@@ -1185,5 +1204,18 @@ module Mongo
         raise Mongo::Error::InvalidSession.new(MISMATCHED_CLUSTER_ERROR_MSG)
       end
     end
+
+    def check_transactions_supported!
+      raise Mongo::Error::TransactionsNotSupported, "standalone topology" if cluster.single?
+
+      cluster.next_primary.with_connection do |conn|
+        if cluster.replica_set? && !conn.features.transactions_enabled?
+          raise Mongo::Error::TransactionsNotSupported, "server version is < 4.0"
+        end
+        if cluster.sharded? && !conn.features.sharded_transactions_enabled?
+          raise Mongo::Error::TransactionsNotSupported, "sharded transactions require server version >= 4.2"
+        end
+      end
+    end
   end
 end

data/lib/mongo/socket/ssl.rb

@@ -287,7 +287,7 @@ module Mongo
         # for instance, if there is no newline between two certificates
         # this code will extract them both but OpenSSL fails in this situation.
         if cert_text
-          certs = cert_text.scan(/-----BEGIN CERTIFICATE-----(?:.|\n)+?-----END CERTIFICATE-----/)
+          certs = extract_certs(cert_text)
           if certs.length > 1
             context.cert = OpenSSL::X509::Certificate.new(certs.shift)
             context.extra_chain_cert = certs.map do |cert|
@@ -390,6 +390,27 @@ module Mongo
           hook.call(@context)
         end
       end
+
+      BEGIN_CERT = "-----BEGIN CERTIFICATE-----"
+      END_CERT = "-----END CERTIFICATE-----"
+
+      # This was originally a scan + regex, but the regex was particularly
+      # inefficient and was flagged as a concern by static analysis.
+      def extract_certs(text)
+        [].tap do |list|
+          pos = 0
+
+          while (begin_idx = text.index(BEGIN_CERT, pos))
+            end_idx = text.index(END_CERT, begin_idx)
+            break unless end_idx
+
+            end_idx += END_CERT.length
+            list.push(text[begin_idx...end_idx])
+
+            pos = end_idx
+          end
+        end
+      end
     end
   end
 end

data/lib/mongo/uri.rb

@@ -377,10 +377,6 @@ module Mongo
         raise_invalid_error!("Options contain an unescaped question mark (?), or the database name contains a question mark and was not escaped")
       end
 
-      if options && !hosts_and_db.index('/')
-        raise_invalid_error!("MongoDB URI must have a slash (/) after the hosts if options are given")
-      end
-
       hosts, db = hosts_and_db.split('/', 2)
       if db && db.index('/')
         raise_invalid_error!("Database name contains an unescaped slash (/): #{db}")

data/lib/mongo/version.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -16,9 +15,6 @@
 # limitations under the License.
 
 module Mongo
-
   # The current version of the driver.
-  #
-  # @since 2.0.0
-  VERSION = '2.19.3'.freeze
+  VERSION = '2.20.1'
 end

data/mongo.gemspec

@@ -9,28 +9,25 @@ Gem::Specification.new do |s|
   s.name              = 'mongo'
   s.version           = Mongo::VERSION
   s.platform          = Gem::Platform::RUBY
-  s.authors           = ["The MongoDB Ruby Team"]
-  s.email             = "dbx-ruby@mongodb.com"
+  s.authors           = [ 'The MongoDB Ruby Team' ]
+  s.email             = 'dbx-ruby@mongodb.com'
   s.homepage          = 'https://mongodb.com/docs/ruby-driver/'
   s.summary           = 'Ruby driver for MongoDB'
-  s.description       = 'A Ruby driver for MongoDB'
   s.license           = 'Apache-2.0'
+  s.description       = <<~DESC
+    A pure-Ruby driver for connecting to, querying, and manipulating MongoDB
+    databases. Officially developed and supported by MongoDB, with love for
+    the Ruby community.
+  DESC
 
   s.metadata = {
     'bug_tracker_uri' => 'https://jira.mongodb.org/projects/RUBY',
     'changelog_uri' => 'https://github.com/mongodb/mongo-ruby-driver/releases',
-    'documentation_uri' => 'https://mongodb.com/docs/ruby-driver/',
     'homepage_uri' => 'https://mongodb.com/docs/ruby-driver/',
+    'documentation_uri' => 'https://mongodb.com/docs/ruby-driver/current/tutorials/quick-start/',
     'source_code_uri' => 'https://github.com/mongodb/mongo-ruby-driver',
   }
 
-  if File.exist?('gem-private_key.pem')
-    s.signing_key     = 'gem-private_key.pem'
-    s.cert_chain      = ['gem-public_cert.pem']
-  else
-    warn "[#{s.name}] Warning: No private key present, creating unsigned gem."
-  end
-
   s.files             = Dir.glob('{bin,lib,spec}/**/*')
   s.files             += %w[mongo.gemspec LICENSE README.md CONTRIBUTING.md Rakefile]
   s.test_files        = Dir.glob('spec/**/*')
@@ -41,11 +38,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.5"
 
-  # For testing driver against bson master we need to depend on bson < 6.0.0
-  # but in release version we want to depend on bson < 5.0.0.
-  if %w(1 yes true).include?(ENV['MONGO_RUBY_DRIVER_BSON_MASTER'])
-    s.add_dependency 'bson', '>=4.13.0', '<6.0.0'
-  else
-    s.add_dependency 'bson', '>=4.14.1', '<5.0.0'
-  end
+  s.add_dependency 'bson', '>=4.14.1', '<6.0.0'
 end

data/spec/atlas/atlas_connectivity_spec.rb

@@ -11,13 +11,13 @@ describe 'Atlas connectivity' do
 
   describe 'connection to Atlas' do
     it 'runs ismaster successfully' do
-      result = client.database.command(:ismaster => 1)
-      expect(result.documents.first['ismaster']).to be true
+      expect { client.database.command(:hello => 1) }
+        .not_to raise_error
     end
 
     it 'runs findOne successfully' do
-      result = client.use(:test)['test'].find.to_a
-      expect(result).to be_a(Array)
+      expect { client.use(:test)['test'].find.to_a }
+        .not_to raise_error
     end
   end
 end

data/spec/faas/ruby-sam-app/Gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "httparty"
+gem "mongo"
+
+group :test do
+  gem "test-unit"
+  gem "mocha"
+end

data/spec/faas/ruby-sam-app/mongodb/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "httparty"
+gem "mongo"

data/spec/faas/ruby-sam-app/mongodb/app.rb

@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+require 'mongo'
+require 'json'
+
+class StatsAggregator
+
+  def initialize
+    @open_connections = 0
+    @heartbeats_count = 0
+    @total_heartbeat_time = 0
+    @commands_count = 0
+    @total_command_time = 0
+  end
+
+  def add_command(duration)
+    @commands_count += 1
+    @total_command_time += duration
+  end
+
+  def add_heartbeat(duration)
+    @heartbeats_count += 1
+    @total_heartbeat_time += duration
+  end
+
+  def add_connection
+    @open_connections += 1
+  end
+
+  def remove_connection
+    @open_connections -= 1
+  end
+
+  def average_heartbeat_time
+    if @heartbeats_count == 0
+      0
+    else
+      @total_heartbeat_time / @heartbeats_count
+    end
+  end
+
+  def average_command_time
+    if @commands_count == 0
+      0
+    else
+      @total_command_time / @commands_count
+    end
+  end
+
+  def reset
+    @open_connections = 0
+    @heartbeats_count = 0
+    @total_heartbeat_time = 0
+    @commands_count = 0
+    @total_command_time = 0
+  end
+
+  def result
+    {
+      average_heartbeat_time: average_heartbeat_time,
+      average_command_time: average_command_time,
+      heartbeats_count: @heartbeats_count,
+      open_connections: @open_connections,
+    }
+  end
+end
+
+class CommandMonitor
+
+  def initialize(stats_aggregator)
+    @stats_aggregator = stats_aggregator
+  end
+
+  def started(event); end
+
+  def failed(event)
+    @stats_aggregator.add_command(event.duration)
+  end
+
+  def succeeded(event)
+    @stats_aggregator.add_command(event.duration)
+  end
+end
+
+class HeartbeatMonitor
+
+  def initialize(stats_aggregator)
+    @stats_aggregator = stats_aggregator
+  end
+
+  def started(event); end
+
+  def succeeded(event)
+    @stats_aggregator.add_heartbeat(event.duration)
+  end
+
+  def failed(event)
+    @stats_aggregator.add_heartbeat(event.duration)
+  end
+end
+
+class PoolMonitor
+
+  def initialize(stats_aggregator)
+    @stats_aggregator = stats_aggregator
+  end
+
+  def published(event)
+    case event
+    when Mongo::Monitoring::Event::Cmap::ConnectionCreated
+      @stats_aggregator.add_connection
+    when Mongo::Monitoring::Event::Cmap::ConnectionClosed
+      @stats_aggregator.remove_connection
+    end
+  end
+end
+
+$stats_aggregator = StatsAggregator.new
+
+command_monitor = CommandMonitor.new($stats_aggregator)
+heartbeat_monitor = HeartbeatMonitor.new($stats_aggregator)
+pool_monitor = PoolMonitor.new($stats_aggregator)
+
+sdam_proc = proc do |client|
+  client.subscribe(Mongo::Monitoring::COMMAND, command_monitor)
+  client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, heartbeat_monitor)
+  client.subscribe(Mongo::Monitoring::CONNECTION_POOL, pool_monitor)
+end
+
+puts 'Connecting'
+$client = Mongo::Client.new(ENV['MONGODB_URI'], sdam_proc: sdam_proc)
+# Populate the connection pool
+$client.use('lambda_test').database.list_collections
+puts 'Connected'
+
+def lambda_handler(event:, context:)
+  db = $client.use('lambda_test')
+  collection = db[:test_collection]
+  result = collection.insert_one({ name: 'test' })
+  collection.delete_one({ _id: result.inserted_id })
+  response = $stats_aggregator.result.to_json
+  $stats_aggregator.reset
+  puts "Response: #{response}"
+
+  {
+    statusCode: 200,
+    body: response
+  }
+end

data/spec/faas/ruby-sam-app/template.yaml

@@ -0,0 +1,48 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  Sample SAM Template for ruby-sam-app
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+  Function:
+    Timeout: 30
+    MemorySize: 128
+
+Parameters:
+  MongoDbUri:
+    Type: String
+    Description: The MongoDB connection string.
+
+Resources:
+  MongoDBFunction:
+    Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+    Properties:
+      CodeUri: mongodb/
+      Environment:
+        Variables:
+          MONGODB_URI: !Ref MongoDbUri
+      Handler: app.lambda_handler
+      Runtime: ruby3.2
+      Architectures:
+        - x86_64
+      Events:
+        MongoDB:
+          Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+          Properties:
+            Path: /mongodb
+            Method: get
+
+Outputs:
+  # ServerlessRestApi is an implicit API created out of Events key under Serverless::Function
+  # Find out more about other implicit resources you can reference within SAM
+  # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
+  MongoDBApi:
+    Description: "API Gateway endpoint URL for Prod stage for MongoDB function"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/mongodb/"
+  MongoDBFunction:
+    Description: "MongoDB Lambda Function ARN"
+    Value: !GetAtt MongoDBFunction.Arn
+  MongoDBFunctionIamRole:
+    Description: "Implicit IAM Role created for MongoDB function"
+    Value: !GetAtt MongoDBFunctionRole.Arn

data/spec/integration/client_side_encryption/corpus_spec.rb

@@ -188,6 +188,15 @@ describe 'Client-Side Encryption' do
       key_vault_collection.insert_one(kmip_data_key)
     end
 
+    # This method compensates for an API change between BSON 4 and
+    # BSON 5.
+    def normalize_cse_value(a)
+      case a
+      when BSON::Decimal128 then a.to_d
+      else a
+      end
+    end
+
     shared_context 'with jsonSchema collection validator' do
       let(:local_schema_map) { nil }
 
@@ -228,12 +237,11 @@ describe 'Client-Side Encryption' do
           .find(_id: corpus_encrypted_id)
           .first
 
-
         corpus_encrypted_actual.each do |key, value|
           # If it was deterministically encrypted, test the encrypted values
           # for equality.
           if value['algo'] == 'det'
-            expect(value['value']).to eq(corpus_encrypted_expected[key]['value'])
+            expect(normalize_cse_value(value['value'])).to eq(normalize_cse_value(corpus_encrypted_expected[key]['value']))
           else
             # If the document was randomly encrypted, the two encrypted values
             # will not be equal. Ensure that they are equal when decrypted.

data/spec/integration/client_side_encryption/range_explicit_encryption_prose_spec.rb

@@ -7,6 +7,9 @@ require 'spec_helper'
 # rubocop:disable RSpec/ExampleLength
 describe 'Range Explicit Encryption' do
   min_server_version '7.0.0-rc0'
+  # https://jira.mongodb.org/browse/RUBY-3457
+  max_server_version '7.99.99'
+
   require_libmongocrypt
   include_context 'define shared FLE helpers'