mongo 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d95f4cbddad1184a95d53cb257befaceb5b9d1b0
-  data.tar.gz: 2639f1045f2be8059283b80bcd4e7a867b1ee35c
+  metadata.gz: efe6bb7e6b47adaa8d2552af028e6c77510659ec
+  data.tar.gz: fcf01b4299f65ab1b0604f7c6ad5be3f470774cf
 SHA512:
-  metadata.gz: 806e70e8f37683ba17c3416a9eb4c6d662305c4b8138f62b9af82c234b3cd98c10d1cd3119040b2b5751208e2058cd57532b4dfd63acee6628da692e8af55bad
-  data.tar.gz: e5a1c81c7930634054d5ace16c452ef4ba0c313a1fc779c2cc3deca75910b7014cae202b73cdd659d50f47d2e66f549fbd1e6017651815fec257b09db6ff4bd6
+  metadata.gz: 84f370d047ea3d27dd06940145be29bc2d6655b1b9676be732010a1d13d17f1fb5f86be35ba47e6a7b2c122dd2fadf02f0d4e37334f0f2446fa66da09d91e68e
+  data.tar.gz: 84902c053cf3394d8b821e4b6e4ada9906010f4221015e86a14ae1897d9c1be7c772c0848a19aabcc7446b1032e6e23f54475f96418dda607bead0143dc1e9fd

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

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'securerandom'
 require 'base64'
 
 module Mongo

data/lib/mongo/operation/write/idable.rb

@@ -24,7 +24,7 @@ module Mongo
         end
 
         def has_id?(doc)
-          id(doc)
+          !!id(doc)
         end
 
         def ensure_ids(documents)

data/lib/mongo/protocol/query.rb

@@ -76,7 +76,7 @@ module Mongo
       # @since 2.0.0
       def log_message
         fields = []
-        fields << ["%s |", "QUERY"]
+        fields << ["%s |", query_type]
         fields << ["namespace=%s", namespace]
         fields << ["selector=%s", selector.inspect]
         fields << ["flags=%s", flags.inspect]
@@ -107,6 +107,10 @@ module Mongo
         2004
       end
 
+      def query_type
+        namespace.include?(Database::COMMAND) ? 'COMMAND' : 'QUERY'
+      end
+
       # Available flags for a Query message.
       FLAGS = [
         :reserved,

data/lib/mongo/socket.rb

@@ -103,10 +103,7 @@ module Mongo
     def initialize(family)
       @family = family
       @socket = ::Socket.new(family, SOCK_STREAM, 0)
-      encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
-      socket.set_encoding(BSON::BINARY)
-      socket.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
-      socket.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)
+      set_socket_options(@socket)
     end
 
     # Will read all data from the socket for the provided number of bytes.
@@ -164,6 +161,13 @@ module Mongo
       socket.read(length) || String.new
     end
 
+    def set_socket_options(sock)
+      encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
+      sock.set_encoding(BSON::BINARY)
+      sock.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
+      sock.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)
+    end
+
     def handle_errors
       begin
         yield

data/lib/mongo/socket/ssl.rb

@@ -78,10 +78,7 @@ module Mongo
         @family = family
         @tcp_socket = ::Socket.new(family, SOCK_STREAM, 0)
         @tcp_socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1)
-        encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
-        @tcp_socket.set_encoding(BSON::BINARY)
-        @tcp_socket.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
-        @tcp_socket.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)
+        set_socket_options(@tcp_socket)
       end
 
       # Read a single byte from the socket.

data/lib/mongo/version.rb

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

