logstash-input-relp 0.1.5 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d2a8b3a1b966051c8b74a3a94db1c77ea76ef1
-  data.tar.gz: d5938b79c90b7760de5e937a4963c302000b244c
+  metadata.gz: bf41bf3e9f571773cd7317ccaa639812b8af4b75
+  data.tar.gz: 5b7b8ade54236ee71f4dd1540a81a831b245c02b
 SHA512:
-  metadata.gz: cb273ffba74d11178774f298d9f32a32ba501dfd82a81f1291cf1e01d5723f8927c01586fab31a0f3bd0d47c23f441b6877140b893fabad3e31010e9e4a99086
-  data.tar.gz: 42354917795eb38ae5b6b640290d02d10baa18478c07b6f14b9c130c03a850481a77e9a0ed0243a84b7b5256396c56a07187e382f9b81fa79fb6791a85707efa
+  metadata.gz: c6724f73a866b45ec55f446c732b1fae0c027fda14bb5cf7516be7fd669a078c82d227db9442fd90467b5ad78d3552873df1ba823573facd37f0807ca17ee548
+  data.tar.gz: e616c70e39a338199012442b962b2b3766417b028d5b3ab10f0d0aefcd9bdf26e3e970714eed99973865ac286ec02b78504b93b6cbdbf620e1ecc5aba662f27f

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+
+# 0.2.0
+ - Add support for using RELP over SSL sockets

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/README.md

@@ -1,19 +1,19 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/relp.rb

@@ -4,8 +4,6 @@ require "logstash/namespace"
 require "logstash/util/relp"
 require "logstash/util/socket_peer"
 
-
-
 # Read RELP events over a TCP socket.
 #
 # For more information about RELP, see
@@ -27,25 +25,77 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
   # The port to listen on.
   config :port, :validate => :number, :required => true
 
+  # Enable SSL (must be set for other `ssl_` options to take effect).
+  config :ssl_enable, :validate => :boolean, :default => false
+
+  # Verify the identity of the other end of the SSL connection against the CA.
+  # For input, sets the field `sslsubject` to that of the client certificate.
+  config :ssl_verify, :validate => :boolean, :default => true
+
+  # The SSL CA certificate, chainfile or CA path. The system CA path is automatically included.
+  config :ssl_cacert, :validate => :path
+
+  # SSL certificate path
+  config :ssl_cert, :validate => :path
+
+  # SSL key path
+  config :ssl_key, :validate => :path
+
+  # SSL key passphrase
+  config :ssl_key_passphrase, :validate => :password, :default => nil
+
   def initialize(*args)
     super(*args)
-    @interrupted = false
     @relp_server = nil
   end # def initialize
 
   public
   def register
     @logger.info("Starting relp input listener", :address => "#{@host}:#{@port}")
-    @relp_server = RelpServer.new(@host, @port,['syslog'])
+    if @ssl_enable
+      initialize_ssl_context
+      if @ssl_verify == false
+        @logger.warn [
+          "** WARNING ** Detected UNSAFE options in relp input configuration!",
+          "** WARNING ** You have enabled encryption but DISABLED certificate verification.",
+          "** WARNING ** To make sure your data is secure change :ssl_verify to true"
+        ].join("\n")
+      end
+    end
+    @relp_server = RelpServer.new(@host, @port,['syslog'], @ssl_context)
   end # def register
 
+  private
+  def initialize_ssl_context
+    require "openssl"
+
+    @ssl_context = OpenSSL::SSL::SSLContext.new
+    @ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@ssl_cert))
+    @ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@ssl_key),@ssl_key_passphrase.value)
+    if @ssl_verify
+      @cert_store = OpenSSL::X509::Store.new
+      # Load the system default certificate path to the store
+      @cert_store.set_default_paths
+      if !@ssl_cacert.nil?
+        if File.directory?(@ssl_cacert)
+          @cert_store.add_path(@ssl_cacert)
+        else
+          @cert_store.add_file(@ssl_cacert)
+        end
+      end
+      @ssl_context.cert_store = @cert_store
+      @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+    end
+  end
+
   private
   def relp_stream(relpserver,socket,output_queue,client_address)
