ftw 0.0.11 → 0.0.13

data/lib/ftw/agent.rb

@@ -6,6 +6,7 @@ require "ftw/pool"
 require "ftw/websocket"
 require "addressable/uri"
 require "cabin"
+require "openssl"
 
 # This should act as a proper web agent.
 #
@@ -36,6 +37,16 @@ require "cabin"
 # TODO(sissel): TBD: implement cookies... delicious chocolate chip cookies.
 class FTW::Agent
   include FTW::Protocol
+  require "ftw/agent/configuration"
+  include FTW::Agent::Configuration
+
+  class TooManyRedirects < StandardError
+    attr_accessor :response
+    def initialize(reason, response)
+      super(reason)
+      @response = response
+    end
+  end
 
   # List of standard HTTP methods described in RFC2616
   STANDARD_METHODS = %w(options get head post put delete trace connect)
@@ -48,7 +59,15 @@ class FTW::Agent
     @pool = FTW::Pool.new
     @logger = Cabin::Channel.get
 
-    @redirect_max = 20
+    configuration[REDIRECTION_LIMIT] = 20
+
+    @certificate_store = OpenSSL::X509::Store.new
+    @certificate_store.add_file("/etc/ssl/certs/ca-bundle.trust.crt")
+    @certificate_store.verify_callback = proc do |*args|
+      p :verify_callback => args
+      true
+    end
+
   end # def initialize
 
   # Define all the standard HTTP methods (Per RFC2616)
@@ -139,6 +158,10 @@ class FTW::Agent
       end
     end
 
+    if options.include?(:body)
+      request.body = options[:body]
+    end
+
     return request
   end # def request
 
@@ -160,15 +183,15 @@ class FTW::Agent
       p :error => error
       raise error
     end
-    connection.secure if request.protocol == "https"
+
+    if request.protocol == "https"
+      connection.secure(:certificate_store => @certificate_store)
+    end
     response = request.execute(connection)
 
     redirects = 0
+    # Follow redirects
     while response.redirect? and response.headers.include?("Location")
-      redirects += 1
-      if redirects > @redirect_max
-        # TODO(sissel): Abort somehow...
-      end
       # RFC2616 section 10.3.3 indicates HEAD redirects must not include a
       # body. Otherwise, the redirect response can have a body, so let's
       # throw it away.
@@ -178,15 +201,24 @@ class FTW::Agent
       elsif response.content?
         # Throw away the body
         response.body = connection
-        # read_body will release the connection
+        # read_body will consume the body and release this connection
         response.read_body { |chunk| }
       end
 
       # TODO(sissel): If this response has any cookies, store them in the
       # agent's cookie store
 
-      @logger.debug("Redirecting", :location => response.headers["Location"])
       redirects += 1
+      if redirects > configuration[REDIRECTION_LIMIT]
+        # TODO(sissel): include original a useful debugging information like
+        # the trace of redirections, etc.
+        raise TooManyRedirects.new("Redirect more than " \
+            "#{configuration[REDIRECTION_LIMIT]} times, aborting.", response)
+        # I don't like this api from FTW::Agent. I think 'get' and other methods
+        # should return (object, error), and if there's an error 
+      end
+
+      @logger.debug("Redirecting", :location => response.headers["Location"])
       request.use_uri(response.headers["Location"])
       connection, error = connect(request.headers["Host"], request.port)
       # TODO(sissel): Do better error handling than raising.
@@ -194,9 +226,11 @@ class FTW::Agent
         p :error => error
         raise error
       end
-      connection.secure if request.protocol == "https"
+      if request.protocol == "https"
+        connection.secure(:certificate_store => @certificate_store)
+      end
       response = request.execute(connection)
-    end
+    end # while being redirected
 
     # RFC 2616 section 9.4, HEAD requests MUST NOT have a message body.
     if request.method != "HEAD"
@@ -249,5 +283,9 @@ class FTW::Agent
     return connection, nil
   end # def connect
 
+  # TODO(sissel): Implement methods for managing the certificate store
+  # TODO(sissel): Implement methods for managing the cookie store
+  # TODO(sissel): Implement methods for managing the cache
+  # TODO(sissel): Implement configuration stuff? Is FTW::Agent::Configuration the best way?
   public(:initialize, :execute, :websocket!, :upgrade!, :shutdown)
 end # class FTW::Agent

data/lib/ftw/agent/configuration.rb

@@ -0,0 +1,9 @@
+require "ftw"
+
+module FTW::Agent::Configuration
+  REDIRECTION_LIMIT = "redirection-limit".freeze
+
+  def configuration
+    return @configuration ||= Hash.new
+  end
+end

data/lib/ftw/connection.rb

@@ -5,6 +5,7 @@ require "ftw/namespace"
 require "socket"
 require "timeout" # ruby stdlib, just for the Timeout exception.
 require "backports" # for Array#rotate, IO::WaitWritable, etc, in ruby < 1.9
+require "openssl"
 
 # A network connection. This is TCP.
 #
@@ -53,6 +54,7 @@ class FTW::Connection
       @destinations = destinations
     end
 
+    @mode = :client
     setup
   end # def initialize
 
@@ -136,7 +138,7 @@ class FTW::Connection
     @socket = Socket.new(family, Socket::SOCK_STREAM, 0)
 
     # This api is terrible. pack_sockaddr_in? This isn't C, man...
-    @logger.info("packing", :data => [port.to_i, @remote_address])
+    @logger.debug("packing", :data => [port.to_i, @remote_address])
     sockaddr = Socket.pack_sockaddr_in(port.to_i, @remote_address)
     # TODO(sissel): Support local address binding
 
@@ -148,13 +150,18 @@ class FTW::Connection
       # the documentation says to use this IO::WaitWritable thing...
       # I don't get it, but whatever :(
 
-      if writable?(timeout)
+      writable = writable?(timeout)
+
+      # http://jira.codehaus.org/browse/JRUBY-6528; IO.select doesn't behave correctly
+      # on JRuby < 1.7, so work around it.
+      if writable || (RUBY_PLATFORM == "java" and JRUBY_VERSION < "1.7.0")
         begin
           @socket.connect_nonblock(sockaddr) # check connection failure
         rescue Errno::EISCONN 
           # Ignore, we're already connected.
         rescue Errno::ECONNREFUSED => e
           # Fire 'disconnected' event with reason :refused
+          @socket.close
           return ConnectRefused.new("#{host}[#{@remote_address}]:#{port}")
         rescue Errno::ETIMEDOUT
           # This occurs when the system's TCP timeout hits, we have no control
@@ -162,11 +169,16 @@ class FTW::Connection
           # for this, but I haven't checked..
           # TODO(sissel): We should instead do 'retry' unless we've exceeded
           # the timeout.
+          @socket.close
+          return ConnectTimeout.new("#{host}[#{@remote_address}]:#{port}")
+        rescue Errno::EINPROGRESS
+          # If we get here, it's likely JRuby version < 1.7.0. EINPROGRESS at
+          # this point in the code means that we have timed out.
+          @socket.close
           return ConnectTimeout.new("#{host}[#{@remote_address}]:#{port}")
         end
       else
-        # Connection timeout
-        # Fire 'disconnected' event with reason :timeout
+        # Connection timeout;
         return ConnectTimeout.new("#{host}[#{@remote_address}]:#{port}")
       end
     end
@@ -279,29 +291,35 @@ class FTW::Connection
   end # def to_io
 
   # Secure this connection with TLS.
-  def secure(timeout=nil, options={})
+  #
+  # Options:
+  #
+  # * :certificate_store, an OpenSSL::X509::Store
+  # * :timeout, a timeout threshold in seconds.
+  def secure(options={})
     # Skip this if we're already secure.
     return if secured?
 
-    @logger.debug("Securing this connection", :peer => peer, :connection => self)
+    options[:timeout] ||= nil
+    options[:certificate_store] ||= OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE
+
+    @logger.info("Securing this connection", :peer => peer)
     # Wrap this connection with TLS/SSL