data/spec/mongo/socket/ssl_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Mongo::Socket::SSL do
+
+  describe '#connect!', if: running_ssl? do
+
+    let(:socket) do
+      described_class.new('localhost', 27017, 5, Socket::PF_INET, options)
+    end
+
+    context 'when a certificate is provided' do
+
+      let(:options) do
+        {
+          :ssl => true,
+          :ssl_cert => CLIENT_PEM,
+          :ssl_key => CLIENT_PEM
+        }
+      end
+
+      before do
+        socket.connect!
+      end
+
+      it 'connects to the server' do
+        expect(socket).to be_alive
+      end
+    end
+
+    context 'when a bad certificate is provided' do
+
+      let(:options) do
+        {
+          :ssl => true,
+          :ssl_cert => CLIENT_PEM,
+          :ssl_key => CRL_PEM
+        }
+      end
+
+      it 'raises an exception' do
+        expect {
+          socket.connect!
+        }.to raise_error
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -69,6 +69,12 @@ SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/
 SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/selection/**/*.yml")
 CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/support/crud_tests/**/*.yml")
 
+SSL_CERTS_DIR = "#{CURRENT_PATH}/support/certificates"
+CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
+CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
+CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
+CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
+
 # Determine whether the test clients are connecting to a standlone.
 #
 # @since 2.0.0
@@ -111,6 +117,10 @@ def list_command_enabled?
   $list_command_enabled ||= $mongo_client.cluster.servers.first.features.list_indexes_enabled?
 end
 
+def running_ssl?
+  !!ENV['SSL']
+end
+
 alias :scram_sha_1_enabled? :list_command_enabled?
 
 # Depending on whether write commands are enabled, there are different documents that

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
   aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
   -----END CERTIFICATE-----
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -237,12 +237,6 @@ files:
 - lib/mongo/write_concern/normalizable.rb
 - lib/mongo/write_concern/unacknowledged.rb
 - mongo.gemspec
-- spec/certificates/ca.pem
-- spec/certificates/client.pem
-- spec/certificates/crl.pem
-- spec/certificates/crl_client_revoked.pem
-- spec/certificates/password_protected.pem
-- spec/certificates/server.pem
 - spec/mongo/address/ipv4_spec.rb
 - spec/mongo/address/ipv6_spec.rb
 - spec/mongo/address/unix_spec.rb
@@ -334,11 +328,18 @@ files:
 - spec/mongo/server_selector/secondary_spec.rb
 - spec/mongo/server_selector_spec.rb
 - spec/mongo/server_spec.rb
+- spec/mongo/socket/ssl_spec.rb
 - spec/mongo/uri_spec.rb
 - spec/mongo/write_concern/acknowledged_spec.rb
 - spec/mongo/write_concern/unacknowledged_spec.rb
 - spec/spec_helper.rb
 - spec/support/authorization.rb
+- spec/support/certificates/ca.pem
+- spec/support/certificates/client.pem
+- spec/support/certificates/crl.pem
+- spec/support/certificates/crl_client_revoked.pem
+- spec/support/certificates/password_protected.pem
+- spec/support/certificates/server.pem
 - spec/support/crud.rb
 - spec/support/crud/read.rb
 - spec/support/crud/write.rb
@@ -453,17 +454,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongo
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
 test_files:
-- spec/certificates/ca.pem
-- spec/certificates/client.pem
-- spec/certificates/crl.pem
-- spec/certificates/crl_client_revoked.pem
-- spec/certificates/password_protected.pem
-- spec/certificates/server.pem
 - spec/mongo/address/ipv4_spec.rb
 - spec/mongo/address/ipv6_spec.rb
 - spec/mongo/address/unix_spec.rb
@@ -555,11 +550,18 @@ test_files:
 - spec/mongo/server_selector/secondary_spec.rb
 - spec/mongo/server_selector_spec.rb
 - spec/mongo/server_spec.rb
+- spec/mongo/socket/ssl_spec.rb
 - spec/mongo/uri_spec.rb
 - spec/mongo/write_concern/acknowledged_spec.rb
 - spec/mongo/write_concern/unacknowledged_spec.rb
 - spec/spec_helper.rb
 - spec/support/authorization.rb
+- spec/support/certificates/ca.pem
+- spec/support/certificates/client.pem
+- spec/support/certificates/crl.pem
+- spec/support/certificates/crl_client_revoked.pem
+- spec/support/certificates/password_protected.pem
+- spec/support/certificates/server.pem
 - spec/support/crud/read.rb
 - spec/support/crud/write.rb
 - spec/support/crud.rb