-    loop do
+    while !stop?
       frame = relpserver.syslog_read(socket)
       @codec.decode(frame["message"]) do |event|
         decorate(event)
         event["host"] = client_address
+        event["sslsubject"] ||= socket.peer_cert.subject if @ssl_enable && @ssl_verify
         output_queue << event
       end
 
@@ -58,8 +108,7 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
 
   public
   def run(output_queue)
-    @thread = Thread.current
-    while !@interrupted
+    while !stop?
       begin
         # Start a new thread for each connection.
         Thread.start(@relp_server.accept) do |client|
@@ -87,18 +136,17 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
         @logger.warn('Relp client trying to open connection with something other than open:'+e.message)
       rescue Relp::InsufficientCommands
         @logger.warn('Relp client incapable of syslog')
-      rescue IOError
-        break if @interrupted
-        raise
-      rescue LogStash::ShutdownSignal
-        @interrupted = true
-        break
-      end
+      rescue Relp::ConnectionClosed
+        @logger.debug('Relp Connection closed')
+      rescue OpenSSL::SSL::SSLError => ssle
+        # NOTE(mrichar1): This doesn't return a useful error message for some reason
+        @logger.error("SSL Error", :exception => ssle,
+                      :backtrace => ssle.backtrace)
+       end
     end # loop
   end # def run
 
-  def teardown
-    @interrupted = true
+  def stop
     if @relp_server
       @relp_server.shutdown rescue nil
       @relp_server = nil

data/lib/logstash/util/relp.rb

@@ -100,7 +100,7 @@ end
 
 class RelpServer < Relp
 
-  def initialize(host,port,required_commands=[])
+  def initialize(host,port,required_commands=[],ssl_context=nil)
     @logger = Cabin::Channel.get(LogStash)
     
     @server=true
@@ -118,7 +118,10 @@ class RelpServer < Relp
                     :host => host, :port => port)
       raise
     end
-    @logger.info? and @logger.info("Started RELP Server", :host => host, :port => port)
+    if ssl_context
+      @server = OpenSSL::SSL::SSLServer.new(@server, ssl_context)
+    end
+    @logger.info("Started #{ssl_context ? 'SSL-enabled ' : ''}RELP Server", :host => host, :port => port)
   end
 
   def accept
@@ -213,121 +216,3 @@ class RelpServer < Relp
   end
 
 end
