ftw 0.0.39 → 0.0.40

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGM2YzlmODMwN2RjNzU0YTNhNmU3ZDBlNmNiOGY4ZmNmZTNiY2NlOA==
-  data.tar.gz: !binary |-
-    Y2VhYTRmMzNiNzM1NzI3YmMxNjllZDA1MGVlNjVkODE4ZTM4Yzc2OQ==
+SHA1:
+  metadata.gz: 1ab7afb8f3c6e07bf4f80b2635bff119eef99e04
+  data.tar.gz: 5b59a556ba16516104ae26dc2b80ad87d08bfce8
 SHA512:
-  metadata.gz: !binary |-
-    NjlkMDBkNTAxMTA3NWM5NmU3ZTJmOTc5OWZhMzhjOWY5ZDM4MzMxYjllZmQ3
-    OWJkNzc0NjdmZjMzOGNhYWYwNWNiYmQyZjE0MDVmYmQ2MTg5ODM2MmE1NDcx
-    YjMxZTk4MzJhYmI1ZjFlNmI0OWIxNDMxYTA3N2ZiNjQ3YWE3MGQ=
-  data.tar.gz: !binary |-
-    NzA4ZjlmMTYzOThjMDRjZWI2MjkxNmYzZTExZTI0ZDkxY2MyNjM2MTFlYWNi
-    ZWUyNjFiZjZhMWNjZTRiNjkyMTIzNjkwZDQzZWU1YWRiMWU4ZTUyZDg2Yjkx
-    YjA4MTFiZTRkYjQyOWNjYzk3N2MwNGQ5MjMxNjEwZmI0MjMzNzk=
+  metadata.gz: 6186e1580975f891bfe1f2f774def4c193abaf4db82fd2b20d845cbb661a998892467ba73a2d260f4c686e206a82de2cc907a9dfa319a1fd46edc5849c60e661
+  data.tar.gz: 35836d9e9d0ea74922d84dbc9115f00885b4e2710c6d71904d70fdbd09931a684c9100395abe34c7051cabeb083e2529954dffc0836b996a79aa4de09511a26e

data/lib/ftw/agent.rb

@@ -208,11 +208,13 @@ class FTW::Agent
     m = name.upcase
 
     # 'def get' (put, post, etc)
+    public
     define_method(name.to_sym) do |uri, options={}|
       return request(m, uri, options)
     end
 
     # 'def get!' (put!, post!, etc)
+    public
     define_method("#{name}!".to_sym) do |uri, options={}|
       return execute(request(m, uri, options))
     end

data/lib/ftw/connection.rb

@@ -244,6 +244,8 @@ class FTW::Connection
         data << @read_buffer
         return data
       rescue EOFError => e
+        @socket.close
+        @connected = false
         raise e
       end
     else
@@ -329,13 +331,26 @@ class FTW::Connection
     # 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
+
+    # ruby-core is refusing to patch ruby's default openssl settings to be more
+    # secure, so let's fix that here. The next few lines setting options and
+    # ciphers come from jmhodges proposed patch
+    ssloptions = OpenSSL::SSL::OP_ALL
+    if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
+      ssloptions &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
+    end
+    if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
+      ssloptions |= OpenSSL::SSL::OP_NO_COMPRESSION
+    end
+    sslcontext.options = ssloptions
+    sslcontext.ciphers = "DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2"
+
     sslcontext.verify_callback = proc do |*args| 
       @logger.debug("Verify peer via FTW::Connection#secure", :callback => settings[:verify_callback])
       if settings[:verify_callback].respond_to?(:call)
         settings[:verify_callback].call(*args)
       end
     end
-    sslcontext.ssl_version = :TLSv1
     sslcontext.cert_store = options[:certificate_store]
     @socket = OpenSSL::SSL::SSLSocket.new(@socket, sslcontext)
 

data/lib/ftw/pool.rb

@@ -40,6 +40,7 @@ class FTW::Pool
   #     end
   def fetch(identifier, &default_block)
     @lock.synchronize do
+      @pool[identifier].delete_if { |o| o.available? && !o.connected? }
       object = @pool[identifier].find { |o| o.available? }
       return object if !object.nil?
     end

data/lib/ftw/protocol.rb

@@ -74,29 +74,45 @@ module FTW::Protocol
 
   def write_http_body_chunked(body, io)
     if body.is_a?(String)
-      io.write(encode_chunked(body))
+      write_all( io, encode_chunked(body))
     elsif body.respond_to?(:sysread)
-      true while io.write(encode_chunked(body.sysread(16384)))
+      begin
+        while cont = body.sysread(16384)
+          write_all( io, encode_chunked(cont))
+        end
+      rescue EOFError
+      end
     elsif body.respond_to?(:read)
-      true while io.write(encode_chunked(body.read(16384)))
+      while cont = body.read(16384)
+        write_all( io, encode_chunked(cont) )
+      end
     elsif body.respond_to?(:each)
-      body.each { |s| io.write(encode_chunked(s)) }
+      body.each { |s| write_all( io, encode_chunked(s)) }
     end
 
     # The terminating chunk is an empty one.
-    io.write(encode_chunked(""))
+    write_all(io, encode_chunked(""))
   end # def write_http_body_chunked
 
   def write_http_body_normal(body, io)
     if body.is_a?(String)
-      io.write(body)
+      write_all(io, body)
     elsif body.respond_to?(:read)
