foxbat 0.0.2 → 0.2.0

data/lib/em/connection.rb

@@ -1,88 +1,57 @@
 import java.nio.ByteBuffer
+import org.jboss.netty.buffer.ChannelBuffers
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler
 
 module EventMachine
   
-  class Connection
-
-    BUF_SIZE = 256
-
-    attr_accessor :channel, :block
-    attr_reader :open_time, :close_time
-
-    def peername
-      @channel.getRemoteAddress
-    end
+  class Connection < SimpleChannelUpstreamHandler
 
     def send_data(data)
-      arr = data.to_java_bytes
-      buf = ByteBuffer.allocate(arr.length)
-      buf.put(arr)
-      buf.flip
-
+      buf = ChannelBuffers.copiedBuffer(data, "UTF-8")
       @channel.write(buf)
     end
 
     def post_init; end
 
-    def server_post_init
-      @open_time ||= Time.now.to_i
-    end
-
     def unbind; end
 
-    def start_tls(args={});  end
+    def start_tls(args={}); end
 
     def receive_data(data)
-      p 'Incoming data...'
+      puts 'Incoming data...'
     end
 
     def close_connection(after_writing=false)
-      if after_writing == false
-        @channel.close
-      else
-        @channel.shutdownInput
-        @channel.shutdownOutput
-      end
-      @close_time = Time.now.to_i
+      @channel.close
     end
 
     def close_connection_after_writing
       close_connection(true)
     end
 
-    def read_channel(buffer=nil)
-
-      @block.call(self)
-
-      if buffer.nil?
-        bb = ByteBuffer.allocate(BUF_SIZE)
-        bb.clear
-        return read_channel(bb)
-      end
-
-      reader = Foxbat::Handler.new(@channel) do |c,br|
-        if br == -1
-          c.close
-          self.unbind
-        else
-          buffer.flip
-          str = btos(buffer)
+    def get_peername
+      addr = @channel.getRemoteAddress
+      [addr.getPort, addr.getHostString]
+    end
 
-          buffer.clear
-          buffer.rewind
+    private
 
-          self.receive_data(str)
-          read_channel(buffer)
-        end
-      end
+    # The netty channel callbacks
 
-      @channel.read(buffer, nil, reader)
+    def channelConnected(ctx, e)
+      @pipeline = ctx.getPipeline
+      @channel = e.getChannel
+      post_init
     end
 
-    private
+    def messageReceived(ctx, e)
+      data = e.getMessage.toString('UTF-8')
+      receive_data(data)
+    end
 
-    def btos(buf)
-      return String.from_java_bytes(buf.array[buf.position..(buf.limit-1)])
+    def exceptionCaught(ctx, e)
+      p e.toString
     end
+
   end
 end

data/lib/eventmachine.rb

@@ -1,9 +1,11 @@
+import java.lang.Long
 import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
 
 module EventMachine
 
   def self.start_server host, port=nil, handler=nil, *args, &block
-    s = Foxbat::Server.new(host, port, handler, args.first, block)
+    s = Foxbat::Server.new(host, port, handler, args.first || {}, block)
 
     @@servers ||= []
     @@servers << s
@@ -15,7 +17,7 @@ module EventMachine
   def self.epoll; end
   def self.kqueue; end
 
-  def self.run(blk=nil, tail=nil, &block)
+  def self.run(blk=nil, tail=nil, &block)    
     @@threadpool = Executors.newCachedThreadPool
 
     block.call

data/lib/foxbat/pipeline.rb

@@ -0,0 +1,29 @@
+import org.jboss.netty.channel.Channels
+import org.jboss.netty.channel.ChannelPipelineFactory
+import org.jboss.netty.handler.ssl.SslHandler
+
+require_relative 'security'
+
+module Foxbat
+
+  class Pipeline
+    include ChannelPipelineFactory
+
+    def initialize(handler, ssl_context=nil)
+      @handler = handler
+      @context = ssl_context
+    end
+
+    def getPipeline
+      pipeline = Channels.pipeline
+      if @context
+        engine = Security.create_ssl_engine(@context)
+        pipeline.addLast("ssl", SslHandler.new(engine))
+      end
+      pipeline.addLast("handler", @handler.new)
+      pipeline
+    end
+    
+  end
+
+end

data/lib/foxbat/security.rb

@@ -0,0 +1,56 @@
+module Foxbat
+
+  class Security
+    import javax.net.ssl.SSLContext
+    import javax.net.ssl.KeyManagerFactory
+    import javax.net.ssl.TrustManagerFactory
+    import javax.net.ssl.SSLEngineResult
+    import java.security.KeyStore
+    import java.io.FileInputStream
+
+    def self.setup_keystore(path)
+      keystore = KeyStore.getInstance(KeyStore.getDefaultType)
+      fis = FileInputStream.new(path)
+      
+      puts 'Enter passphrase for keystore:'
+      password = java.lang.System.console.readPassword
+
+      begin
+        keystore.load(fis, password)
+      rescue IOException
+        puts 'Invalid passphrase.'
+        fis.close
+        return setup_keystore(path)
+      end
+      fis.close
+
+      kmf = KeyManagerFactory.getInstance('SunX509')
+      tmf = TrustManagerFactory.getInstance('SunX509')
+
+      kmf.init(keystore, password)
+      tmf.init(keystore)
+
+      password = nil # Paranoid, per the JavaDoc
+
+      puts 'Keystore successfully loaded.'
+      
+      [kmf, tmf]
+    end
+
+    def self.setup_ssl_context(keystore_path)
+      context = SSLContext.getInstance('TLSv1')
+      kmf, tmf = setup_keystore(keystore_path)
+      context.init(kmf.getKeyManagers, tmf.getTrustManagers, nil)
+      context
+    end
+    
+    def self.create_ssl_engine(context)
+      engine = context.createSSLEngine
+      engine.setUseClientMode(false)
+      engine.setNeedClientAuth(false)
+      engine
+    end
+    
+  end
+
+end

