Merge pull request #159 from nats-io/auth-token

Auth token support

lib/nats/client.rb

@@ -770,7 +770,7 @@ def user_err_cb? # :nodoc:
   end
 
   def auth_connection?
-    !@uri.user.nil?
+    !@uri.user.nil? || @options[:token]
   end
 
   def connect_command #:nodoc:
@@ -782,10 +782,16 @@ def connect_command #:nodoc:
       :protocol => ::NATS::PROTOCOL_VERSION,
       :echo => !@options[:no_echo]
     }
-    if auth_connection?
+    case
+    when @options[:token]
+      cs[:auth_token] = @options[:token]
+    when @uri.password.nil?
+      cs[:auth_token] = @uri.user
+    else
       cs[:user] = @uri.user
       cs[:pass] = @uri.password
-    end
+    end if auth_connection?
+
     cs[:name] = @options[:name] if @options[:name]
     cs[:ssl_required] = @ssl if @ssl
     cs[:tls_required] = true if @tls
@@ -943,9 +949,9 @@ def process_info(info) #:nodoc:
           u.password = options[:pass] if options[:pass]
 
           # Use creds from the current server if not set explicitly.
-          if @uri
-            u.user ||= @uri.user if @uri.user
-            u.password ||= @uri.password if @uri.password
+          if @uri and !@uri.user.nil? and !@uri.user.empty?
+            u.user ||= @uri.user
+            u.password ||= @uri.password
           end
 
           srvs << { :uri => u, :reconnect_attempts => 0, :discovered => true }

spec/client/client_connect_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Client - Connect' do
+describe 'Client - connect' do
 
   before(:each) do
     @s = NatsServerControl.new

spec/client/client_drain_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Client - Drain' do
+describe 'Client - drain' do
 
   before(:each) do
     @s = NatsServerControl.new

spec/client/client_requests_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Client - Requests' do
+describe 'Client - requests' do
 
   before(:each) do
     @s = NatsServerControl.new

spec/client/cluster_auth_token_spec.rb

@@ -0,0 +1,171 @@
+require 'spec_helper'
+require 'yaml'
+
+describe 'Client - auth token' do
+
+  before(:all) do
+
+    auth_options = {
+      'token'    => 'deadbeef',
+      'timeout'  => 5
+    }
+
+    s1_config_opts = {
+      'pid_file'      => '/tmp/nats_cluster_s1.pid',
+      'authorization' => auth_options,
+      'host'          => '127.0.0.1',
+      'port'          => 4242,
+      'cluster_port'  => 6222
+    }
+
+    s2_config_opts = {
+      'pid_file'      => '/tmp/nats_cluster_s2.pid',
+      'authorization' => auth_options,
+      'host'          => '127.0.0.1',
+      'port'          => 4243,
+      'cluster_port'  => 6223
+    }
+
+    nodes = []
+    configs = [s1_config_opts, s2_config_opts]
+    configs.each do |config_opts|
+
+      other_nodes_configs = configs.select do |conf|
+        conf['cluster_port'] != config_opts['cluster_port']
+      end
+
+      routes = []
+      other_nodes_configs.each do |conf|
+        routes <<  "nats-route://foo:bar@127.0.0.1:#{conf['cluster_port']}"
+      end
+
+      nodes << NatsServerControl.init_with_config_from_string(%Q(
+        host: '#{config_opts['host']}'
+        port:  #{config_opts['port']}
+
+        pid_file: '#{config_opts['pid_file']}'
+
+        authorization {
+          token: '#{auth_options["token"]}'
+          timeout: #{auth_options["timeout"]}
+        }
+
+        cluster {
+          host: '#{config_opts['host']}'
+          port: #{config_opts['cluster_port']}
+
+          authorization {
+            user: foo
+            password: bar
+            timeout: #{auth_options["timeout"]}
+          }
+
+          routes = [
+            #{routes.join("\n            ")}
+          ]
+        }
+      ), config_opts)
+    end
+
+    @s1, @s2 = nodes
+  end
+
+  before(:each) do
+    [@s1, @s2].each do |s|
+      s.start_server(true)
+    end
+  end
+
+  after(:each) do
+    [@s1, @s2].each do |s|
+      s.kill_server
+    end
+  end
+
+  let(:auth_token) {
+    'deadbeef'
+  }
+
+  it 'should properly connect to different servers using token' do
+    EM.run do
+      c1 = NATS.connect(:uri => @s1.uri, :token => auth_token)
+      c2 = NATS.connect(:uri => "nats://#{auth_token}@#{@s1.uri.host}:#{@s1.uri.port}")
+      c3 = NATS.connect("nats://#{auth_token}@#{@s1.uri.host}:#{@s1.uri.port}")
+      wait_on_connections([c1, c2, c3]) do
+        EM.stop
+      end
+    end
+  end
+
+  it 'should raise auth error when using wrong token' do
+    errors = []
+    with_em_timeout(2) do |future|
+      NATS.on_error do |e|
+        errors << e
+        future.resume
+      end
+      NATS.connect(:uri => @s1.uri, :token => 'wrong')
+    end
+    expect(errors.count).to eql(1)
+    expect(errors.first).to be_a(NATS::AuthError)
+
+    errors = []
+    with_em_timeout(2) do |future|
+      NATS.on_error do |e|
+        errors << e
+        future.resume
+      end
+      NATS.connect(:uri => "nats://wrong@#{@s1.uri.host}:#{@s1.uri.port}")
+    end
+    expect(errors.count).to eql(1)
+    expect(errors.first).to be_a(NATS::AuthError)
+
+    errors = []
+    with_em_timeout(2) do |future|
+      NATS.on_error do |e|
+        errors << e
+        future.resume
+      end
+      NATS.connect("nats://wrong@#{@s1.uri.host}:#{@s1.uri.port}")
+    end
+    expect(errors.count).to eql(1)
+    expect(errors.first).to be_a(NATS::AuthError)
+  end
+
+  it 'should reuse token for reconnecting' do
+    data = 'Hello World!'
+    to_send = 100
+    received = c1_received = c2_received = 0
+    reconnected = false
+    with_em_timeout(3) do
+      c1 = NATS.connect(:uri => @s1.uri, :token => auth_token)
+      c2 = NATS.connect(:uri => @s2.uri, :token => auth_token)
+      c1.on_reconnect do
+        reconnected = true
+      end
+
+      c1.subscribe('foo', :queue => 'bar') do |msg|
+        expect(msg).to eql(data)
+        received += 1
+      end
+      c2.subscribe('foo', :queue => 'bar') do |msg|
+        expect(msg).to eql(data)
+        received += 1
+      end
+
+      wait_on_routes_connected([c1, c2]) do
+        (1..to_send).each { c2.publish('foo', data) }
+      end
+
+      EM.add_timer(0.5) do
+        @s1.kill_server
+        EM.add_timer(1) do
+          (1..to_send).each { c2.publish('foo', data) }
+        end
+      end
+    end
+
+    expect(received).to eql(to_send*2)
+    expect(reconnected).to eql(true)
+  end
+end