jls-lumberjack 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2eeaf07362d0a05cb9f5a7ba3b4e84762183541
-  data.tar.gz: 47a7ad5fe615e534f0a4c3dfb7bc4c2dae8848bf
+  metadata.gz: 5ecf8e491d03fcc59fb32625cd5ad69018071f89
+  data.tar.gz: 3fc5d05089e0b192d736fb046854635757bf10e6
 SHA512:
-  metadata.gz: 506fd08902840718a03ef4dd1e811b038175e02b91ab3a1f7da88b8a1fdbacebaafb885b380427a2e1b8c7625f98ad2244fbac1e95862411f80c12b4164712ce
-  data.tar.gz: c508912a60e9c35bcb6457dfc3643366d7f09ff82a9cb269c1a98b5d042220d5ab67d3ab0c0c5b49669547956548d2bad3f3811164c90c825372b3610bdab637
+  metadata.gz: 4d6cc57fc88054f98a72bf6ccb51bdd2d91b01d6e1ba4232ac7bda25d3cf21acdb07e3940b6c0938ac6f2807f8701404819b30cbe3cfaf9edcd6d7cf919fffe6
+  data.tar.gz: 79946f5b1c4237e14e13a44a9d257635722469f57832a8ced321e45606236279c2b380d57c18ed8d9a18c13fa5306fb044c150a26ff46c74da5dc10d11d1b33b

data/lib/lumberjack/client.rb

@@ -80,7 +80,17 @@ module Lumberjack
     private
     def connection_start(opts)
       tcp_socket = TCPSocket.new(opts[:address], opts[:port])
-      @socket = OpenSSL::SSL::SSLSocket.new(tcp_socket)
+
+      certificate = OpenSSL::X509::Certificate.new(File.read(opts[:ssl_certificate]))
+
+      certificate_store = OpenSSL::X509::Store.new
+      certificate_store.add_cert(certificate)
+
+      ssl_context = OpenSSL::SSL::SSLContext.new
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      ssl_context.cert_store = certificate_store
+
+      @socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, ssl_context)
       @socket.connect
       @socket.syswrite(["1", "W", @window_size].pack("AAN"))
     end
@@ -133,48 +143,6 @@ module Lumberjack
     def read_last_ack
       @socket.read(4).unpack("N").first
     end
-
-    private
-    def to_frame(hash, sequence)
-      frame = ["1", "D", sequence]
-      pack = "AAN"
-      keys = deep_keys(hash)
-      frame << keys.length
-      pack << "N"
-      keys.each do |k|
-        val = deep_get(hash,k)
-        key_length = k.bytesize
-        val_length = val.bytesize
-        frame << key_length
-        pack << "N"
-        frame << k
-        pack << "A#{key_length}"
-        frame << val_length
-        pack << "N"
-        frame << val
-        pack << "A#{val_length}"
-      end
-      frame.pack(pack)
-    end
-
-    private
-    def deep_get(hash, key="")
-      return hash if key.nil?
-      deep_get(
-        hash[key.split('.').first],
-        key[key.split('.').first.length+1..key.length]
-      )
-    end
-
-    private
-    def deep_keys(hash, prefix="")
-      keys = []
-      hash.each do |k,v|
-        keys << "#{prefix}#{k}" if v.class == String
-        keys << deep_keys(hash[k], "#{k}.") if v.class == Hash
-      end
-      keys.flatten
-    end
   end
 
   module Encoder

data/spec/integration_spec.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+require "lumberjack/client"
+require "lumberjack/server"
+require "stud/temporary"
+require "flores/pki"
+require "fileutils"
+require "thread"
+require "spec_helper"
+
+describe "A client" do
+  let(:certificate) { Flores::PKI.generate }
+  let(:certificate_file_crt) { "certificate.crt" }
+  let(:certificate_file_key) { "certificate.key" }
+  let(:port) { Flores::Random.integer(1024..65335) }
+  let(:host) { "127.0.0.1" }
+
+  before do
+    expect(File).to receive(:read).at_least(1).with(certificate_file_crt) { certificate.first.to_s }
+    expect(File).to receive(:read).at_least(1).with(certificate_file_key) { certificate.last.to_s }
+    
+    server = Lumberjack::Server.new(:port => port,
+                                    :address => host,
+                                    :ssl_certificate => certificate_file_crt,
+                                    :ssl_key => certificate_file_key)
+
+    Thread.new do
+      server.run { |data| }
+    end
+  end
+
+  context "with a valid certificate" do
+    it "successfully connect to the server" do
+      expect { 
+        Lumberjack::Client.new(:port => port, 
+                               :host => host,
+                               :addresses => host,
+                               :ssl_certificate => certificate_file_crt)
+
+      }.not_to raise_error
+    end
+  end
+
+  context "with an invalid certificate" do
+    let(:invalid_certificate) { Flores::PKI.generate }
+    let(:invalid_certificate_file) { "invalid.crt" }
+
+    before do
+      expect(File).to receive(:read).with(invalid_certificate_file) { invalid_certificate.first.to_s }
+    end
+
+    it "should refuse to connect" do
+      expect { 
+        Lumberjack::Client.new(:port => port, 
+                               :host => host,
+                               :addresses => host,
+                               :ssl_certificate => invalid_certificate_file)
+
+      }.to raise_error(OpenSSL::SSL::SSLError, /certificate verify failed/)
+    end
+  end
+end

