socksify 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86f51b885a36af4bf34d20dbc8476485a583635
-  data.tar.gz: 0b6b59f257862b1f8010288321b1407ea7efdfd0
+  metadata.gz: de7d71ec280f514fb083bd26f34b76ce14a2c82d
+  data.tar.gz: 10454a02092c6e14884441f90997b17ed92ee27a
 SHA512:
-  metadata.gz: 282b936cdf5c9d21b9a6fbec35e58e8923f17bbf3a6e073a8d70c78d2abf7421147c9bc79670af9bb90e70245c34b8bff4b9a75ac274b179977f2efa15b8189c
-  data.tar.gz: 39051b34bb2ab7b0524d016c3dbb3815f89e3f6048c4b2d75f5af08d85bfc35276dedb20f0687620d8a023d5592911fb525e4d334d16fca701f12379f4d2cb6b
+  metadata.gz: 9bb3836afe02eadd52465295fe8428e3e9424a139271abf08951722a3195bf56b0093611c80a557e1d836faf0a498f3795953caf63e9a32ec0175562e9dc4b6c
+  data.tar.gz: 00deeb904f05fe9be737fbae6b2633ecc234b81c9841c4fd99718076b0b657b3d24399b5e890ff884e7e5899644191b7272a0f59b22e59beb6324230fa109210

data/lib/socksify.rb

@@ -191,6 +191,9 @@ class TCPSocket
     end
     Socksify::debug_debug "Waiting for authentication reply"
     auth_reply = recv(2)
+    if auth_reply.empty?
+      raise SOCKSError.new("Server doesn't reply authentication")
+    end
     if auth_reply[0..0] != "\004" and auth_reply[0..0] != "\005"
       raise SOCKSError.new("SOCKS version #{auth_reply[0..0]} not supported")
     end
@@ -217,6 +220,7 @@ class TCPSocket
 
   # Connect
   def socks_connect(host, port)
+    port = Socket.getservbyname(port) if port.is_a?(String)
     Socksify::debug_debug "Sending destination address"
     write TCPSocket.socks_version
     Socksify::debug_debug TCPSocket.socks_version.unpack "H*"
@@ -261,6 +265,9 @@ class TCPSocket
     Socksify::debug_debug "Waiting for SOCKS reply"
     if @@socks_version == "5"
       connect_reply = recv(4)
+      if connect_reply.empty?
+        raise SOCKSError.new("Server doesn't reply")
+      end
       Socksify::debug_debug connect_reply.unpack "H*"
       if connect_reply[0..0] != "\005"
         raise SOCKSError.new("SOCKS version #{connect_reply[0..0]} is not 5")
@@ -330,7 +337,7 @@ module Socksify
       end
       s.write [0].pack('n')  # Port
       
-      addr, port = s.socks_receive_reply
+      addr, _port = s.socks_receive_reply
       Socksify::debug_notice "Resolved #{host} as #{addr} over SOCKS"
       addr
     ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socksify
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Stephan Maka
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: stephan@spaceboyz.net
@@ -51,9 +51,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socksify
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Redirect all TCPSockets through a SOCKS5 proxy
 test_files: []
-has_rdoc: false