-    require "openssl"
     sslcontext = OpenSSL::SSL::SSLContext.new
-    sslcontext.ssl_version = :TLSv1
     # If you use VERIFY_NONE, you are removing the trust feature of TLS. Don't do that.
     # Encryption without trust means you don't know who you are talking to.
     sslcontext.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    # TODO(sissel): Try to be smart about setting this default.
-    sslcontext.ca_path = "/etc/ssl/certs"
+    sslcontext.ssl_version = :TLSv1
+    sslcontext.cert_store = options[:certificate_store]
     @socket = OpenSSL::SSL::SSLSocket.new(@socket, sslcontext)
 
     # TODO(sissel): Set up local certificat/key stuff. This is required for
     # server-side ssl operation, I think.
 
     if client?
-      do_secure(:connect_nonblock)
+      do_secure(:connect_nonblock, options[:timeout])
     else
-      do_secure(:accept_nonblock)
+      do_secure(:accept_nonblock, options[:timeout])
     end
   end # def secure
 
@@ -313,7 +331,7 @@ class FTW::Connection
   # @param [Symbol] handshake_method The method to call on the socket to
   #   complete the ssl handshake. See OpenSSL::SSL::SSLSocket#connect_nonblock
   #   of #accept_nonblock for more details
-  def do_secure(handshake_method)
+  def do_secure(handshake_method, timeout=nil)
     # SSLSocket#connect_nonblock will do the SSL/TLS handshake.
     # TODO(sissel): refactor this into a method that both secure and connect
     # methods can call.

data/lib/ftw/http/message.rb

@@ -54,6 +54,11 @@ module FTW::HTTP::Message
     # TODO(sissel): if it's an IO object, set Transfer-Encoding to chunked
     # TODO(sissel): if it responds to each or appears to be Enumerable, then
     # set Transfer-Encoding to chunked.
+    if message_body.is_a?(IO)
+      headers["Transfer-Encoding"] = "chunked"
+    else
+      headers["Content-Length"] = message_body.length
+    end
     @body = message_body
   end # def body=
 
@@ -83,7 +88,7 @@ module FTW::HTTP::Message
 
   # Does this message have a body?
   def body?
-    return @body.nil?
+    return !@body.nil?
   end # def body?
 
   # Set the HTTP version. Must be a valid version. See VALID_VERSIONS.

data/lib/ftw/request.rb

@@ -72,6 +72,14 @@ class FTW::Request
     tries = 3
     begin
       connection.write(to_s + CRLF)
+
+      if body?
+        if body.is_a?(String)
+          connection.write(body)
+        else
+          connection.write(data) while data = body.read(16384)
+        end
+      end
     rescue => e
       # TODO(sissel): Rescue specific exceptions, not just anything.
       # Reconnect and retry

data/lib/ftw/version.rb

@@ -3,5 +3,5 @@ require "ftw/namespace"
 # :nodoc:
 module FTW
   # The version of this library
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

data/lib/rack/handler/ftw.rb

@@ -93,6 +93,16 @@ class Rack::Handler::FTW
     logger.info("Starting server", :config => @config)
     @server = FTW::Server.new([@config[:Host], @config[:Port]].join(":"))
     @server.each_connection do |connection|
+      # The rack specification insists that 'rack.input' objects support
+      # #rewind. Bleh. Just lie about it and monkeypatch it in.
+      # This is required for Sinatra to accept 'post' requests, otherwise
+      # it barfs.
+      class << connection
+        def rewind(*args)
+          # lolrack, nothing to do here.
+        end
+      end
+
       @threads << Thread.new do
         handle_connection(connection)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftw
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -131,6 +131,7 @@ files:
 - lib/ftw/websocket.rb
 - lib/ftw/http/message.rb
 - lib/ftw/http/headers.rb
+- lib/ftw/agent/configuration.rb
 - lib/ftw/request.rb
 - lib/ftw/protocol.rb
 - lib/ftw/response.rb
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: For The Web. Trying to build a solid and sane API for client and server web