data/spec/lumberjack/client_spec.rb

@@ -0,0 +1,98 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'lumberjack/client'
+require 'lumberjack/server'
+require "socket"
+require "thread"
+require "openssl"
+require "zlib"
+
+describe "Lumberjack::Client" do
+
+  describe "Lumberjack::Socket" do
+
+    let(:port)   { 5000 }
+
+    subject(:socket) { Lumberjack::Socket.new(:port => port, :ssl_certificate => "" ) }
+
+    before do
+      allow_any_instance_of(Lumberjack::Socket).to receive(:connection_start).and_return(true)
+    end
+
+    context "sequence" do
+
+     let(:hash)   { {:a => 1, :b => 2}}
+     let(:max_unsigned_int) { (2**32)-1 }
+
+      before(:each) do
+        allow(socket).to receive(:ack).and_return(true)
+        allow(socket).to receive(:write).and_return(true)
+      end
+
+      it "force sequence to be an unsigned 32 bits int" do
+        socket.instance_variable_set(:@sequence, max_unsigned_int)
+        socket.write_hash(hash)
+        expect(socket.sequence).to eq(1)
+      end
+    end
+
+    context "ack" do
+
+      let(:hash)   { {:a => 1, :b => 2}}
+
+      before(:each) do
+        allow(socket).to receive(:write).and_return(true)
+      end
+
+      it "increments the sequence per windows size" do
+        allow(socket).to receive(:read_version_and_type).and_return([1, 'A'])
+        expect(socket).to receive(:ack).twice.and_call_original
+
+        [5000, 10000].each do |last_ack|
+          windows_size = 5001
+
+          allow(socket).to receive(:read_last_ack).and_return(last_ack)
+
+          windows_size.times do
+            socket.write_hash(hash)
+          end
+        end
+
+      end
+    end
+  end
+
+  describe Lumberjack::Encoder do
+    it 'should creates frames without truncating accentued characters' do
+      content = {
+        "message" => "Le Canadien de Montréal est la meilleure équipe au monde!",
+        "other" => "éléphant"
+      }
+      parser = Lumberjack::Parser.new
+      parser.feed(Lumberjack::Encoder.to_frame(content, 0)) do |code, sequence, data|
+        expect(data["message"].force_encoding('UTF-8')).to eq(content["message"])
+        expect(data["other"].force_encoding('UTF-8')).to eq(content["other"])
+      end
+    end
+
+    it 'should creates frames without dropping multibytes characters' do
+      content = {
+        "message" => "国際ホッケー連盟" # International Hockey Federation
+      }
+      parser = Lumberjack::Parser.new
+      parser.feed(Lumberjack::Encoder.to_frame(content, 0)) do |code, sequence, data|
+        expect(data["message"].force_encoding('UTF-8')).to eq(content["message"])
+      end
+    end
+
+    it 'should creates compressed frames' do
+      content = {
+        "message" => "国際ホッケー連盟" # International Hockey Federation
+      }
+      parser = Lumberjack::Parser.new
+      parser.feed(Lumberjack::Encoder.to_compressed_frame(content, 0)) do |code, sequence, data|
+        expect(data["message"].force_encoding('UTF-8')).to eq(content["message"])
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+require 'rspec'
+require 'rspec/mocks'
+$: << File.realpath(File.join(File.dirname(__FILE__), "..", "lib"))

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jls-lumberjack
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
-dependencies: []
+date: 2015-07-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: flores
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stud
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: lumberjack log transport library
 email:
 - jls@semicomplete.com
@@ -19,6 +61,9 @@ extra_rdoc_files: []
 files:
 - lib/lumberjack/client.rb
 - lib/lumberjack/server.rb
+- spec/integration_spec.rb
+- spec/lumberjack/client_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/jordansissel/lumberjack
 licenses: []
 metadata: {}
@@ -38,8 +83,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: lumberjack log transport library
-test_files: []
+test_files:
+- spec/integration_spec.rb
+- spec/lumberjack/client_spec.rb
+- spec/spec_helper.rb