-
-#This is only used by the tests; any problems here are not as important as elsewhere
-class RelpClient < Relp
-
-  def initialize(host,port,required_commands = [],buffer_size = 128,
-                 retransmission_timeout=10)
-    @logger = Cabin::Channel.get(LogStash)
-    @logger.info? and @logger.info("Starting RELP client", :host => host, :port => port)
-    @server = false
-    @buffer = Hash.new
-
-    @buffer_size = buffer_size
-    @retransmission_timeout = retransmission_timeout
-
-    #These are things that are part of the basic protocol, but only valid in one direction (rsp, close etc.)
-    @basic_relp_commands = ['serverclose','rsp']#TODO: check for others
-
-    #These are extra commands that we require, otherwise refuse the connection
-    @required_relp_commands = required_commands
-
-    @socket=TCPSocket.new(host,port)
-
-    #This'll start the automatic frame numbering 
-    @lasttxnr = 0
-
-    offer=Hash.new
-    offer['command'] = 'open'
-    offer['message'] = 'relp_version=' + RelpVersion + "\n"
-    offer['message'] += 'relp_software=' + RelpSoftware + "\n"
-    offer['message'] += 'commands=' + @required_relp_commands.join(',')#TODO: add optional ones
-    self.frame_write(@socket, offer)
-    response_frame = self.frame_read(@socket)
-    if response_frame['message'][0,3] != '200'
-      raise RelpError,response_frame['message']
-    end
-
-    response=Hash[*response_frame['message'][7..-1].scan(/^(.*)=(.*)$/).flatten]
-    if response['relp_version'].nil?
-      #if no version specified, relp spec says we must close connection
-      self.close()
-      raise RelpError, 'No relp_version specified; offer: '
-          + response_frame['message'][6..-1].scan(/^(.*)=(.*)$/).flatten
-
-    #subtracting one array from the other checks to see if all elements in @required_relp_commands are present in the offer
-    elsif ! (@required_relp_commands - response['commands'].split(',')).empty?
-      #if it can't receive syslog it's useless to us; close the connection 
-      self.close()
-      raise InsufficientCommands, response['commands'] + ' offered, require '
-          + @required_relp_commands.join(',')
-    end
-    #If we've got this far with no problems, we're good to go
-    @logger.info? and @logger.info("Connection establish with server")
-
-    #This thread deals with responses that come back
-    reader = Thread.start do
-      loop do
-        f = self.frame_read(@socket)
-        if f['command'] == 'rsp' && f['message'] == '200 OK'
-          @buffer.delete(f['txnr'])
-        elsif f['command'] == 'rsp' && f['message'][0,1] == '5'
-          #TODO: What if we get an error for something we're already retransmitted due to timeout?
-          new_txnr = self.frame_write(@socket, @buffer[f['txnr']])
-          @buffer[new_txnr] = @buffer[f['txnr']]
-          @buffer.delete(f['txnr'])
-        elsif f['command'] == 'serverclose' || f['txnr'] == @close_txnr
-          break
-        else
-          #Don't know what's going on if we get here, but it can't be good
-          raise RelpError#TODO: raising errors like this makes no sense
-        end
-      end
-    end
-
-    #While this one deals with frames for which we get no reply
-    Thread.start do
-      old_buffer = Hash.new
-      loop do
-        #This returns old txnrs that are still present
-        (@buffer.keys & old_buffer.keys).each do |txnr|
-          new_txnr = self.frame_write(@socket, @buffer[txnr])
-          @buffer[new_txnr] = @buffer[txnr]
-          @buffer.delete(txnr)
-        end
-        old_buffer = @buffer
-        sleep @retransmission_timeout
-      end
-    end
-  end
-
-  #TODO: have a way to get back unacked messages on close
-  def close
-    frame = Hash.new
-    frame['command'] = 'close'
-    @close_txnr=self.frame_write(@socket, frame)
-    #TODO: ought to properly wait for a reply etc. The serverclose will make it work though
-    sleep @retransmission_timeout
-    @socket.close#TODO: shutdown?
-    return @buffer
-  end
-
-  def syslog_write(logline)
-
-    #If the buffer is already full, wait until a gap opens up
-    sleep 0.1 until @buffer.length<@buffer_size
-
-    frame = Hash.new
-    frame['command'] = 'syslog'
-    frame['message'] = logline
-
-    txnr = self.frame_write(@socket, frame)
-    @buffer[txnr] = frame
-  end
-
-  def nexttxnr
-    @lasttxnr += 1
-  end
-
-end

data/logstash-input-relp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-relp'
-  s.version         = '0.1.5'
+  s.version         = '2.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read RELP events over a TCP socket."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_development_dependency 'logstash-devutils'

data/spec/inputs/relp_spec.rb

@@ -1,60 +1,113 @@
-# coding: utf-8
-require "logstash/devutils/rspec/spec_helper"
-require "socket"
-require "logstash/util/relp"
-
-describe "inputs/relp" do
-
-  it "should do single client connection" do
-    event_count = 10
-    port = 5511
-    conf = <<-CONFIG
-    input {
-      relp {
-        type => "blah"
-        port => #{port}
-      }
-    }
-    CONFIG
-
-    events = input(conf) do |pipeline, queue|
-      client = RelpClient.new("0.0.0.0", port, ["syslog"])
-      event_count.times do |value|
-        client.syslog_write("Hello #{value}")
+# encoding: utf-8
+require_relative "../spec_helper"
+require_relative "../support/ssl"
+
+describe LogStash::Inputs::Relp do
+
+  before do
+    srand(RSpec.configuration.seed)
+  end
+
+  describe "registration and close" do
+
+    it "should register without errors" do
+      input = LogStash::Plugin.lookup("input", "relp").new("port" => 1234)
+      expect {input.register}.to_not raise_error
+    end
+
+  end
+
+  describe "when interrupting the plugin" do
+
+    let(:port) { rand(1024..65532) }
+
+    it_behaves_like "an interruptible input plugin" do
+      let(:config) { { "port" => port } }
+    end
+  end
+
+  describe "multiple client connections" do
+
+    let(:nclients) { rand(200) }
+    let(:nevents)  { 100 }
+    let(:port)     { 5512 }
+
+    let(:conf) do
+      <<-CONFIG
+        input {
+          relp {
+            type => "blah"
+            port => #{port}
+         }
+       }
+      CONFIG
+    end
+
+    let(:clients) { setup_clients(nclients, port) }
+
+    let(:events) do
+      input(conf, (nevents*nclients)) do
+        nevents.times do |value|
+          clients.each_with_index do |client, index|
+            client.syslog_write("Hello from client#{index}")
+          end
+        end
       end
-      event_count.times.collect { queue.pop }
     end
 
-    event_count.times do |i|
-      insist { events[i]["message"] } == "Hello #{i}"
+    it "should do multiple connections" do
+      nclients.times do |client_id|
+        expect(events).to have(nevents).with("Hello from client#{client_id}")
+      end
     end
   end
 
-  it "should do two client connection" do
-    event_count = 100
-    port = 5512
-    conf = <<-CONFIG
-    input {
-      relp {
-        type => "blah"
-        port => #{port}
-      }
-    }
-    CONFIG
-
-    events = input(conf) do |pipeline, queue|
-      client = RelpClient.new("0.0.0.0", port, ["syslog"])
-      client2 = RelpClient.new("0.0.0.0", port, ["syslog"])
-
-      event_count.times do
-        client.syslog_write("Hello from client")
-        client2.syslog_write("Hello from client 2")
+  describe "SSL support" do
+
+    let(:nevents) { 100 }
+    let(:certificate) { RelpTest.certificate }
+    let(:port)        { 5513 }
+
+    let(:conf) do
+      <<-CONFIG
+        input {
+          relp {
+            type => "blah"
+            port => #{port}
+            ssl_enable => true
+            ssl_verify => false
+            ssl_cert => "#{certificate.ssl_cert}"
+            ssl_key  => "#{certificate.ssl_key}"
+         }
+       }
+      CONFIG
+    end
+
+    let(:client) { RelpClient.new("0.0.0.0", port, ["syslog"], {:ssl => true}) }
+
+    let(:events) do
+      input(conf, nevents) do
+        nevents.times do
+          client.syslog_write("Hello from client")
+        end
+      end
+    end
+
+    context "registration and close" do
+
+      it "should register without errors" do
+        input = LogStash::Plugin.lookup("input", "relp").new("port" => 1235, "ssl_enable" => true,
+                                                             "ssl_cert" => certificate.ssl_cert,
+                                                             "ssl_key" => certificate.ssl_key)
+        expect {input.register}.to_not raise_error
       end
 
-      (event_count * 2).times.map{queue.pop}
     end
 
-    insist { events.select{|event| event["message"] == "Hello from client" }.size } == event_count
-    insist { events.select{|event| event["message"] == "Hello from client 2" }.size } == event_count
+    it "should generated the events as expected" do
+      expect(events).to have(nevents).with("Hello from client")
+    end
+
   end
