rabbitcage 0.1.0 → 0.1.1

data/README.markdown

@@ -46,6 +46,22 @@ RabbitCage works as a transparent, content aware proxy between the connecting cl
 	  default :deny
 	end
 
+## Performance
+Here are some basic performance measurements which compares a raw connection to RabbitMQ with a filtered one. Check the [spec/performance/test.rb](http://github.com/dsander/rabbitcage/blob/master/spec/performance/test.rb) script to get information about how the tests were run. If you have a more benchmark results or suggestions about how to change the benchmark, please let me know.
+
+	Average message delay:
+	RabbitMQ    : 0.00293165922164917
+	RabbitCache : 0.00457870006561279
+
+	For a 1kb message do 1000 times:
+	RabbitMQ    push to queue : 0.443398952484131
+	RabbitMQ    pop from queue: 0.711700439453125
+	RabbitMQ    async get     : 0.847184419631958
+	RabbitCache push to queue : 0.764634847640991
+	RabbitCache pop from queue: 1.02018523216248
+	RabbitCache async get     : 0.852582693099976
+
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "rabbitcage"
     gem.summary = %Q{A AMQP firewall which allows to restrict user access to RabbitMQ using ACLs.}
-    gem.description = %Q{RabbitMQ's access control capabilities are rather limited. RabbitCage enables fine-grated permission setups, you define which user can perform which AMQP method on which class.}
+    gem.description = %Q{RabbitMQ's access control capabilities are rather limited. RabbitCage enables fine-grained permission setups, you define which user can perform which AMQP method on which class.}
     gem.email = "git@dsander.de"
     gem.homepage = "http://github.com/dsander/rabbitcage"
     gem.authors = ["Dominik Sander"]

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/rabbitcage

@@ -52,8 +52,15 @@ EOF
  
   opts.parse!
  
+  
+  if !options[:config]
+    puts "You need to specify a config file.\n\n"
+    puts opts
+    exit
+  end
   load(options[:config])
   name = options[:config].split('/').last.chomp('.rb')
+  
   RabbitCage.run('config', options[:host], options[:port], options[:remote_host], options[:remote_port], options[:log_level])
 rescue Exception => e
   if e.instance_of?(SystemExit)

data/lib/rabbitcage/client_connection.rb

@@ -11,6 +11,7 @@ class RabbitCage
       LOGGER.info "Accepted #{peer}"
       @buffer = []
       @tries = 0
+      @user = 'guest'
       RabbitCage.incr
     end
 
@@ -35,7 +36,7 @@ class RabbitCage
       data2 = data.dup
 
       while frame = AMQP::Frame.parse(data2)
-        LOGGER.debug "Got frame: " + frame.payload.inspect
+        LOGGER.debug "Got frame: " + frame.inspect
         case frame.payload
         when AMQP::Protocol::Connection::Open
           @vhost = frame.payload.virtual_host

data/lib/rabbitcage/filter.rb

@@ -67,10 +67,13 @@ class RabbitCage
       require 'erb'
       method = ERB.new(%q[
   def filter(frame)
+    <%- @rules[:any].each do |rule| -%>
+      return :<%= rule[:permission]  %> if <%= rule[:properties] %>
+    <%- end -%>
+    <%- @rules.delete(:any) -%>
+    return :allow if (frame.class == AMQP::Protocol::Header || frame.class == String)
     <%- if @rules.any? -%>
-      <%- @rules[:any].each do |rule| -%>
-        return :<%= rule[:permission]  %> if <%= rule[:properties] %>
-      <%- end -%>
+      
       case frame  # 4
         <%- @rules.each_pair do |klass, r|-%>
           <%-  next if klass == :any -%>

data/spec/performance/test.rb

@@ -0,0 +1,96 @@
+require 'amqp'
+require 'mq'
+require 'eventmachine'
+require 'benchmark'
+require 'bunny'
+
+# Config file used
+#include RabbitCageACL
+#require 'pp'
+#config do
+#  allow 'admin', :all, :all
+#  allow 'guest', :all, :queue, :name => /^(?!reserved_)/
+#  allow 'guest', :all, :exchange, :name => /^(?!private_)/
+#  allow 'guest', [:publish, :consume, :get], :basic
+#  allow 'guest', :all, :connection
+#  allow 'guest', :all, :channel
+#  allow 'guest', :all, :access
+#  default :deny
+#end
+
+
+def messure_delay
+  delay = []
+  i = 0
+
+  amq = MQ.new
+    amq.queue('delay', :exclusive=>true, :auto_delete=>true).bind(amq.fanout('performance_test')).subscribe do |msg|
+    delay <<  Time.now.to_f-msg.to_f
+    if i == 100
+      @timer.cancel 
+      puts delay.reduce(:+)/delay.length
+      AMQP.stop{EM.stop}
+    end
+  end
+  
+  @timer = EventMachine::add_periodic_timer(0.01) do
+    i += 1
+    amq.fanout('performance_test').publish(Time.now.to_f)
+  end
+end
+
+puts "Average message delay:"
+AMQP.start(:port => 5673) do 
+  print 'RabbitMQ    : '
+  messure_delay
+end
+AMQP.start(:port => 5672) do 
+  print 'RabbitCache : '
+  messure_delay
+end
+
+
+def messure_publish_time port, data, message
+  b = Bunny.new(:host => 'localhost', :port => port)
+  b.start
+  
+  q = b.queue('performance_test')
+   
+  res = Benchmark.realtime do
+    1000.times do
+      q.publish(@data)
+    end
+  end
+  puts "#{message} push to queue : #{res}"
+  res = Benchmark.realtime do
+    1000.times do
+      q.pop
+    end
+  end
+  puts "#{message} pop from queue: #{res}"
+
+  1000.times do
+    q.publish(@data)
+  end
+  b.stop
+  i = 1
+  
+  res = Benchmark.realtime do
+    AMQP.start(:port => port) do 
+      amq = MQ.new
+      amq.queue('performance_test', :exclusive=>true, :auto_delete=>true).bind(amq.fanout('performance_test')).subscribe do |msg|
+        i += 1
+        if i == 1000
+          AMQP.stop{EM.stop}
+        end
+      end
+    end
+  end
+  puts "#{message} async get     : #{res}"
+end
+
+@data = "x"*1024
+puts "For a 1kb message do 1000 times:"
+messure_publish_time 5673, @data, 'RabbitMQ   '
+messure_publish_time 5672, @data, 'RabbitCache'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rabbitcage
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Dominik Sander
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-20 00:00:00 +01:00
+date: 2009-12-21 00:00:00 +01:00
 default_executable: rabbitcage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.12.10
     version: 
-description: RabbitMQ's access control capabilities are rather limited. RabbitCage enables fine-grated permission setups, you define which user can perform which AMQP method on which class.
+description: RabbitMQ's access control capabilities are rather limited. RabbitCage enables fine-grained permission setups, you define which user can perform which AMQP method on which class.
 email: git@dsander.de
 executables: 
 - rabbitcage
@@ -64,6 +64,7 @@ files:
 - lib/rabbitcage/core_extensions.rb
 - lib/rabbitcage/filter.rb
 - lib/rabbitcage/server_connection.rb
+- spec/performance/test.rb
 - spec/rabbitcage_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -97,3 +98,4 @@ summary: A AMQP firewall which allows to restrict user access to RabbitMQ using
 test_files: 
 - spec/rabbitcage_spec.rb
 - spec/spec_helper.rb
+- spec/performance/test.rb