data/lib/foxbat/server.rb

@@ -1,53 +1,29 @@
 import java.net.InetSocketAddress
-import java.nio.channels.AsynchronousServerSocketChannel
-import java.nio.channels.AsynchronousSocketChannel
-import java.nio.channels.AsynchronousChannelGroup
-import java.util.concurrent.TimeUnit
-import java.lang.Long
-import java.io.IOException
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory
+import org.jboss.netty.bootstrap.ServerBootstrap
+require_relative 'pipeline'
+require_relative 'security'
 
 module Foxbat
 
   class Server
 
-    def create_ssl_engine(connection)
-      engine = @ssl_context.createSSLEngine
-      engine.setUseClientMode(false)
-      engine.setNeedClientAuth(false)
-      connection.ssl_engine = engine
-    end
-
     def initialize(host, port, klass, options, block=nil)
-      @bind_address = InetSocketAddress.new(host, port)
-      @klass = klass
-      @block = block || Proc.new {}
+      if options[:secure]
+        @context = Security.setup_ssl_context(options[:keystore])
+      end
+      @address = InetSocketAddress.new(host, port)
+      @pipeline = Pipeline.new(klass || block, @context)
     end
 
     def start(threadpool)
-      @group = AsynchronousChannelGroup.withCachedThreadPool(threadpool, 1)
-      @server = AsynchronousServerSocketChannel.open(@group)
-      @server.bind(@bind_address)
-
-      handler = Foxbat::Handler.new(@server) do |source,socket|
-        source.accept(nil,handler)
-
-        connection = @klass.new({})
-        connection.channel = socket
-        connection.block = @block
-        connection.server_post_init
-        connection.post_init
-
-        connection.read_channel
-      end
-
-      @server.accept(nil, handler)
-
-      
+      @factory = NioServerSocketChannelFactory.new(threadpool, threadpool)
+      @bootstrap = ServerBootstrap.new(@factory)
+      @bootstrap.setPipelineFactory(@pipeline)
+      @bootstrap.bind(@address)
     end
 
     def stop
-      @server.close
-      @group.awaitTermination(0, TimeUnit::SECONDS)
     end
   end
   

data/lib/foxbat.rb

@@ -1,13 +1,12 @@
 require 'java'
+require 'netty-3.5.0.Final.jar'
 
 require 'em/connection'
 require 'em/periodic_timer'
 require 'em/timer'
-require 'foxbat/barrier'
 require 'foxbat/server'
-require 'foxbat/handler'
 require 'foxbat/version'
-require File.join(File.dirname(__FILE__), 'eventmachine.rb')
+require_relative 'eventmachine'
 
 module EventMachine; end
 EM = EventMachine

metadata

@@ -1,29 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: foxbat
 version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease:
-  version: 0.0.2
 platform: ruby
 authors:
 - Chris Mowforth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies: []
-description: A drop-in replacement for EventMachine, designed & built from the ground-up around Java 7 A/IO.
+description: A drop-in replacement for EM, providing functionality missing from the Java port.
 email:
 - chris@mowforth.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/foxbat.rb
 - lib/eventmachine.rb
+- lib/netty-3.5.0.Final.jar
+- lib/foxbat.rb
 - lib/foxbat/barrier.rb
-- lib/foxbat/server.rb
 - lib/foxbat/version.rb
-- lib/foxbat/handler.rb
+- lib/foxbat/server.rb
+- lib/foxbat/pipeline.rb
+- lib/foxbat/security.rb
 - lib/em/periodic_timer.rb
 - lib/em/timer.rb
 - lib/em/connection.rb
@@ -47,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: EventMachine replacement for JRuby.

data/lib/foxbat/handler.rb

@@ -1,32 +0,0 @@
-import java.nio.channels.CompletionHandler
-import java.nio.channels.AsynchronousCloseException
-
-module Foxbat
-
-  class Handler
-    include CompletionHandler
-
-    attr_writer :on_fail
-
-    def initialize(source, &block)
-      @source = source
-      @completion = block
-    end
-
-    def completed(socket,attachment)
-      @completion.call(@source,socket)
-    end
-
-    def failed(err,attachment)
-      if !err.is_a?(AsynchronousCloseException)
-        if @on_fail.nil?
-          p "ERR: #{err.inspect} -> #{attachment.inspect}"
-        else
-          @on_fail.call(err, attachment)
-        end
-      end
-    end
-
-  end
-
-end