impala 0.4.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 488007beb7a8a2ecc5e1663356305ea2d2a705d1
+  data.tar.gz: 4e7276e73ee5d17e790116fc38f59938e00d5e15
+SHA512:
+  metadata.gz: 6e903365b98beb2a78e2a2a4bea721035ca58344b54e196ba67ae15ac814a20024ef79565d019dc390a58529ff80cc760f254d67080833e21fdb44f90f164eeb
+  data.tar.gz: 0d43d9e6442237bd7ecc27ff9770bc3e51058d166a847200c1830b5466bb3c51250be848b8563922618dc10199c716f487bd01d3e5c40ba97188205d137375e4

data/.travis.yml

@@ -1,4 +1,4 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.1.2
+  - 2.2

data/README.md

@@ -1,6 +1,6 @@
 # impala-ruby
 
-![build](https://travis-ci.org/colinmarc/impala-ruby.svg?branch=master)   [![rubygems](https://badge.fury.io/rb/impala.svg)](http://rubygems.org/gems/impala)
+[![build](https://travis-ci.org/colinmarc/impala-ruby.svg?branch=master)](https://travis-ci.org/colinmarc/impala-ruby)   [![rubygems](https://badge.fury.io/rb/impala.svg)](http://rubygems.org/gems/impala)
 
 This is a ruby client for [Cloudera Impala][1]. You use it like this:
 

data/impala.gemspec

@@ -13,9 +13,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/colinmarc/impala-ruby"
   gem.license      = 'MIT'
 
-  gem.add_dependency('thrift', '~> 0.9.1')
-  gem.add_dependency('rack')
-  gem.add_dependency('thin')
+  gem.add_dependency('thrift', '~> 0.9')
+  gem.add_dependency('gssapi', '~> 1.2')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('pry')

data/lib/impala.rb

@@ -10,6 +10,7 @@ require 'impala/version'
 require 'thrift'
 require 'time'
 require 'impala/protocol'
+require 'impala/sasl_transport'
 require 'impala/cursor'
 require 'impala/connection'
 
@@ -22,15 +23,26 @@ module Impala
   class ParsingError < StandardError; end
 
   # Connect to an Impala server. If a block is given, it will close the
-  # connection after yielding the connection to the block.
+  #   connection after yielding the connection to the block.
   # @param [String] host the hostname or IP address of the Impala server
   # @param [int] port the port that the Impala server is listening on
+  # @param [Hash] options connection options
+  # @option options [int] :timeout the timeout in seconds to use when connecting
+  # @option options [Hash] :sasl if present, used to connect with SASL PLAIN
+  #   authentication. Should have two properties:
+  #   - *:username* (String)
+  #   - *:password* (String)
+  # @option options [Hash] :kerberos if present, used to connect with SASL
+  #   GSSAPI authentication using whatever context is available. Should have two
+  #   properties:
+  #   - *:host* (String)
+  #   - *:provider* (String)
   # @yieldparam [Connection] conn the open connection. Will be closed once the block
   #    finishes
   # @return [Connection] the open connection, or, if a block is
   #    passed, the return value of the block
-  def self.connect(host=DEFAULT_HOST, port=DEFAULT_PORT)
-    connection = Connection.new(host, port)
+  def self.connect(host=DEFAULT_HOST, port=DEFAULT_PORT, options={})
+    connection = Connection.new(host, port, options)
 
     if block_given?
       begin

data/lib/impala/connection.rb

@@ -5,9 +5,10 @@ module Impala
     LOG_CONTEXT_ID = "impala-ruby"
 
     # Don't instantiate Connections directly; instead, use {Impala.connect}.
-    def initialize(host, port)
+    def initialize(host, port, options={})
       @host = host
       @port = port
+      @options = options
       @connected = false
       open
     end
@@ -20,9 +21,16 @@ module Impala
     def open
       return if @connected
 
-      socket = Thrift::Socket.new(@host, @port)
+      socket = Thrift::Socket.new(@host, @port, @options[:timeout])
+
+      if @options[:kerberos]
+        @transport = SASLTransport.new(socket, :GSSAPI, @options[:kerberos])
+      elsif @options[:sasl]
+        @transport = SASLTransport.new(socket, :PLAIN, @options[:sasl])
+      else
+        @transport = Thrift::BufferedTransport.new(socket)
+      end
 
-      @transport = Thrift::BufferedTransport.new(socket)
       @transport.open
 
       proto = Thrift::BinaryProtocol.new(@transport)

data/lib/impala/sasl_transport.rb

@@ -0,0 +1,117 @@
+require 'gssapi'
+
+module Impala
+  class SASLTransport < Thrift::FramedTransport
+    STATUS_BYTES = 1
+    PAYLOAD_LENGTH_BYTES = 4
+    NEGOTIATION_STATUS = {
+      START:    0x01,
+      OK:       0x02,
+      BAD:      0x03,
+      ERROR:    0x04,
+      COMPLETE: 0x05
+    }
+
+    def initialize(transport, mechanism, options={})
+      super(transport)
+      @mechanism = mechanism.to_sym
+      @options = options
+
+      unless [:PLAIN, :GSSAPI].include? @mechanism
+        raise "Unknown SASL mechanism: #{@mechanism}"
+      end
+
+      if @mechanism == :GSSAPI
+        @gsscli = GSSAPI::Simple.new(@options[:host], @options[:principal])
+      end
+    end
+
+    def open
+      super
+
+      case @mechanism
+      when :PLAIN
+        handshake_plain!
+      when :GSSAPI
+        handshake_gssapi!
+      end
+    end
+
+    private
+
+    def handshake_plain!
+      username = @options.fetch(:username, 'anonymous')
+      password = @options.fetch(:password, 'anonymous')
+
+      token = "[PLAIN]\u0000#{username}\u0000#{password}"
+      write_handshake_message(NEGOTIATION_STATUS[:START], 'PLAIN')
+      write_handshake_message(NEGOTIATION_STATUS[:OK], token)
+
+      status, _ = read_handshake_message
+      case status
+      when NEGOTIATION_STATUS[:COMPLETE]
+        @open = true
+      when NEGOTIATION_STATUS[:OK]
+        raise "Failed to complete challenge exchange: only NONE supported currently"
+      end
+    end
+
+    def handshake_gssapi!
+      token = @gsscli.init_context
+      write_handshake_message(NEGOTIATION_STATUS[:START], 'GSSAPI')
+      write_handshake_message(NEGOTIATION_STATUS[:OK], token)
+
+      status, msg = read_handshake_message
+      case status
+      when NEGOTIATION_STATUS[:COMPLETE]
+        raise "Unexpected COMPLETE from server"
+      when NEGOTIATION_STATUS[:OK]
+        unless @gsscli.init_context(msg)
+          raise "GSSAPI: challenge provided by server could not be verified"
+        end
+
+        write_handshake_message(NEGOTIATION_STATUS[:OK], "")
+
+        status, msg = read_handshake_message
+        case status
+        when NEGOTIATION_STATUS[:COMPLETE]
+          raise "Unexpected COMPLETE from server"
+        when NEGOTIATION_STATUS[:OK]
+          unwrapped = @gsscli.unwrap_message(msg)
+          rewrapped = @gsscli.wrap_message(unwrapped)
+
+          write_handshake_message(NEGOTIATION_STATUS[:COMPLETE], rewrapped)
+
+          status, msg = read_handshake_message
+          case status
+          when NEGOTIATION_STATUS[:COMPLETE]
+            @open = true
+          when NEGOTIATION_STATUS[:OK]
+            raise "Failed to complete GSS challenge exchange"
+          end
+        end
+      end
+    end
+
+    def read_handshake_message
+      status, len = @transport.read(STATUS_BYTES + PAYLOAD_LENGTH_BYTES).unpack('cl>')
+      body = @transport.to_io.read(len)
+      if [NEGOTIATION_STATUS[:BAD], NEGOTIATION_STATUS[:ERROR]].include?(status)
+        raise "Exception from server: #{body}"
+      end
+
+      [status, body]
+    end
+
+    def write_handshake_message(status, message)
+      header = [status, message.length].pack('cl>')
+      @transport.write(header + message)
+    end
+  end
+
+  class SASLTransportFactory < Thrift::BaseTransportFactory
+    def get_transport(transport)
+      return SASLTransport.new(transport)
+    end
+  end
+end

data/lib/impala/version.rb

@@ -1,3 +1,3 @@
 module Impala
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/test/test_impala.rb

@@ -4,7 +4,7 @@ require 'mocha/setup'
 
 describe 'Impala.connect' do
   before do
-    Thrift::Socket.expects(:new).with('host', 12345)
+    Thrift::Socket.expects(:new).with('host', 12345, nil)
     Thrift::BufferedTransport.expects(:new).once.returns(stub(:open => nil))
     Thrift::BinaryProtocol.expects(:new).once
     Impala::Protocol::ImpalaService::Client.expects(:new).once

metadata

@@ -1,174 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: impala
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Colin Marc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: gssapi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A ruby client for Cloudera's Impala
@@ -178,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -207,6 +172,7 @@ files:
 - lib/impala/protocol/status_types.rb
 - lib/impala/protocol/t_c_l_i_service.rb
 - lib/impala/protocol/thrift_hive_metastore.rb
+- lib/impala/sasl_transport.rb
 - lib/impala/version.rb
 - test/test_impala.rb
 - test/test_impala_connected.rb
@@ -219,29 +185,27 @@ files:
 homepage: https://github.com/colinmarc/impala-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A ruby client for Cloudera's Impala
 test_files:
 - test/test_impala.rb
 - test/test_impala_connected.rb
-has_rdoc: