aerospike 2.5.1 → 2.6.0

data/lib/aerospike/policy/client_policy.rb

@@ -1,17 +1,21 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+
+# Copyright 2014-2018 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
 #
-# 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
+# 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
+#     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.
+# 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 Aerospike
 
@@ -21,6 +25,7 @@ module Aerospike
     attr_accessor :user, :password
     attr_accessor :timeout, :connection_queue_size, :fail_if_not_connected, :tend_interval
     attr_accessor :cluster_name
+    attr_accessor :ssl_options
 
     def initialize(opt={})
       # Initial host connection timeout in seconds. The timeout when opening a connection
@@ -45,6 +50,8 @@ module Aerospike
 
       # Cluster Name
       @cluster_name = opt[:cluster_name]
+
+      @ssl_options = opt[:ssl_options]
     end
 
     def requires_authentication

data/lib/aerospike/socket/base.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+# Copyright 2014-2018 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# 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 Aerospike
+  module Socket
+    module Base
+      def initialize(*args)
+        super(*args)
+        @timeout = nil
+      end
+
+      def read(buffer, length)
+        bytes_read = 0
+        until bytes_read >= length
+          result = read_from_socket(length - bytes_read)
+          buffer.write_binary(result, bytes_read)
+          bytes_read += result.bytesize
+        end
+      end
+
+      def read_from_socket(length)
+        begin
+          read_nonblock(length)
+        rescue ::IO::WaitReadable => e
+          if ::IO::select([self], nil, nil, @timeout)
+            retry
+          else
+            raise ::Aerospike::Exceptions::Connection.new("#{e}")
+          end
+        rescue => e
+          raise ::Aerospike::Exceptions::Connection.new("#{e}")
+        end
+      end
+
+      def write(buffer, length)
+        bytes_written = 0
+        until bytes_written >= length
+          bytes_written += write_to_socket(buffer.read(bytes_written, length - bytes_written))
+        end
+      end
+
+      def write_to_socket(data)
+        begin
+          write_nonblock(data)
+        rescue ::IO::WaitWritable => e
+          if ::IO::select(nil, [self], nil, @timeout)
+            retry
+          else
+            raise ::Aerospike::Exceptions::Connection.new("#{e}")
+          end
+        rescue => e
+          raise ::Aerospike::Exceptions::Connection.new("#{e}")
+        end
+      end
+
+      def timeout=(timeout)
+        @timeout = timeout && timeout > 0 ? timeout : nil
+      end
+
+      def connected?
+        !closed?
+      end
+
+      def close
+        return if closed?
+        super()
+      end
+    end
+  end
+end

data/lib/aerospike/socket/ssl.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# 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 Aerospike
+  module Socket
+    class SSL < ::OpenSSL::SSL::SSLSocket
+      include Base
+
+      SUPPORTED_SSL_PARAMS = %i[ca_file ca_path min_version max_version].freeze
+      DEFAULT_SSL_PARAMS = {
+        min_version: :TLS1_2
+      }.freeze
+
+      class << self
+        def connect(host, port, timeout, tls_name, ssl_options)
+          Aerospike.logger.debug("Connecting to #{host}:#{tls_name}:#{port} using SSL options #{ssl_options}")
+          tcp_sock = TCP.connect(host, port, timeout)
+          ctx = build_ssl_context(ssl_options)
+          new(tcp_sock, ctx).tap do |ssl_sock|
+            ssl_sock.hostname = tls_name
+            ssl_sock.connect
+            ssl_sock.post_connection_check(tls_name)
+          end
+        end
+
+        def build_ssl_context(ssl_options)
+          ssl_options[:context] || create_context(ssl_options)
+        end
+
+        def create_context(ssl_options)
+          OpenSSL::SSL::SSLContext.new.tap do |ctx|
+            if ssl_options[:cert_file] && ssl_options[:pkey_file]
+              cert = OpenSSL::X509::Certificate.new(File.read(ssl_options[:cert_file]))
+              pkey = OpenSSL::PKey.read(File.read(ssl_options[:pkey_file]), ssl_options[:pkey_pass])
+              if ctx.respond_to?(:add_certificate)
+                ctx.add_certificate(cert, pkey)
+              else
+                ctx.cert = cert
+                ctx.key = pkey
+              end
+            end
+
+            params = DEFAULT_SSL_PARAMS.merge(filter_params(ssl_options))
+            ctx.set_params(params) unless params.empty?
+          end
+        end
+
+        def filter_params(params)
+          params.select { |key| SUPPORTED_SSL_PARAMS.include?(key) }
+        end
+      end
+    end
+  end
+end

data/lib/aerospike/socket/tcp.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# 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 Aerospike
+  module Socket
+    class TCP < ::Socket
+      include Base
+
+      def self.connect(host, port, timeout)
+        Aerospike.logger.debug("Trying to connect to #{host}:#{port} with #{timeout}s timeout")
+        sock = new(::Socket::AF_INET, ::Socket::SOCK_STREAM, 0)
+        sockaddr = ::Socket.sockaddr_in(port, host)
+
+        begin
+          sock.connect_nonblock(sockaddr)
+        rescue IO::WaitWritable, Errno::EINPROGRESS
+          ::IO.select(nil, [sock], nil, timeout)
+
+          # Because IO.select behaves (return values are different) differently on
+          # different rubies, lets just try `connect_noblock` again. An exception
+          # is raised to indicate the current state of the connection, and at this
+          # point, we are ready to decide if this is a success or a timeout.
+          begin
+            sock.connect_nonblock(sockaddr)
+          rescue Errno::EISCONN
+            # Good, we're connected.
+          rescue Errno::EINPROGRESS, Errno::EALREADY
+            # Bad, we're still waiting to connect.
+            raise ::Aerospike::Exceptions::Connection, "Connection attempt to #{host}:#{port} timed out after #{timeout} secs"
+          rescue => e
+            raise ::Aerospike::Exceptions::Connection, e.message
+          end
+        end
+
+        sock
+      end
+    end
+  end
+end

data/lib/aerospike/utils/buffer.rb

@@ -1,12 +1,15 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+
+# Copyright 2014-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
 #
 # 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
+# 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
@@ -111,12 +114,10 @@ module Aerospike
     end
 
     def read(offset, len=nil)
-      start = offset
-
       if len
-        @buf[start, len]
+        @buf[offset, len]
       else
-        @buf.getbyte(start)
+        @buf.getbyte(offset)
       end
     end
 

data/lib/aerospike/utils/string_parser.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# 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 Aerospike
+  module Utils
+    class StringParser
+      attr_reader :io
+      def initialize(str)
+        @io = ::StringIO.new(str)
+      end
+
+      def current
+        @io.string[@io.tell]
+      end
+
+      # Reads next character and raise if not matching desired one
+      def expect(char)
+        raise ::Aerospike::Exceptions::Parse unless @io.read(1) == char
+      end
+
+      def read_until(char)
+        [].tap do |result|
+          loop do
+            chr = @io.read(1)
+            break if chr == char
+            result << chr
+          end
+        end.join
+      end
+
+      def step(count = 1)
+        @io.read(count)
+      end
+
+    end
+  end
+end

data/lib/aerospike/value/value.rb

@@ -1,12 +1,15 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+
+# Copyright 2014-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
 #
 # 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
+# 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
@@ -14,22 +17,19 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require 'aerospike/aerospike_exception'
 
 module Aerospike
-
-  private
-
   # Polymorphic value classes used to efficiently serialize objects into the wire protocol.
   class Value #:nodoc:
+    INTEGER_RANGE = Range.new(-2**63, 2**63 - 1).freeze
 
     def self.of(value)
       case value
       when nil
         res = NullValue.new
       when Integer
-        if value < 2**63
+        if INTEGER_RANGE.cover?(value)
           res = IntegerValue.new(value)
         else
           # big nums > 2**63 are not supported
@@ -480,5 +480,4 @@ module Aerospike
       nil
     end
   end
-
 end # module

data/lib/aerospike/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Aerospike
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -62,10 +62,9 @@ files:
 - lib/aerospike/cdt/map_return_type.rb
 - lib/aerospike/cdt/map_write_mode.rb
 - lib/aerospike/client.rb
-- lib/aerospike/cluster/cluster.rb
-- lib/aerospike/cluster/connection.rb
-- lib/aerospike/cluster/node.rb
-- lib/aerospike/cluster/node_validator.rb
+- lib/aerospike/cluster.rb
+- lib/aerospike/cluster/create_connection.rb
+- lib/aerospike/cluster/find_node.rb
 - lib/aerospike/cluster/partition.rb
 - lib/aerospike/cluster/partition_tokenizer_new.rb
 - lib/aerospike/cluster/partition_tokenizer_old.rb
@@ -88,13 +87,33 @@ files:
 - lib/aerospike/command/touch_command.rb
 - lib/aerospike/command/unsupported_particle_type_validator.rb
 - lib/aerospike/command/write_command.rb
+- lib/aerospike/connection/authenticate.rb
+- lib/aerospike/connection/create.rb
 - lib/aerospike/geo_json.rb
 - lib/aerospike/host.rb
+- lib/aerospike/host/parse.rb
 - lib/aerospike/info.rb
 - lib/aerospike/key.rb
 - lib/aerospike/language.rb
 - lib/aerospike/loggable.rb
+- lib/aerospike/node.rb
+- lib/aerospike/node/generation.rb
+- lib/aerospike/node/refresh/failed.rb
+- lib/aerospike/node/refresh/friends.rb
+- lib/aerospike/node/refresh/info.rb
+- lib/aerospike/node/refresh/partitions.rb
+- lib/aerospike/node/refresh/peers.rb
+- lib/aerospike/node/refresh/reset.rb
+- lib/aerospike/node/verify/cluster_name.rb
+- lib/aerospike/node/verify/name.rb
+- lib/aerospike/node/verify/partition_generation.rb
+- lib/aerospike/node/verify/peers_generation.rb
+- lib/aerospike/node_validator.rb
 - lib/aerospike/operation.rb
+- lib/aerospike/peer.rb
+- lib/aerospike/peers.rb
+- lib/aerospike/peers/fetch.rb
+- lib/aerospike/peers/parse.rb
 - lib/aerospike/policy/admin_policy.rb
 - lib/aerospike/policy/batch_policy.rb
 - lib/aerospike/policy/client_policy.rb
@@ -117,6 +136,9 @@ files:
 - lib/aerospike/query/stream_command.rb
 - lib/aerospike/record.rb
 - lib/aerospike/result_code.rb
+- lib/aerospike/socket/base.rb
+- lib/aerospike/socket/ssl.rb
+- lib/aerospike/socket/tcp.rb
 - lib/aerospike/task/execute_task.rb
 - lib/aerospike/task/index_task.rb
 - lib/aerospike/task/task.rb
@@ -128,6 +150,7 @@ files:
 - lib/aerospike/utils/buffer.rb
 - lib/aerospike/utils/packer.rb
 - lib/aerospike/utils/pool.rb
+- lib/aerospike/utils/string_parser.rb
 - lib/aerospike/utils/unpacker.rb
 - lib/aerospike/value/particle_type.rb
 - lib/aerospike/value/value.rb
@@ -146,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="