ftw 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fab2173e9d5a55d01c5be096be99b4a6e4c9b6
-  data.tar.gz: 2d5d057c20fc4bec7705143ba4010d9162623d1f
+  metadata.gz: e554187a6f1f99f8aff5f44525e78e22e8d26650
+  data.tar.gz: 3470b1876552ed207ee28f063ed88ff5baea514e
 SHA512:
-  metadata.gz: 1cd81a35b4289d5c5f3c7aa566d4de5e4192ad2ac8343d7c74d3a13fc695ad6c719254395375448262da6ee13697ce2a066f63eaab32c069e185a4b7d8ee2c9c
-  data.tar.gz: 437f27db19fd9616dcec6db39d97f02e336ab0d5edeaebff14e785a70d85988a41a8a72bbd2075ccbbd2f4ce9532321277b49730a49894bd1e87681ca5c6eedd
+  metadata.gz: 368bd3157428d274bde3ba04c1ca670002ff1993cbd03292f71b2706433a24c63ce8d9fd7a95d45c67e282a1864526608d7237f79125171da78560f2953a0b8c
+  data.tar.gz: 8ab90dfa46381cd5a6cf4d107d4892dc179ff2c27c8281508f6181bed91688c1d4234d149c596a1dae16400a60efaa4da2b790ad72f0916640f3a3ff93ce56b7

data/lib/ftw/connection.rb

@@ -2,6 +2,7 @@ require "cabin" # rubygem "cabin"
 require "ftw/dns"
 require "ftw/poolable"
 require "ftw/namespace"
+require "ftw/agent"
 require "socket"
 require "timeout" # ruby stdlib, just for the Timeout exception.
 
@@ -267,20 +268,21 @@ class FTW::Connection
 
   # End this connection, specifying why.
   def disconnect(reason)
+    io = @socket
     if @socket.is_a?(OpenSSL::SSL::SSLSocket)
       @socket.sysclose()
-    else
-      begin 
-        @socket.close_read
-      rescue IOError => e
-        # Ignore, perhaps we shouldn't ignore.
-      end
+      io = @socket.io
+    end
+    begin 
+      io.close_read
+    rescue IOError => e
+      # Ignore, perhaps we shouldn't ignore.
+    end
 
-      begin 
-        @socket.close_write
-      rescue IOError => e
-        # Ignore, perhaps we shouldn't ignore.
-      end
+    begin 
+      io.close_write
+    rescue IOError => e
+      # Ignore, perhaps we shouldn't ignore.
     end
   end # def disconnect
 
@@ -319,11 +321,18 @@ class FTW::Connection
   # * :certificate_store, an OpenSSL::X509::Store
   # * :timeout, a timeout threshold in seconds.
   # * :ciphers, an OpenSSL ciphers string, see `openssl ciphers` manual for details.
-  # * :version, any of: SSLv2, SSLv3, TLSv1, TLSv1.1, TLSv1.2
+  # * :ssl_version, any of: SSLv2, SSLv3, TLSv1, TLSv1.1, TLSv1.2
+  # * :certificate, an OpenSSL::X509::Certificate
+  # * :key, an OpenSSL::PKey (like OpenSSL::PKey::RSA)
+  #
+  # Both `certificate` and `key` are highly recommended if the connection
+  # belongs to a server (not a client connection).
   #
   # Notes:
   # * Version may depend on your platform (openssl compilation settings, JVM
   #   version, export restrictions, etc) 
+#   * Available ciphers will depend on your version of Ruby (or JRuby and JVM),
+  #   OpenSSL, etc.
   def secure(options=nil)
     # Skip this if we're already secure.
     return if secured?
@@ -331,7 +340,7 @@ class FTW::Connection
     defaults = {
       :timeout => nil,
       :ciphers => FTW::Agent::Configuration::SSL_CIPHER_MAP["MOZILLA_MODERN"],
-      :version => "TLSv1.1"
+      :ssl_version => "TLSv1.1"
     }
     settings = defaults.merge(options) unless options.nil?
 
@@ -353,8 +362,8 @@ class FTW::Connection
       ssloptions |= OpenSSL::SSL::OP_NO_COMPRESSION
     end
     # https://github.com/jruby/jruby/issues/1874
-    version = OpenSSL::SSL::SSLContext::METHODS.find { |x| x.to_s.gsub("_",".") == settings[:version] }
-    raise InvalidConfiguration, "Invalid SSL/TLS version '#{settings[:version]}'" if version.nil?
+    version = OpenSSL::SSL::SSLContext::METHODS.find { |x| x.to_s.gsub("_",".") == settings[:ssl_version] }
+    raise InvalidConfiguration, "Invalid SSL/TLS version '#{settings[:ssl_version]}'" if version.nil?
     sslcontext.ssl_version = version
 
     # We have to set ciphers *after* setting ssl_version because setting
@@ -370,6 +379,11 @@ class FTW::Connection
     end
     sslcontext.cert_store = settings[:certificate_store]
 
+    if settings.include?(:certificate) && settings.include?(:key)
+      sslcontext.cert = settings[:certificate]
+      sslcontext.key = settings[:key]
+    end
+
     @socket = OpenSSL::SSL::SSLSocket.new(@socket, sslcontext)
 
     # TODO(sissel): Set up local certificat/key stuff. This is required for

data/lib/ftw/server.rb

@@ -1,4 +1,6 @@
 require "ftw/namespace"
+require "ftw/dns"
+require "ftw/connection"
 
 # A web server.
 class FTW::Server

data/lib/ftw/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftw
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -146,9 +146,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: For The Web. Trying to build a solid and sane API for client and server web
   stuff. Client and Server operations for HTTP, WebSockets, SPDY, etc.
 test_files: []
+has_rdoc: