stompserver 0.9.5 → 0.9.6

data/History.txt

@@ -1,3 +1,10 @@
+== 0.9.6 / 31 Oct 2006
+
+* Added simple code to handle denial of service attacks from large headers
+* Fixed a multitude of bugs (and added tests) found by our small but growing 
+  community of users
+* more coming soom (thanks to snacktime)
+
 == 0.9.5 / 18 Oct 2006
 
 * Removed eventmachine dependency in the gem

data/lib/queue_manager.rb

@@ -41,20 +41,20 @@ class QueueManager
   end
   
   def ack(user, frame)
-    pending_size = @pending[user]
+    pending_size = @pending[user].size
     msgid = frame.headers['message-id']
     @pending[user].delete_if { |pf| pf.headers['message-id'] == msgid }
-    raise "Message (#{msgid}) not found" if pending_size == @pending[user]
+    raise "Message (#{msgid}) not found" if pending_size == @pending[user].size
     @journal.delete(msgid)
   end
 
   def disconnect(user)
-    @pending[user].each do |frame|
-      sendmsg(frame)
-    end
     @queues.each do |dest, queue|
       queue.delete_if { |qu| qu.user == user }
     end
+    @pending[user].each do |frame|
+      sendmsg(frame)
+    end
   end
     
   def send_to_user(frame, user)

data/lib/stomp_frame.rb

@@ -54,7 +54,7 @@ class StompFrameRecognizer
   end
   
   def parse_header
-    if match = @buffer.match(/^\s*(\S+)$((?:\s*.*?\s*:\s*.*?\s*$)*)$\r?\n$\r?\n/)
+    if match = @buffer.match(/^\s*(\S+)$\r?\n((?:[ \t]*.*?[ \t]*:[ \t]*.*?[ \t]*$\r?\n)*)\r?\n/)
       @frame.command, headers = match.captures
       @buffer = match.post_match
       headers.split(/\n/).each do |data|
@@ -65,6 +65,10 @@ class StompFrameRecognizer
       
       # body_length is nil, if there is no content-length, otherwise it is the length (as in integer)
       @body_length = @frame.headers['content-length'] && @frame.headers['content-length'].to_i
+    else
+      # saftey valve to dump bad (DOSA?) headers/frames
+      # this should be a constant or read out of a configuration file
+      raise RuntimeError.new("Invalid stompframe (possible DOSA)") if @buffer.length > 4096
     end
   end
   

data/lib/stomp_server.rb

@@ -6,7 +6,7 @@ require 'queue_manager'
 require 'frame_journal'
 
 module StompServer
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
   VALID_COMMANDS = [:connect, :send, :subscribe, :unsubscribe, :begin, :commit, :abort, :ack, :disconnect]
 
   def self.setup(j = FrameJournal.new, tm = TopicManager.new, qm = QueueManager.new(j))
@@ -43,6 +43,8 @@ module StompServer
     raise "Unhandled frame: #{cmd}" unless VALID_COMMANDS.include?(cmd)
     raise "Not connected" if !@connected && cmd != :connect
 
+    puts "process_frame #{cmd}" if $DEBUG
+
     # I really like this code, but my needs are a little trickier
     # 
 
@@ -50,11 +52,18 @@ module StompServer
       handle_transaction(frame, trans, cmd)
     else
       cmd = :sendmsg if cmd == :send
+      puts "Execute #{cmd}" if $DEBUG
       send(cmd, frame) 
     end
     
     send_receipt(frame.headers['receipt']) if frame.headers['receipt']
   end
+
+  # here is how we can stop, of course there is currently no
+  # way to get here  
+  def shutdown(msg)
+    EventMachine::stop_event_loop
+  end
   
   def handle_transaction(frame, trans, cmd)
     if [:begin, :commit, :abort].include?(cmd)
@@ -84,7 +93,8 @@ module StompServer
   
   def subscribe(frame)
     if frame.dest =~ %r|^/queue|