+
 end

data/spec/spec_helper.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/relp"
+require "logstash/util/relp"
+require "socket"
+require "support/client"
+
+module RelpHelpers
+
+  def setup_clients(number_of_clients, port)
+    number_of_clients.times.inject([]) do |clients|
+      clients << RelpClient.new("0.0.0.0", port, ["syslog"])
+    end
+  end
+
+  def filter(events, message)
+     events.select{|event| event["message"] == message }
+  end
+
+  def input(config, size, &block)
+    pipeline = LogStash::Pipeline.new(config)
+    queue = Queue.new
+
+    pipeline.instance_eval do
+      # create closure to capture queue
+      @output_func = lambda { |event| queue << event }
+
+      # output_func is now a method, call closure
+      def output_func(event)
+        @output_func.call(event)
+      end
+    end
+
+    pipeline_thread = Thread.new { pipeline.run }
+    sleep 0.1 while !pipeline.ready?
+
+    block.call
+    sleep 0.1 while queue.size != size
+
+    result = size.times.inject([]) do |acc|
+      acc << queue.pop
+    end
+
+    pipeline.shutdown
+    pipeline_thread.join
+
+    result
+  end # def input
+
+end
+
+RSpec.configure do |c|
+  c.include RelpHelpers
+end
+
+RSpec::Matchers.define :have do |nevents|
+
+  match do |events|
+    filter(events, @pattern).size == nevents
+  end
+
+  chain :with do |pattern|
+    @pattern = pattern
+  end
+
+end

data/spec/support/client.rb

@@ -0,0 +1,131 @@
+# encoding: utf-8
+require "socket"
+
+#This is only used by the tests; any problems here are not as important as elsewhere
+class RelpClient < Relp
+
+  def initialize(host,port,required_commands = [], options={})
+    buffer_size             = options[:buffer_size] || 128
+    retransmission_timeout  = options[:retransmission_timeout] || 10
+    ssl                     = options[:ssl] || false
+    @logger = Cabin::Channel.get(LogStash)
+    @logger.info? and @logger.info("Starting RELP client", :host => host, :port => port)
+    @server = false
+    @buffer = Hash.new
+
+    @buffer_size = buffer_size
+    @retransmission_timeout = retransmission_timeout
+
+    #These are things that are part of the basic protocol, but only valid in one direction (rsp, close etc.)
+    @basic_relp_commands = ['serverclose','rsp']#TODO: check for others
+
+    #These are extra commands that we require, otherwise refuse the connection
+    @required_relp_commands = required_commands
+
+    @socket=TCPSocket.new(host,port)
+
+    if ssl
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_NONE)
+      @socket = OpenSSL::SSL::SSLSocket.new(@socket, ctx).tap do |socket|
+        socket.sync_close = true
+        socket.connect
+      end
+    end
+
+    #This'll start the automatic frame numbering 
+    @lasttxnr = 0
+
+    offer=Hash.new
+    offer['command'] = 'open'
+    offer['message'] = 'relp_version=' + RelpVersion + "\n"
+    offer['message'] += 'relp_software=' + RelpSoftware + "\n"
+    offer['message'] += 'commands=' + @required_relp_commands.join(',')#TODO: add optional ones
+    self.frame_write(@socket, offer)
+    response_frame = self.frame_read(@socket)
+    if response_frame['message'][0,3] != '200'
+      raise RelpError,response_frame['message']
+    end
+
+    response=Hash[*response_frame['message'][7..-1].scan(/^(.*)=(.*)$/).flatten]
+    if response['relp_version'].nil?
+      #if no version specified, relp spec says we must close connection
+      self.close()
+      raise RelpError, 'No relp_version specified; offer: '
+      + response_frame['message'][6..-1].scan(/^(.*)=(.*)$/).flatten
+
+      #subtracting one array from the other checks to see if all elements in @required_relp_commands are present in the offer
+    elsif ! (@required_relp_commands - response['commands'].split(',')).empty?
+      #if it can't receive syslog it's useless to us; close the connection 
+      self.close()
+      raise InsufficientCommands, response['commands'] + ' offered, require '
+      + @required_relp_commands.join(',')
+    end
+    #If we've got this far with no problems, we're good to go
+    @logger.info? and @logger.info("Connection establish with server")
+
+    #This thread deals with responses that come back
+    reader = Thread.start do
+      loop do
+        f = self.frame_read(@socket)
+        if f['command'] == 'rsp' && f['message'] == '200 OK'
+          @buffer.delete(f['txnr'])
+        elsif f['command'] == 'rsp' && f['message'][0,1] == '5'
+          #TODO: What if we get an error for something we're already retransmitted due to timeout?
+          new_txnr = self.frame_write(@socket, @buffer[f['txnr']])
+          @buffer[new_txnr] = @buffer[f['txnr']]
+          @buffer.delete(f['txnr'])
+        elsif f['command'] == 'serverclose' || f['txnr'] == @close_txnr
+          break
+        else
+          #Don't know what's going on if we get here, but it can't be good
+          raise RelpError#TODO: raising errors like this makes no sense
+        end
+      end
+    end
+
+    #While this one deals with frames for which we get no reply
+    Thread.start do
+      old_buffer = Hash.new
+      loop do
+        #This returns old txnrs that are still present
+        (@buffer.keys & old_buffer.keys).each do |txnr|
+          new_txnr = self.frame_write(@socket, @buffer[txnr])
+          @buffer[new_txnr] = @buffer[txnr]
+          @buffer.delete(txnr)
+        end
+        old_buffer = @buffer
+        sleep @retransmission_timeout
+      end
+    end
+  end
+
+  #TODO: have a way to get back unacked messages on close
+  def close
+    frame = Hash.new
+    frame['command'] = 'close'
+    @close_txnr=self.frame_write(@socket, frame)
+    #TODO: ought to properly wait for a reply etc. The serverclose will make it work though
+    sleep @retransmission_timeout
+    @socket.close#TODO: shutdown?
+    return @buffer
+  end
+
+  def syslog_write(logline)
+
+    #If the buffer is already full, wait until a gap opens up
+    sleep 0.1 until @buffer.length<@buffer_size
+
+    frame = Hash.new
+    frame['command'] = 'syslog'
+    frame['message'] = logline
+
+    txnr = self.frame_write(@socket, frame)
+    @buffer[txnr] = frame
+  end
+
+  def nexttxnr
+    @lasttxnr += 1
+  end
+
+end

data/spec/support/ssl.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require "stud/temporary"
+
+module RelpTest
+
+  class Certicate
+    attr_reader :ssl_key, :ssl_cert
+
+    def initialize
+      @ssl_cert = Stud::Temporary.pathname("ssl_certificate")
+      @ssl_key = Stud::Temporary.pathname("ssl_key")
+
+      system("openssl req -x509  -batch -nodes -newkey rsa:2048 -keyout #{ssl_key} -out #{ssl_cert} -subj /CN=localhost > /dev/null 2>&1")
+    end
+  end
+
+  class << self
+    def certificate
+      Certicate.new
+    end
+
+    def random_port
+      rand(2000..10000)
+    end
+  end
+
+end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-relp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 2.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.snapshot
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
@@ -26,10 +26,10 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.snapshot
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -64,16 +64,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/relp.rb
 - lib/logstash/util/relp.rb
 - logstash-input-relp.gemspec
 - spec/inputs/relp_spec.rb
+- spec/spec_helper.rb
+- spec/support/client.rb
+- spec/support/ssl.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -96,9 +99,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Read RELP events over a TCP socket.
 test_files:
 - spec/inputs/relp_spec.rb
+- spec/spec_helper.rb
+- spec/support/client.rb
+- spec/support/ssl.rb

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"