-      true while io.write(body.read(16384))
+      while cont = body.read(16384)
+        write_all(io, cont)
+      end
     elsif body.respond_to?(:each)
-      body.each { |s| io.write(s) }
+      body.each { |s| write_all( io, s) }
     end
   end # def write_http_body_normal
 
+  def write_all(io, string)
+    while string.bytesize > 0
+      w = io.write(string)
+      string = string[w..-1]
+    end
+  end # def write_all
+
   # Read the body of this message. The block is called with chunks of the
   # response as they are read in.
   #

data/lib/ftw/version.rb

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

data/test/ftw/protocol.rb

@@ -0,0 +1,79 @@
+#require File.join(File.expand_path(__FILE__).sub(/\/ftw\/.*/, "/testing"))
+require 'ftw/protocol'
+require 'stringio'
+
+describe FTW::Protocol do
+
+  class OnlySysread < Struct.new(:io)
+    def sysread(*args)
+      io.sysread(*args)
+    end
+  end
+
+  class OnlyRead < Struct.new(:io)
+    def read(*args)
+      io.read(*args)
+    end
+  end
+
+  test "reading body via #read" do
+    protocol = Object.new
+    protocol.extend FTW::Protocol
+
+    output = StringIO.new
+    input  = OnlyRead.new( StringIO.new('Some example input') )
+
+    protocol.write_http_body(input, output, false)
+
+    output.rewind
+    assert_equal( output.string, 'Some example input')
+  end
+
+  test "reading body via #sysread chunked" do
+    protocol = Object.new
+    protocol.extend FTW::Protocol
+
+    output = StringIO.new
+    input  = OnlySysread.new( StringIO.new('Some example input') )
+
+    protocol.write_http_body(input, output, true)
+
+    output.rewind
+    assert_equal( output.string, "12\r\nSome example input\r\n0\r\n\r\n")
+  end
+
+  test "reading body via #read chunked" do
+    protocol = Object.new
+    protocol.extend FTW::Protocol
+
+    output = StringIO.new
+    input  = OnlyRead.new( StringIO.new('Some example input') )
+
+    protocol.write_http_body(input, output, true)
+
+    output.rewind
+    assert_equal( output.string, "12\r\nSome example input\r\n0\r\n\r\n")
+  end
+
+  class OneByteWriter < Struct.new(:io)
+
+    def write( str )
+      io.write(str[0..1])
+    end
+
+  end
+
+  test "writing partially" do
+    protocol = Object.new
+    protocol.extend FTW::Protocol
+
+    output = OneByteWriter.new( StringIO.new )
+    input  = OnlyRead.new( StringIO.new('Some example input') )
+
+    protocol.write_http_body(input, output, true)
+
+    output.io.rewind
+    assert_equal( output.io.string, "12\r\nSome example input\r\n0\r\n\r\n")
+  end
+
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ftw
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,42 +42,42 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 description: For The Web. Trying to build a solid and sane API for client and server
@@ -88,42 +88,43 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rack/handler/ftw.rb
-- lib/ftw/dns.rb
-- lib/ftw/dns/dns.rb
-- lib/ftw/dns/hash.rb
+- README.md
+- lib/ftw.rb
 - lib/ftw/agent.rb
 - lib/ftw/agent/configuration.rb
-- lib/ftw/singleton.rb
-- lib/ftw/websocket.rb
+- lib/ftw/cacert.pem
 - lib/ftw/connection.rb
+- lib/ftw/cookies.rb
+- lib/ftw/crlf.rb
+- lib/ftw/dns.rb
+- lib/ftw/dns/dns.rb
+- lib/ftw/dns/hash.rb
 - lib/ftw/http/headers.rb
 - lib/ftw/http/message.rb
+- lib/ftw/namespace.rb
+- lib/ftw/pool.rb
 - lib/ftw/poolable.rb
-- lib/ftw/server.rb
-- lib/ftw/response.rb
 - lib/ftw/protocol.rb
-- lib/ftw/cacert.pem
-- lib/ftw/version.rb
-- lib/ftw/namespace.rb
 - lib/ftw/request.rb
-- lib/ftw/crlf.rb
-- lib/ftw/pool.rb
+- lib/ftw/response.rb
+- lib/ftw/server.rb
+- lib/ftw/singleton.rb
+- lib/ftw/version.rb
 - lib/ftw/webserver.rb
-- lib/ftw/websocket/writer.rb
-- lib/ftw/websocket/rack.rb
-- lib/ftw/websocket/parser.rb
+- lib/ftw/websocket.rb
 - lib/ftw/websocket/constants.rb
-- lib/ftw/cookies.rb
-- lib/ftw.rb
-- test/testing.rb
+- lib/ftw/websocket/parser.rb
+- lib/ftw/websocket/rack.rb
+- lib/ftw/websocket/writer.rb
+- lib/rack/handler/ftw.rb
 - test/all.rb
-- test/ftw/singleton.rb
+- test/docs.rb
+- test/ftw/crlf.rb
 - test/ftw/http/dns.rb
 - test/ftw/http/headers.rb
-- test/ftw/crlf.rb
-- test/docs.rb
-- README.md
+- test/ftw/protocol.rb
+- test/ftw/singleton.rb
+- test/testing.rb
 homepage: http://github.com/jordansissel/ruby-ftw
 licenses:
 - Apache License (2.0)
@@ -135,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: For The Web. Trying to build a solid and sane API for client and server web