syslog-shipper 1.0.20111121124359 → 1.0.20120102102042

data/README

@@ -0,0 +1,9 @@
+Ship logs to a syslog server
+----------------------------
+
+Usage: bin/syslog-shipper [options] -s HOST:PORT <path_or_glob> [path_or_glob2] [...]
+  If a path begins with '+' each line is sent unmodified to the syslog server.
+  Otherwise, this tool will prefix each line read from the file with a syslog
+  header. 
+
+  For example: syslog-shipper -s somehost:514 +/var/log/messages /var/log/apache2/access.log

data/bin/syslog-shipper

@@ -1,41 +1,8 @@
 #!/usr/bin/env ruby
+
 require "rubygems"
-require "eventmachine"
-require "eventmachine-tail"
-require "socket"
 require "optparse"
-
-class Shipper < EventMachine::FileTail
-  def initialize(path, startpos=-1, connection=nil, raw=false, verbose=false)
-    super(path, startpos)
-    @buffer = BufferedTokenizer.new
-    @hostname = Socket.gethostname
-    @connection = connection
-    @raw = raw
-    @verbose = verbose
-  end
-
-  def receive_data(data)
-    @buffer.extract(data).each do |line|
-      if @raw
-        @connection.send_data("#{line}\n")
-        puts line if @verbose
-      else
-        timestamp = Time.now.strftime("%b %d %H:%M:%S")
-        syslogline = "#{timestamp} #{@hostname} #{path}: #{line}\n"
-        print syslogline if @verbose
-        @connection.send_data(syslogline)
-      end
-    end # buffer extract
-  end # def receive_data
-end # class Shipper
-
-def pattern_to_regexp(pattern)
-  pattern.gsub!(".", "\\.") # fix literal .
-  pattern.gsub!("*", ".+")  # * becomes .+
-  pattern.gsub!("?", ".")   # ? becomes .
-  return Regexp.new(pattern)
-end # def pattern_to_regexp
+require File.expand_path('../../lib/syslog_shipper',  __FILE__)
 
 def main(args)
   globcheck_interval = 5
@@ -73,6 +40,10 @@ def main(args)
     opts.on("-v", "--verbose", "verbose (outputs each log line as seen)") do |arg|
       verbose = true
     end
+
+    opts.on("-c CERT_PATH", "--ca-cert CERT_PATH", "Certificate authority PEM file to use") do |arg|
+      SyslogShipper::Client.ca_cert = arg
+    end
   end # OptionParser
 
   opts.parse!(args)
@@ -93,7 +64,7 @@ def main(args)
     host, port = hostarg.split(":")
     port = 514 if port == nil
 
-    connection = EventMachine.connect(host, port.to_i)
+    connection = EventMachine::connect(host, port, SyslogShipper::TlsWrapper)
 
     args.each do |path|
       if path.start_with?("+")
@@ -102,7 +73,7 @@ def main(args)
       else
         raw = false
       end
-      EventMachine::FileGlobWatchTail.new(path, Shipper,
+      EventMachine::FileGlobWatchTail.new(path, SyslogShipper::Client,
                                           interval = globcheck_interval,
                                           exclude = exclude_patterns,
                                           start_pos = -1,
@@ -115,3 +86,12 @@ def main(args)
 end # def main
 
 exit(main(ARGV))
+
+private 
+
+def pattern_to_regexp(pattern)
+  pattern.gsub!(".", "\\.") # fix literal .
+  pattern.gsub!("*", ".+")  # * becomes .+
+  pattern.gsub!("?", ".")   # ? becomes .
+  return Regexp.new(pattern)
+end # def pattern_to_regexp

data/lib/syslog_shipper.rb

@@ -0,0 +1,6 @@
+require "eventmachine"
+require "eventmachine-tail"
+require File.expand_path('../syslog_shipper/client.rb',  __FILE__)
+require File.expand_path('../syslog_shipper/tls_wrapper.rb',  __FILE__)
+
+module SyslogShipper; end

data/lib/syslog_shipper/client.rb

@@ -0,0 +1,37 @@
+require "socket"
+
+module SyslogShipper
+  class Client < EventMachine::FileTail
+    class << self
+      attr_accessor :ca_cert
+    end
+
+    def initialize(path, startpos=-1, connection=nil, raw=false, verbose=false)
+      super(path, startpos)
+      @buffer = BufferedTokenizer.new
+      @hostname = Socket.gethostname
+      @connection = connection
+      @raw = raw
+      @verbose = verbose
+    end
+
+    def receive_data(data)
+      @buffer.extract(data).each do |line|
+        line = if @raw
+          "#{line}\n"
+        else
+          "#{Time.now.strftime("%b %d %H:%M:%S")} #{@hostname} #{path}: #{line}\n"
+        end
+   
+        print line if @verbose
+        send_data(line)
+      end 
+    end
+
+    private
+
+    def send_data line
+      @connection.send_data line        
+    end
+  end
+end

data/lib/syslog_shipper/tls_wrapper.rb

@@ -0,0 +1,25 @@
+require 'openssl'
+
+module SyslogShipper::TlsWrapper
+  def post_init
+    start_tls(:verify_peer => true)
+  end
+
+  def connection_completed
+
+  end
+
+  def ssl_verify_peer cert
+    ca_cert = OpenSSL::X509::Certificate.new File.read(SyslogShipper::Client.ca_cert)
+    server_cert = OpenSSL::X509::Certificate.new cert
+    server_cert.verify ca_cert.public_key
+  end
+
+  def ssl_handshake_completed
+    $server_handshake_completed = true
+  end
+
+  def unbind
+
+  end
+end

data/spec/client_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe SyslogShipper::Client do
+  describe '#receive_data' do
+    before(:each) do
+
+    end
+
+    context "sending data" do
+      it "sends over TLS"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'syslog_shipper'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 20111121124359
-  version: 1.0.20111121124359
+  - 20120102102042
+  version: 1.0.20120102102042
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 -08:00
+date: 2012-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: Ship logs from files to a remote syslog server over TCP
-email: jordan@loggly.com
+email: jls@semicomplete.com
 executables: 
 - syslog-shipper
 extensions: []
@@ -39,7 +39,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README
+- lib/syslog_shipper/tls_wrapper.rb
+- lib/syslog_shipper/client.rb
+- lib/syslog_shipper.rb
 - bin/syslog-shipper
+- spec/spec_helper.rb
+- spec/client_spec.rb
 has_rdoc: true
 homepage: https://github.com/jordansissel/syslog-shipper
 licenses: []