mongo 2.8.0.rc0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c0c1dd6dd1ce8ec0ce98e4f038bb188a743d65b0fd45f42383e732b8a9fe6e0
-  data.tar.gz: 69a9fcd5c2284e95b7af207ae381bc5fb4b9a0d00d941b54bb7d86a126a62e70
+  metadata.gz: 9696938332fb0fee42821edacd510e1a83217adf91e8418655d54da3c14edbc3
+  data.tar.gz: 12bd18e5b2f36f28f8efca9d5cd03851f0ca593a3bc0e72f57404479bd837e34
 SHA512:
-  metadata.gz: eb0c350dc452f0eb60656e0a2e6657e0002a7760de5bb3af7820af77876046f48bd7946e8d7d39a727dd80eda43e48656db52b941c2ab45ea6096ba826049a4d
-  data.tar.gz: d13ac4eec40c58e932f61fe5cb3f52259ca77a8ed08f079edf910927b9bb5e0c0ec77e0461374ab6c0f783726b1a5c7972e12c63c8a6d2eb46a6170a80543538
+  metadata.gz: bf455a48c0b6def9c3e509660b3eacfe8a5cba5578cfd181f621edbaeef497fbd04da6706e80edcf5a879aedd54fdc95fa3f94e2a4d3f64e311291a53cd0c5b5
+  data.tar.gz: 290186d4c7f26812685b26543a392dc5fe82847c8f2071746ba1d1d83af44c9a6ecedc69ebd41df09f96d7950844c41f44cdd1b02c5f1cc870a84b0416479684

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-�aJc&�$�ϻi#+�r��~��ga��d��l�����C��8i�J�Z+�	�� !{X3'R��n(��Jg
�}n&����.��
+����(F�����d�:�������ͯ�Z����� �eZ�)7~��g�̍w�c�o���0|_�JS���_�!��7�t��_�z���d��>�U�s�xY�>
+?>	� ����g��᱋�Re
+v��^#߿+�6��I��D��6��+�t�(�E�Klԃ
�[YA�ɲ���*Q�����큒�݃"����$��������le+y��t3�*�-�L���H�_i'�ʡ�Լ���K�ٝ�rc�

data/lib/mongo/server/description.rb

@@ -196,7 +196,7 @@ module Mongo
           @features = Features.new(wire_versions, me || @address.to_s)
         end
         @average_round_trip_time = average_round_trip_time
-        @last_update_time = Time.now.freeze
+        @last_update_time = Time.now.dup.freeze
 
         if Mongo::Lint.enabled?
           # prepopulate cache instance variables

data/lib/mongo/session.rb

@@ -812,6 +812,7 @@ module Mongo
             if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
               # WriteConcernFailed
               if e.is_a?(Mongo::Error::OperationFailure) && e.code == 64 && e.wtimeout?
+                transaction_in_progress = false
                 raise
               end
               if Time.now >= deadline

data/lib/mongo/uri.rb

@@ -155,7 +155,7 @@ module Mongo
     # @since 2.1.0
     UNESCAPED_UNIX_SOCKET = "UNIX domain sockets must be urlencoded.".freeze
 
-    # Error details for a non-urlencoded auth databsae name.
+    # Error details for a non-urlencoded auth database name.
     #
     # @since 2.1.0
     UNESCAPED_DATABASE = "Auth database must be urlencoded.".freeze
@@ -201,8 +201,13 @@ module Mongo
 
     # Options that are allowed to appear more than once in the uri.
     #
+    # In order to follow the URI options spec requirement that all instances of 'tls' and 'ssl' have
+    # the same value, we need to keep track of all of the values passed in for those options.
+    # Assuming they don't conflict, they will be condensed to a single value immediately after
+    # parsing the URI.
+    #
     # @since 2.1.0
-    REPEATABLE_OPTIONS = [ :tag_sets ]
+    REPEATABLE_OPTIONS = [ :tag_sets, :ssl ]
 
     # Get either a URI object or a SRVProtocol URI object.
     #
@@ -257,16 +262,25 @@ module Mongo
       raise_invalid_error!(INVALID_SCHEME) unless parsed_scheme == scheme
       parse!(remaining)
 
-      # Warn if conflicting insecure TLS options are provided.
-      if @uri_options[:ssl_verify] == false
-        if @uri_options[:ssl_verify_certificate]
-          log_warn("tlsInsecure is set to disable verification, but tlsAllowInvalidCertificates " +
-                     "is set to enable it; tlsAllowInvalidCertificates takes precedence")
+      # The URI options spec requires that we raise an error if there are conflicting values of
+      # 'tls' and 'ssl'. In order to fulfill this, we parse the values of each instance into an
+      # array; assuming all values in the array are the same, we replace the array with that value.
+      unless @uri_options[:ssl].nil? || @uri_options[:ssl].empty?
+        unless @uri_options[:ssl].uniq.length == 1
+          raise_invalid_error_no_fmt!("all instances of 'tls' and 'ssl' must have the same value")
+        end
+
+        @uri_options[:ssl] = @uri_options[:ssl].first
+      end
+
+      # Check for conflicting TLS insecure options.
+      unless @uri_options[:ssl_verify].nil?
+        unless @uri_options[:ssl_verify_certificate].nil?
+          raise_invalid_error_no_fmt!("'tlsInsecure' and 'tlsAllowInvalidCertificates' cannot both be specified")
         end
 
-       if @uri_options[:ssl_verify_hostname]
-          log_warn("tlsInsecure is set to disable verification, but tlsAllowInvalidHostnames is " +
-                     "set to enable it; tlsAllowInvalidHostnames takes precedence")
+        unless @uri_options[:ssl_verify_hostname].nil?
+          raise_invalid_error_no_fmt!("tlsInsecure' and 'tlsAllowInvalidHostnames' cannot both be specified")
         end
       end
     end
@@ -413,6 +427,10 @@ module Mongo
       raise Error::InvalidURI.new(@string, details, FORMAT)
     end
 
+    def raise_invalid_error_no_fmt!(details)
+      raise Error::InvalidURI.new(@string, details)
+    end
+
     def decode(value)
       ::URI.decode(value)
     end
@@ -463,8 +481,8 @@ module Mongo
     uri_option 'waitqueuetimeoutms', :wait_queue_timeout, :type => :wait_queue_timeout
 
     # Security Options
-    uri_option 'ssl', :ssl
-    uri_option 'tls', :ssl
+    uri_option 'ssl', :ssl, :type => :ssl
+    uri_option 'tls', :ssl, :type => :tls
     uri_option 'tlsallowinvalidcertificates', :ssl_verify_certificate,
                :type => :ssl_verify_certificate
     uri_option 'tlsallowinvalidhostnames', :ssl_verify_hostname,
@@ -703,6 +721,26 @@ module Mongo
       bool('journal', value)
     end
 
+    # Parses the ssl value from the URI.
+    #
+    # @param value [ String ] The ssl value.
+    #
+    # @return [ Array<true | false> ] The ssl value parsed out (stored in an array to facilitate
+    #   keeping track of all values).
+    def ssl(value)
+      [bool('ssl', value)]
+    end
+
+    # Parses the tls value from the URI.
+    #
+    # @param value [ String ] The tls value.
+    #
+    # @return [ Array<true | false> ] The tls value parsed out (stored in an array to facilitate
+    #   keeping track of all values).
+    def tls(value)
+      [bool('tls', value)]
+    end
+
     # Parses the ssl_verify value from the tlsInsecure URI value. Note that this will be the inverse
     # of the value of tlsInsecure (if present).
     #

data/lib/mongo/version.rb

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

data/spec/mongo/server/description_spec.rb

@@ -49,6 +49,20 @@ describe Mongo::Server::Description do
     end
   end
 
+  describe '#initialize' do
+    context 'when Time.now is mocked' do
+      it 'does not freeze mocked time' do
+        obj = Time.now
+        expect(Time).to receive(:now).at_least(:once).and_return(obj)
+        expect(obj.frozen?).to be false
+
+        description = described_class.new(address)
+        expect(description.last_update_time).to eq(obj)
+        expect(obj.frozen?).to be false
+      end
+    end
+  end
+
   describe '#arbiters' do
 
     context 'when the replica set has arbiters' do

data/spec/spec_tests/data/uri_options/tls-options.yml

@@ -71,19 +71,67 @@ tests:
         auth: ~
         options: {}
     -
-        description: "tlsInsecure=true and tlsAllowInvalidCertificates=false warns"
-        uri: "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidCertificates=false"
+        description: "tlsInsecure and tlsAllowInvalidCertificates both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidCertificates=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure and tlsAllowInvalidCertificates both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=false&tlsAllowInvalidCertificates=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure and tlsAllowInvalidHostnames both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidHostnames=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure and tlsAllowInvalidHostnames both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsInsecure=false&tlsAllowInvalidHostnames=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tls=true and ssl=true doesn't warn"
+        uri: "mongodb://example.com/?tls=true&ssl=true"
         valid: true
-        warning: true
+        warning: false
         hosts: ~
         auth: ~
         options: {}
     -
-        description: "tlsInsecure=true and tlsAllowInvalidHostnames=false warns"
-        uri: "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidHostnames=false"
+        description: "tls=false and ssl=false doesn't warn"
+        uri: "mongodb://example.com/?tls=false&ssl=false"
         valid: true
-        warning: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tls=false and ssl=true raises error"
+        uri: "mongodb://example.com/?tls=false&ssl=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tls=true and ssl=false raises error"
+        uri: "mongodb://example.com/?tls=true&ssl=false"
+        valid: false
+        warning: false
         hosts: ~
         auth: ~
         options: {}
-  
+

data/spec/spec_tests/uri_options_spec.rb

@@ -40,7 +40,7 @@ describe 'Uri Options' do
             end
           end
 
-          context 'when the uri should not warn', if: !test.warn? do
+          context 'when the uri should not warn', if: !test.warn? && test.valid? do
 
             before do
               expect(Mongo::Logger.logger).not_to receive(:warn)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.8.0.rc0
+  version: 2.8.0
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
   Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
   -----END CERTIFICATE-----
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -971,9 +971,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: