mongo 1.8.6 → 1.9.0

data/lib/mongo/util/core_ext.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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.
+
 #:nodoc:
 class Object
 
@@ -9,17 +23,6 @@ class Object
 
 end
 
-#:nodoc:
-module Enumerable
-
-  #:nodoc:
-  def each_with_object(memo)
-    each { |element| yield(element, memo) }
-    memo
-  end unless [].respond_to?(:each_with_object)
-
-end
-
 #:nodoc:
 class Hash
 
@@ -65,23 +68,3 @@ class Class
     end
   end
 end
-
-# Fix a bug in the interaction of
-# mutexes and timeouts in Ruby 1.9.
-# See https://jira.mongodb.org/browse/RUBY-364 for details.
-if RUBY_VERSION > '1.9'
-  class Mutex
-    def lock_with_hack
-      lock_without_hack
-      rescue ThreadError => e
-      if e.message != "deadlock; recursive locking"
-        raise
-      else
-        unlock
-        lock_without_hack
-      end
-    end
-      alias_method :lock_without_hack, :lock
-      alias_method :lock, :lock_with_hack
-  end
-end

data/lib/mongo/util/logging.rb

@@ -1,6 +1,28 @@
+# Copyright (C) 2013 10gen 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 Logging
 
+    module Instrumenter
+      def self.instrument(name, payload = {})
+        yield
+      end
+    end
+
+    @instrumenter = Instrumenter
+
     def write_logging_startup_message
       log(:debug, "Logging level is currently :debug which could negatively impact " +
           "client-side performance. You should set your logging level no lower than " +
@@ -38,7 +60,7 @@ module Mongo
     end
 
     def self.instrumenter
-      @instrumenter || Instrumenter
+      @instrumenter
     end
 
     def self.instrumenter=(instrumenter)
@@ -59,11 +81,5 @@ module Mongo
         msg
       end
     end
-
-    module Instrumenter
-      def self.instrument(name, payload = {})
-        yield
-      end
-    end
   end
 end

data/lib/mongo/util/node.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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
   class Node
 
@@ -48,8 +62,9 @@ module Mongo
       @node_mutex.synchronize do
         begin
           @socket = @client.socket_class.new(@host, @port,
-            @client.op_timeout, @client.connect_timeout
-          )
+                                             @client.op_timeout,
+                                             @client.connect_timeout,
+                                             @client.socket_opts)
         rescue OperationTimeout, ConnectionFailure, OperationFailure, SocketError, SystemCallError, IOError => ex
           @client.log(:debug, "Failed connection to #{host_string} with #{ex.class}, #{ex.message}.")
           close

data/lib/mongo/util/pool.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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
   class Pool
     PING_ATTEMPTS  = 6
@@ -161,7 +175,9 @@ module Mongo
     # therefore, it runs within a mutex.
     def checkout_new_socket
       begin
-        socket = @client.socket_class.new(@host, @port, @client.op_timeout)
+        socket = @client.socket_class.new(@host, @port, @client.op_timeout,
+                                                        @client.connect_timeout,
+                                                        @client.socket_opts)
         socket.pool = self
       rescue => ex
         socket.close if socket

data/lib/mongo/util/pool_manager.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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
   class PoolManager
     include ThreadLocalVariableManager
@@ -264,7 +278,6 @@ module Mongo
          end
        end
        members
-     end
-
+    end
   end
 end

