rserve-client 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3a03347161784ff8220b9e7a8ef33620643fa5
-  data.tar.gz: 46b6892b3f439202a362f3c1db6f9f75c26eb828
+  metadata.gz: fff9789e59308f0fc962b2d3a4fece6fdcc00b74
+  data.tar.gz: 5adc4082d943001c3fcb2cc9af70caf9afa00ef8
 SHA512:
-  metadata.gz: 884b4e27bd68a01679bf774f21ee5f4b022ca591fef8f27cd1058ed27259da612cd6632e3206a570274399af195f137ec837c0ab5040535e895416ab688417f1
-  data.tar.gz: 0909cebb7571cadda549e0c5965a01e58b4e1a46d3b48e750653a347b158afa8c483440ccc40c557fb8d5d96c3a3451ec440722a4e3699d02affc20be0713cd6
+  metadata.gz: 459d3aae846e86289edf748ea0a74694e06fc77fe097bbb5639a5f338922408607418ab4006e220231480af0a9b23f00b9811d5c989632eae5bbb3be72c70e77
+  data.tar.gz: 97a53fdc28bc498980d30ca0935c00a5dc9877ddeb8c824221015eed6a7025712c61d9bd824fbf2ffd6c0388b3d91b81607ff1fa2b9de6600feaa75e33062972

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 gem 'hoe'
 gem 'rspec'
 gem 'rake'
+gem 'rbx-require-relative', :platforms => :ruby_18

data/Gemfile.lock

@@ -5,6 +5,7 @@ GEM
     hoe (3.16.0)
       rake (>= 0.8, < 13.0)
     rake (12.0.0)
+    rbx-require-relative (0.0.9)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -25,7 +26,8 @@ PLATFORMS
 DEPENDENCIES
   hoe
   rake
+  rbx-require-relative
   rspec
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.3 / 2017-07-06
+
+* Added support for crypt and plaintext authentication 
+
 === 0.3.2 / 2017-05-17
 
 * Updated Gemfile

data/Manifest.txt

@@ -50,6 +50,7 @@ lib/rserve/withattributes.rb
 lib/rserve/withnames.rb
 spec/rserve_bug_1_spec.rb
 spec/rserve_bug_26_spec.rb
+spec/rserve_connection_authentication_spec.rb 
 spec/rserve_connection_on_unix_spec.rb
 spec/rserve_connection_spec.rb
 spec/rserve_double_spec.rb

data/README.md

@@ -59,7 +59,6 @@ Cons:
 
 Implements
 
-* Authentification
 * Original test
 
 Spec

data/data/Rserv-cryptonly.conf.example

@@ -0,0 +1,4 @@
+port 6313
+auth required
+plaintext disable
+remote enable

data/data/Rserv-plaintext.conf.example

@@ -0,0 +1,4 @@
+port 6312
+auth required
+plaintext enable
+remote enable

data/data/Rserv.passwords

@@ -0,0 +1 @@
+test password

data/lib/rserve.rb

@@ -1,26 +1,27 @@
 require 'socket'
 require 'rbconfig'
 module Rserve
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   ON_WINDOWS=RbConfig::CONFIG['arch']=~/mswin|mingw/
 end
 
 require 'spoon' if RUBY_PLATFORM == "java"
+require 'require_relative' if RUBY_VERSION < "1.9"
 
-require 'rserve/withnames'
-require 'rserve/withattributes'
-require 'rserve/with2dnames'
-require 'rserve/with2dsizes'
+require_relative 'rserve/withnames'
+require_relative 'rserve/withattributes'
+require_relative 'rserve/with2dnames'
+require_relative 'rserve/with2dsizes'
 
 
-require 'rserve/protocol'
-require 'rserve/packet'
-require 'rserve/talk'
-require 'rserve/rexp'
-require 'rserve/engine'
-require 'rserve/session'
-require 'rserve/connection'
-require 'rserve/rlist'
-require 'rserve/rfactor'
+require_relative 'rserve/protocol'
+require_relative 'rserve/packet'
+require_relative 'rserve/talk'
+require_relative 'rserve/rexp'
+require_relative 'rserve/engine'
+require_relative 'rserve/session'
+require_relative 'rserve/connection'
+require_relative 'rserve/rlist'
+require_relative 'rserve/rfactor'
 
 

data/lib/rserve/connection.rb

@@ -10,6 +10,7 @@ module Rserve
     IncorrectServerError=Class.new(StandardError)
     IncorrectServerVersionError=Class.new(StandardError)
     IncorrectProtocolError=Class.new(StandardError)
+    IncorrectCredentialsError=Class.new(StandardError)
     NotConnectedError=Class.new(StandardError)
     # Eval error
     class EvalError < RuntimeError
@@ -41,12 +42,14 @@ module Rserve
     # You could provide a hash with options. Options are analog to java client:
     # [+:auth_req+]           If authentification is required (false by default)
     # [+:transfer_charset+]   Transfer charset ("UTF-8" by default)
