em-berp-protocol 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1 @@
+script: "rake test"

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/wjessop/em-berp-protocol.png?branch=master)](https://travis-ci.org/wjessop/em-berp-protocol)
+
 # EventMachine::Protocols::BerpProtocol
 
 EventMachine connection protocol for sending and receiving BERP messages.
@@ -27,6 +29,12 @@ module RubyServer
   def receive_object(obj)
     send_object({'Oh yeah' => obj})
   end
+
+  # Optional - specify a receive_error method to get notifications of problems parsing bert data
+  # When this happens em-berp-protocol closes the client connection
+  def receive_error(error_string)
+  	puts error
+  end
 end
 ```
 

data/em-berp-protocol.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'bert'
   gem.add_dependency 'eventmachine'
+  gem.add_development_dependency 'rake'
 end

data/lib/em-berp-protocol/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
   module Protocols
     module BerpProtocol
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

data/lib/em-berp-protocol.rb

@@ -10,7 +10,14 @@ module EventMachine
         while @buf.size >= 4
           if @buf.size >= 4+(size = @buf.unpack('N').first)
             @buf.slice!(0,4)
-            receive_object(BERT.decode(@buf.slice!(0,size)))
+            begin
+              slice = @buf.slice!(0,size)
+              receive_object(BERT.decode(slice))
+            rescue TypeError => e
+              handle_bert_error("TypeError: #{e}")
+            rescue EOFError => e
+              handle_bert_error("EOFError: #{e} with data #{slice.inspect}")
+            end
           else
             break
           end
@@ -27,6 +34,14 @@ module EventMachine
         data = BERT.encode(obj)
         send_data([data.respond_to?(:bytesize) ? data.bytesize : data.size, data].pack('Na*'))
       end
+
+      private
+
+      def handle_bert_error(message)
+        remote_port, *remote_ip = get_peername[2,6].unpack("nC4")
+        receive_error("#{message} from client #{remote_ip.join('.')}:#{remote_port}") if respond_to? :receive_error
+        close_connection
+      end
     end
   end
 end

data/tests/test-helper.rb

@@ -0,0 +1,4 @@
+require 'test/unit'
+require 'eventmachine'
+$:.unshift File.join(File.dirname(__FILE__), '../lib')
+require 'em-berp-protocol'

data/tests/test_em-berp-protocol.rb

@@ -1,7 +1,4 @@
-require 'test/unit'
-require 'eventmachine'
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
-require 'em-berp-protocol'
+require 'test-helper'
 
 class TestBerpProtocol < Test::Unit::TestCase
   module Server

data/tests/test_em-berp-protocol_failure_handling.rb

@@ -0,0 +1,36 @@
+require 'test-helper'
+
+class TestBerpFailureHandling < Test::Unit::TestCase
+  module Server
+    include EventMachine::Protocols::BerpProtocol
+
+    def receive_error(error)
+      $error = error
+      EM.stop
+    end
+  end
+
+  def test_receiving_invalid_magic_value
+    EM.run {
+      EM.start_server "127.0.0.1", 53654, Server
+      assert_nothing_raised do
+        s = TCPSocket.new 'localhost', 53654
+        s.write [1, -3].pack("Nc") # Length 1, magic number -1
+        s.close
+      end
+    }
+    assert $error.match(/\ATypeError: Invalid magic value for BERT string from client 127\.0\.0\.1:\d+\z/)
+  end
+
+  def test_unexpected_eof_in_data_stream
+    EM.run {
+      EM.start_server "127.0.0.1", 53654, Server
+      assert_nothing_raised do
+        s = TCPSocket.new '127.0.0.1', 53654
+        s.write [18, -125, 104, 2, 107, 0, 12, 99, 97, 112, 97, 98, 105, 108, 105, 116, 105, 101, 115].pack("Nc*")
+        s.close
+      end
+    }
+    assert $error.match(/\AEOFError: Unexpected end of BERT stream with data "\\x83h\\x02k\\x00\\fcapabilities" from client 127\.0\.0\.1:\d+\z/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-berp-protocol
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bert
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EventMachine connection protocol for sending and receiving BERP messages
 email:
 - will@willj.net
@@ -51,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -58,7 +75,9 @@ files:
 - em-berp-protocol.gemspec
 - lib/em-berp-protocol.rb
 - lib/em-berp-protocol/version.rb
+- tests/test-helper.rb
 - tests/test_em-berp-protocol.rb
+- tests/test_em-berp-protocol_failure_handling.rb
 homepage: https://github.com/wjessop/em-berp-protocol
 licenses: []
 post_install_message: 
@@ -71,12 +90,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2809755693066062168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2809755693066062168
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24