libuv 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aadb10cd3940b1506f9a898a5cb36fe41ee4929
-  data.tar.gz: 44e8623b2b204756fd7bfdb915fe6012e7e30892
+  metadata.gz: 6b1083a5f79f1e3c76247f6871cb52a299362315
+  data.tar.gz: 86311c897d2e2da79fd28d8a756236cfbd5a3f12
 SHA512:
-  metadata.gz: f0945989ee594cc8bc78969f8b20d728c32875d302476cd49dac9059e69e3cd46ff171fdfd1040d80854354b0a09d1d2328a0b694aec4f91cf3f8327e9776960
-  data.tar.gz: 08f642c3abdbf20df9bbcd4dfd5a19172fda8314b4a6a82bebe20a04bb3ace010404dc0f4ccd346b1507e06277d55f34678d8af53940796d12df0f8dfc096665
+  metadata.gz: 78c74f51d1a890826f005654693b0b9c92a97ea0d9aecee10b91f877ec6ca98880400f0fbf2770286198397006d2d4bb52ef97667a299d526cc88de40e448fe1
+  data.tar.gz: 30440c1b0b077e34b8a7519ab2a34e4a4dcbd04004158716f8fe8151ae9d5150002eb0e28887a128308d2a31f9a0e7dfc5430d4a4348b507dd658a6bf8e8d2b7

data/README.md

@@ -64,7 +64,7 @@ or
 
 ## Libuv features supported
 
-* TCP
+* TCP (with TLS support)
 * UDP
 * TTY
 * Pipe

data/lib/libuv/ext/tasks.rb

@@ -13,7 +13,9 @@ file 'ext/libuv/build' do
 end
 
 file 'ext/libuv/build/gyp' => 'ext/libuv/build' do
-    system "svn", "export", "-r1214", "http://gyp.googlecode.com/svn/trunk", "ext/libuv/build/gyp"
+    if not File.directory?('ext/libuv/build/gyp')
+        system "svn", "export", "-r1214", "http://gyp.googlecode.com/svn/trunk", "ext/libuv/build/gyp"
+    end
 end
 
 CLEAN.include('ext/libuv/build/gyp')

data/lib/libuv/mixins/stream.rb

@@ -134,10 +134,14 @@ module Libuv
                 data = base.read_string(nread)
                 ::Libuv::Ext.free(base)
                 
-                begin
-                    @progress.call data, self
-                rescue Exception => e
-                    @loop.log :error, :stream_progress_cb, e
+                if @tls.nil?
+                    begin
+                        @progress.call data, self
+                    rescue Exception => e
+                        @loop.log :error, :stream_progress_cb, e
+                    end
+                else
+                    @tls.decrypt(data)
                 end
             end
         end

data/lib/libuv/tcp.rb

@@ -1,4 +1,5 @@
 require 'ipaddr'
+require 'ruby-tls'
 
 
 module Libuv
@@ -7,6 +8,7 @@ module Libuv
 
 
         KEEPALIVE_ARGUMENT_ERROR = "delay must be an Integer".freeze
+        TLS_ERROR = "TLS write failed".freeze
 
 
         def initialize(loop, acceptor = nil)
@@ -19,6 +21,101 @@ module Libuv
             super(tcp_ptr, error)
         end
 
+
+        #
+        # TLS Abstraction ----------------------
+        # --------------------------------------
+        #
+        def start_tls(args = {})
+            @handshake = false
+            @pending_writes = []
+            @tls = ::RubyTls::Connection.new(self)
+            @tls.start(args)
+        end
+
+        # Push through any pending writes when handshake has completed
+        def handshake_cb
+            @handshake = true
+            writes = @pending_writes
+            @pending_writes = nil
+            writes.each do |deferred, data|
+                @pending_write = deferred
+                @tls.encrypt(data)
+            end
+        end
+
+        # This is clear text data that has been decrypted
+        # Same as stream.rb on_read for clear text
+        def dispatch_cb(data)
+            begin
+                @progress.call data, self
+            rescue Exception => e
+                @loop.log :error, :stream_progress_cb, e
+            end
+        end
+
+        # We resolve the existing tls write promise with a the
+        #  real writes promise (a close may have occurred)
+        def transmit_cb(data)
+            if not @pending_write.nil?
+                @pending_write.resolve(direct_write(data))
+                @pending_write = nil
+            else
+                direct_write(data)
+            end
+        end
+
+        # Close can be called multiple times
+        def close_cb
+            if not @pending_write.nil?
+                @pending_write.reject(TLS_ERROR)
+                @pending_write = nil
+            end
+
+            # Shutdown the stream
+            close
+        end
+
+        # overwrite the default close to ensure
+        # pending writes are rejected
+        def close
+            if not @pending_writes.nil?
+                @pending_writes.each do |deferred, data|
+                    deferred.reject(TLS_ERROR)
+                end
+                @pending_writes = nil
+            end
+
+            super
+        end
+
+        # Verify peers will be called for each cert in the chain
+        def verify_peer(&block)
+            @tls.verify_cb &block
+        end
+
+        alias_method :direct_write, :write
+        def write(data)
+            if @tls.nil?
+                direct_write(data)
+            else
+                deferred = @loop.defer
+                
+                if @handshake == true
+                    @pending_write = deferred
+                    @tls.encrypt(data)
+                else
+                    @pending_writes << [deferred, data]
+                end
+
+                deferred.promise
+            end
+        end
+        #
+        # END TLS Abstraction ------------------
+        # --------------------------------------
+        #
+
         def bind(ip, port, callback = nil, &blk)
             return if @closed
             @on_listen = callback || blk