-    # [+:auth_type+]          Type of authentification (AT_plain by default)
+    # [+:auth_type+]          Type of authentication (AT_plain by default)
     # [+:hostname+]           Hostname of Rserve ("127.0.0.1" by default)
     # [+:port_number+]        Port Number of Rserve (6311 by default)
     # [+:max_tries+]          Maximum number of tries before give up  (5 by default)
-    # [+:cmd_init+]            Command to init Rserve if not initialized ("R CMD Rserve" by default)
-    # [+:proc_rserve_ok+]      Proc testing if Rserve works (uses system by default)
+    # [+:cmd_init+]           Command to init Rserve if not initialized ("R CMD Rserve" by default)
+    # [+:proc_rserve_ok+]     Proc testing if Rserve works (uses system by default)
+    # [+:username+]           Username to use (if authentication is required)
+    # [+:password+]           Password to use (if authentication is required)
     def initialize(opts=Hash.new)
       @auth_req         = opts.delete(:auth_req)          || false
       @transfer_charset = opts.delete(:transfer_charset)  || "UTF-8"
@@ -56,6 +59,8 @@ module Rserve
       @max_tries        = opts.delete(:max_tries)         || 5
       @cmd_init         = opts.delete(:cmd_init)          || "R CMD Rserve"
       @proc_rserve_ok   = opts.delete(:proc_rserve_ok)    || lambda { system "killall -s 0 Rserve" } 
+      @username         = opts.delete(:username)          || nil
+      @password         = opts.delete(:password)          || nil
       @session          = opts.delete(:session)           || nil
       @tries            = 0
       @connected=false
@@ -115,20 +120,15 @@ module Rserve
         (3..7).each do |i|
           attr=input[i]
           if (attr=="ARpt") 
-            if (!auth_req) # this method is only fallback when no other was specified
-              auth_req=true
-              auth_type=AT_plain
-            end
-          end
-          if (attr=="ARuc") 
-            auth_req=true
-            authType=AT_crypt
-          end
-          if (attr[0]=='K') 
-            key=attr[1,3]
+            @auth_req=true
+          elsif (attr=="ARuc") 
+            @auth_req=true
+            @auth_type=AT_crypt #
+          elsif (attr[0..0]=='K') 
+            @key=attr[1,2]
           end
-          
         end
+        login if auth_req
       else # we have a session to take care of
         @s.write(@session.key.pack("C*"))
         @rsrv_version=session.rsrv_version
@@ -143,6 +143,14 @@ module Rserve
       @connected
     end
     
+    # This server requires a login. Send the required credentials to the server.
+    def login
+      raise IncorrectCredentialsError, "Need username and password to connect" if @username.nil? || @password.nil?
+      @password = @password.crypt(key) if key && auth_type == AT_crypt
+      rp = @rt.request({:cmd => Rserve::Protocol::CMD_login, :cont => "#{@username}\n#{@password}"})
+      raise IncorrectCredentialsError, "Server did not accept credentials" if rp.error?
+    end
+    
     # Closes current connection
     def close
       if !@s.nil? and !@s.closed?

data/lib/rserve/packet.rb

@@ -6,6 +6,7 @@ module Rserve
     ERROR_DESCRIPTIONS={
       2=>'Invalid expression',
       3=>'Parse error',
+     65=>'Login error',
     127=>'Unknown variable/method'}
 
     def initialize(cmd, cont)

data/lib/rserve/protocol.rb

@@ -230,4 +230,4 @@ module Rserve
   end
 end
 
-require 'rserve/protocol/rexpfactory'
+require_relative 'protocol/rexpfactory'

data/lib/rserve/rexp.rb

@@ -424,32 +424,32 @@ module Rserve
 end
     
     
-require 'rserve/rexp/environment'
-require 'rserve/rexp/null'
-require 'rserve/rexp/unknown'
+require_relative 'rexp/environment'
+require_relative 'rexp/null'
+require_relative 'rexp/unknown'
 
 
-require 'rserve/rexp/vector'
+require_relative 'rexp/vector'
 
-require 'rserve/rexp/raw'
-require 'rserve/rexp/symbol'
-require 'rserve/rexp/string'
-require 'rserve/rexp/double'
-require 'rserve/rexp/integer'
-require 'rserve/rexp/logical'
+require_relative 'rexp/raw'
+require_relative 'rexp/symbol'
+require_relative 'rexp/string'
+require_relative 'rexp/double'
+require_relative 'rexp/integer'
+require_relative 'rexp/logical'
 
-require 'rserve/rexp/factor'
+require_relative 'rexp/factor'
 
-require 'rserve/rexp/genericvector'
-require 'rserve/rexp/expressionvector'
+require_relative 'rexp/genericvector'
+require_relative 'rexp/expressionvector'
 
 
-require 'rserve/rexp/list'
-require 'rserve/rexp/language'
-require 'rserve/rexp/s4'
+require_relative 'rexp/list'
+require_relative 'rexp/language'
+require_relative 'rexp/s4'
 
-require 'rserve/rexp/reference'
+require_relative 'rexp/reference'
 
-require 'rserve/rexp/wrapper'
-require 'rserve/rexp/function'
+require_relative 'rexp/wrapper'
+require_relative 'rexp/function'
 

data/spec/rserve_connection_authentication_spec.rb

@@ -0,0 +1,70 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+require 'tempfile'
+
+describe Rserve::Connection do
+  before(:all) do
+    lambda { system "killall Rserve" }.call #clean up any extra Rserves
+    password_file = File.expand_path("./data/Rserv.passwords")
+    
+    plain_config = IO.read('./data/Rserv-plaintext.conf.example')
+    plain_config = plain_config + "\npwdfile #{password_file}\n"
+    @plain_config_file = Tempfile.new('Rserv-plaintext.conf')
+    @plain_config_file.write(plain_config)
+    @plain_config_file.flush
+    crypt_config = IO.read('./data/Rserv-cryptonly.conf.example')
+    crypt_config = crypt_config + "\npwdfile #{password_file}\n"
+    @crypt_config_file = Tempfile.new('Rserv-cryptonly.conf')
+    @crypt_config_file.write(crypt_config)
+    @crypt_config_file.flush
+  end
+  describe "opening and closing plaintext" do
+    before(:all) do
+      @r=Rserve::Connection.new(:cmd_init => "R CMD Rserve --RS-conf #{@plain_config_file.path}", :username => "test", :password => "password", :port_number => 6312)
+    end
+    it "should be open a connection and receive ID-String" do
+      @r.get_server_version.should==103
+      @r.protocol.should=="QAP1"
+      @r.last_error.should=="OK"
+      @r.rt.should be_instance_of(Rserve::Talk)
+    end
+    it "should eval something properly" do
+      @r.void_eval("x<-1").should be true
+    end
+    it "should shut down correctly" do
+      @r.should be_connected
+      @r.close.should be true
+      @r.should_not be_connected
+    end
+  end
+  describe "opening and closing plaintext wrong password" do
+    it "should fail to connect" do
+      expect {@r=Rserve::Connection.new(:cmd_init => "R CMD Rserve --RS-conf #{@plain_config_file.path}", :username => "test", :password => "wrongpassword", :port_number => 6312)}.to raise_error(Rserve::Connection::IncorrectCredentialsError)
+      lambda { system "killall Rserve" }.call #clean up any extra Rserves
+    end
+  end
+  describe "opening and closing crypt" do
+    before(:all) do
+      @r=Rserve::Connection.new(:cmd_init => "R CMD Rserve --RS-conf #{@crypt_config_file.path}", :username => "test", :password => "password", :port_number => 6313)
+    end
+    it "should be open a connection and receive ID-String" do
+      @r.get_server_version.should==103
+      @r.protocol.should=="QAP1"
+      @r.last_error.should=="OK"
+      @r.rt.should be_instance_of(Rserve::Talk)
+    end
+    it "should eval something properly" do
+      @r.void_eval("x<-1").should be true
+    end
+    it "should shut down correctly" do
+      @r.should be_connected
+      @r.close.should be true
+      @r.should_not be_connected
+    end
+  end
+  describe "opening and closing crypt wrong password" do
+    it "should fail to connect" do
+      expect {@r=Rserve::Connection.new(:cmd_init => "R CMD Rserve --RS-conf #{@crypt_config_file.path}", :username => "test", :password => "wrongpassword", :port_number => 6313)}.to raise_error(Rserve::Connection::IncorrectCredentialsError)
+      lambda { system "killall Rserve" }.call #clean up any extra Rserves
+    end
+  end
+end

data/spec/rserve_connection_on_unix_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe "Rserve::Connection on unix" do
   if !Rserve::ON_WINDOWS
     before do
-        @r=Rserve::Connection.new
+      @r=Rserve::Connection.new
     end
     after do
       @r.close if @r.connected?

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rserve'
 require 'matrix'
 require 'pp'
 
+INFINITY = +1.0/0.0 if RUBY_VERSION < "1.9"
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rserve-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Claudio Bustos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,9 @@ files:
 - benchmark/comparison_2010_06_07.xls
 - benchmark/comparison_2010_06_07_using_pack.xls
 - benchmark/plot.rb
+- data/Rserv-cryptonly.conf.example
+- data/Rserv-plaintext.conf.example
+- data/Rserv.passwords
 - data/gettysburg.txt
 - examples/gettysburg.rb
 - examples/hello_world.rb
@@ -101,6 +104,7 @@ files:
 - rserve-client.gemspec
 - spec/rserve_bug_1_spec.rb
 - spec/rserve_bug_26_spec.rb
+- spec/rserve_connection_authentication_spec.rb
 - spec/rserve_connection_on_unix_spec.rb
 - spec/rserve_connection_spec.rb
 - spec/rserve_double_spec.rb