data/lib/mongo/util/read_preference.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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 ReadPreference
     READ_PREFERENCES = [

data/lib/mongo/util/server_version.rb

@@ -1,4 +1,19 @@
+# Copyright (C) 2013 10gen 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
+
   # Simple class for comparing server versions.
   class ServerVersion
     include Comparable

data/lib/mongo/util/sharding_pool_manager.rb

@@ -1,3 +1,16 @@
+# Copyright (C) 2013 10gen 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
   class ShardingPoolManager < PoolManager

data/lib/mongo/util/socket_util.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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 SocketUtil
 
   attr_accessor :pool, :pid

data/lib/mongo/util/ssl_socket.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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.
+
 require 'socket'
 require 'openssl'
 require 'timeout'
@@ -10,18 +24,45 @@ module Mongo
   class SSLSocket
     include SocketUtil
 
-    def initialize(host, port, op_timeout=nil, connect_timeout=nil)
-      @op_timeout = op_timeout
+    def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
+      @pid             = Process.pid
+      @op_timeout      = op_timeout
       @connect_timeout = connect_timeout
-      @pid = Process.pid
 
       @tcp_socket = ::TCPSocket.new(host, port)
       @tcp_socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
-      @socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket)
-      @socket.sync_close = true
+      @context = OpenSSL::SSL::SSLContext.new
+
+      if opts[:cert]
+        @context.cert = OpenSSL::X509::Certificate.new(File.open(opts[:cert]))
+      end
+
+      if opts[:key]
+        @context.key = OpenSSL::PKey::RSA.new(File.open(opts[:key]))
+      end
+
+      if opts[:verify]
+        @context.ca_file = opts[:ca_cert]
+        @context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
 
-      connect
+      begin
+        @socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket, @context)
+        @socket.sync_close = true
+        connect
+      rescue SSLError
+        raise ConnectionFailure, "SSL handshake failed. MongoDB may " +
+                                 "not be configured with SSL support."
+      end
+
+      if opts[:verify]
+        unless OpenSSL::SSL.verify_certificate_identity(@socket.peer_cert, host)
+          raise ConnectionFailure, "SSL handshake failed. Hostname mismatch."
+        end
+      end
+
+      self
     end
 
     def connect
@@ -45,7 +86,7 @@ module Mongo
         end
       else
         @socket.sysread(length, buffer)
-      end 
+      end
     end
   end
 end

data/lib/mongo/util/support.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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.
+
 require 'digest/md5'
 
 module Mongo

data/lib/mongo/util/tcp_socket.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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.
+
 require 'socket'
 require 'timeout'
 
@@ -10,14 +24,14 @@ module Mongo
   class TCPSocket
     include SocketUtil
 
-    def initialize(host, port, op_timeout=nil, connect_timeout=nil)
-      @op_timeout = op_timeout
+    def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
+      @op_timeout      = op_timeout
       @connect_timeout = connect_timeout
-      @pid = Process.pid
+      @pid             = Process.pid
 
       # TODO: Prefer ipv6 if server is ipv6 enabled
       @address = Socket.getaddrinfo(host, nil, Socket::AF_INET).first[3]
-      @port = port
+      @port    = port
 
       @socket_address = Socket.pack_sockaddr_in(@port, @address)
       @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)

data/lib/mongo/util/thread_local_variable_manager.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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.
+
 #:nodoc:
 module Mongo
   module ThreadLocalVariableManager

data/lib/mongo/util/unix_socket.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen 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.
+
 require 'socket'
 
 module Mongo
@@ -7,15 +21,15 @@ module Mongo
   # sans Timeout::timeout
   #
   class UNIXSocket < TCPSocket
-    def initialize(socket_path, port=:socket, op_timeout=nil, connect_timeout=nil)
-      @op_timeout = op_timeout
+    def initialize(socket_path, port=:socket, op_timeout=nil, connect_timeout=nil, opts={})
+      @op_timeout      = op_timeout
       @connect_timeout = connect_timeout
 
-      @address = socket_path
-      @port = :socket # purposely override input
+      @address         = socket_path
+      @port            = :socket # purposely override input
 
-      @socket_address = Socket.pack_sockaddr_un(@address)
-      @socket = Socket.new(Socket::AF_UNIX, Socket::SOCK_STREAM, 0)
+      @socket_address  = Socket.pack_sockaddr_un(@address)
+      @socket          = Socket.new(Socket::AF_UNIX, Socket::SOCK_STREAM, 0)
       connect
     end
   end