data/lib/libuv/version.rb

@@ -1,3 +1,3 @@
 module Libuv
-    VERSION = '0.11.1'
+    VERSION = '0.11.2'
 end

data/libuv.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
 
     gem.add_runtime_dependency     'ffi', '>= 1.9'
     gem.add_runtime_dependency     'thread_safe'
+    gem.add_runtime_dependency     'ruby-tls'
     gem.add_development_dependency 'rspec', '>= 2.14'
     gem.add_development_dependency 'rake', '>= 10.1'
     gem.add_development_dependency 'yard'

data/spec/tcp_spec.rb

@@ -200,4 +200,68 @@ describe Libuv::TCP do
 		@log.should == ['ping', 'pong']
 	end
 
+	describe 'basic TLS client and server' do
+		it "should send a ping and return a pong", :network => true do
+			@loop.run { |logger|
+				logger.progress do |level, errorid, error|
+					begin
+						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+					rescue Exception
+						@general_failure << 'error in logger'
+					end
+				end
+
+
+				@server.bind('127.0.0.1', 34567) do |server|
+					server.accept do |client|
+						client.start_tls(server: true)
+						client.progress do |data|
+							@log << data
+
+							client.write('pong')
+						end
+						client.start_read
+					end
+				end
+
+				# catch errors
+				@server.catch do |reason|
+					@general_failure << reason.inspect
+				end
+
+				# start listening
+				@server.listen(1024)
+
+
+
+				# connect client to server
+				@client.connect('127.0.0.1', 34567) do |client|
+					client.start_tls
+					client.progress do |data|
+						@log << data
+
+						@client.shutdown
+					end
+
+					@client.start_read
+					@client.write('ping')
+				end
+
+				# catch errors
+				@client.catch do |reason|
+					@general_failure << reason.inspect
+				end
+
+				# close the handle
+				@client.finally do
+					@server.close
+					@loop.stop
+				end
+			}
+
+			@general_failure.should == []
+			@log.should == ['ping', 'pong']
+		end
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libuv
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Bulat Shakirzyanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-tls
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +187,19 @@ files:
 - ext/libuv/include/uv.h
 - ext/libuv/m4/.gitignore
 - ext/libuv/m4/dtrace.m4
+- ext/libuv/samples/.gitignore
+- ext/libuv/samples/socks5-proxy/.gitignore
+- ext/libuv/samples/socks5-proxy/LICENSE
+- ext/libuv/samples/socks5-proxy/Makefile
+- ext/libuv/samples/socks5-proxy/build.gyp
+- ext/libuv/samples/socks5-proxy/client.c
+- ext/libuv/samples/socks5-proxy/defs.h
+- ext/libuv/samples/socks5-proxy/getopt.c
+- ext/libuv/samples/socks5-proxy/main.c
+- ext/libuv/samples/socks5-proxy/s5.c
+- ext/libuv/samples/socks5-proxy/s5.h
+- ext/libuv/samples/socks5-proxy/server.c
+- ext/libuv/samples/socks5-proxy/util.c
 - ext/libuv/src/fs-poll.c
 - ext/libuv/src/inet.c
 - ext/libuv/src/queue.h
@@ -285,6 +312,7 @@ files:
 - ext/libuv/test/test-barrier.c
 - ext/libuv/test/test-callback-order.c
 - ext/libuv/test/test-callback-stack.c
+- ext/libuv/test/test-close-fd.c
 - ext/libuv/test/test-close-order.c
 - ext/libuv/test/test-condvar.c
 - ext/libuv/test/test-connection-fail.c
@@ -333,6 +361,7 @@ files:
 - ext/libuv/test/test-stdio-over-pipes.c
 - ext/libuv/test/test-tcp-bind-error.c
 - ext/libuv/test/test-tcp-bind6-error.c
+- ext/libuv/test/test-tcp-close-accept.c
 - ext/libuv/test/test-tcp-close-while-connecting.c
 - ext/libuv/test/test-tcp-close.c
 - ext/libuv/test/test-tcp-connect-error-after-write.c
@@ -361,6 +390,7 @@ files:
 - ext/libuv/test/test-udp-options.c
 - ext/libuv/test/test-udp-send-and-recv.c
 - ext/libuv/test/test-walk-handles.c
+- ext/libuv/test/test-watcher-cross-stop.c
 - ext/libuv/uv.gyp
 - ext/libuv/vcbuild.bat
 homepage: https://github.com/cotag/libuv