-      @@queue_manager.subscribe(frame.dest, self)
+      ack = frame.headers['ack'] == 'client'
+      @@queue_manager.subscribe(frame.dest, self, ack) 
     else
       @@topic_manager.subscribe(frame.dest, self)
     end
@@ -92,9 +102,9 @@ module StompServer
   
   def unsubscribe(frame)
     if frame.dest =~ %r|^/queue|
-      @@queue_manager.unsubscribe(self)
+      @@queue_manager.unsubscribe(frame.dest, self)
     else
-      @@topic_manager.unsubscribe(self)
+      @@topic_manager.unsubscribe(frame.dest, self)
     end
   end
   

data/test/test_queue_manager.rb

@@ -17,6 +17,7 @@ class TestQueues < Test::Unit::TestCase
       @headers = { 'destination' => dest, 'message-id' => id }
       @data = msg
     end
+    def body ; @data ; end
     def to_s ; @data ; end
   end
 
@@ -97,4 +98,19 @@ class TestQueues < Test::Unit::TestCase
     assert_equal('', u2.data)
   end
   
-end
+  def test_sendmsg_ack
+    u = UserMock.new
+    t = 'fooack'
+    @t.subscribe(t, u, true)
+    
+    m1 = MessageMock.new(t, 'foomsg')
+    @t.sendmsg(m1)
+    assert_equal(m1.data, u.data)
+    assert_equal('MESSAGE', m1.command)
+    @t.disconnect(u)
+
+    u2 = UserMock.new
+    @t.subscribe(t, u2)
+    assert_equal(m1.data, u2.data)
+  end
+end

data/test/test_stomp_frame.rb

@@ -57,8 +57,20 @@ FRAME
     assert_equal("bar2", f.headers["foo2"])
     assert_equal("message body 2\n", f.body)
   end
+
+  def test_double2
+    data = "SEND\ndestination:/queue/f\ncontent-length: 33\ncontent-type: text/plain; charset=UTF-8\n\n1: Tue Oct 24 12:19:52 -0400 2006\000SEND\ndestination:/queue/f\ncontent-length: 33\ncontent-type: text/plain; charset=UTF-8\n\n2: Tue Oct 24 12:19:52 -0400 2006\000"
+
+    @sfr << data
+    assert_equal(2, @sfr.frames.size)
+    f = @sfr.frames.shift
+    assert_equal(1, @sfr.frames.size)
+    assert_equal("SEND", f.command)
+    assert_equal("/queue/f", f.headers["destination"])
+    assert_match(/1: Tue/, f.body)
+  end
   
-    def test_partialframe
+  def test_partialframe
     @sfr << <<FRAME
 COMMAND
 name:value

data/test/test_stomp_server.rb

@@ -238,4 +238,25 @@ class TestStompServer < Test::Unit::TestCase
     ss2.stomp("SUBSCRIBE", {"destination" => '/queue/foo'})
     assert_match(/Hi Pat/, ss2.sent)
   end
+    
+  def test_ack_queue_message
+    ss1 = MockStompServer.make_client
+    ss1.stomp("SEND", {'destination' => '/queue/taqm'}, 
+       'Hi Pat')
+    ss1.stomp("DISCONNECT")
+
+    ss2 = MockStompServer.make_client
+    ss2.stomp("SUBSCRIBE", {"destination" => '/queue/taqm', 'ack' => 'client'})
+    assert_match(/Hi Pat/, ss2.sent)
+    ss2.unbind
+
+    ss3 = MockStompServer.make_client
+    ss3.stomp("SUBSCRIBE", {"destination" => '/queue/taqm'})
+    assert_match(/Hi Pat/, ss3.sent)
+    
+    assert_nothing_raised do
+      ss3.stomp("SUBSCRIBE", {"destination" => '/queue/taqm', 
+                "message-id" => "msg-cmastomp-1"})
+    end
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: stompserver
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2006-10-18 00:00:00 -04:00
+  version: 0.9.6
+date: 2006-10-31 00:00:00 -05:00
 summary: A very light messaging server
 require_paths: 
 - lib