socksify 1.5.0 → 1.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a86f51b885a36af4bf34d20dbc8476485a583635
+  data.tar.gz: 0b6b59f257862b1f8010288321b1407ea7efdfd0
+SHA512:
+  metadata.gz: 282b936cdf5c9d21b9a6fbec35e58e8923f17bbf3a6e073a8d70c78d2abf7421147c9bc79670af9bb90e70245c34b8bff4b9a75ac274b179977f2efa15b8189c
+  data.tar.gz: 39051b34bb2ab7b0524d016c3dbb3815f89e3f6048c4b2d75f5af08d85bfc35276dedb20f0687620d8a023d5592911fb525e4d334d16fca701f12379f4d2cb6b

data/lib/socksify.rb

@@ -1,3 +1,4 @@
+#encoding: us-ascii
 =begin
     Copyright (C) 2007 Stephan Maka <stephan@spaceboyz.net>
 
@@ -130,22 +131,27 @@ class TCPSocket
     @@socks_ignores = ignores
   end
 
-  class SOCKSConnectionPeerAddress
-    attr_reader :socks_server, :socks_port, :peer_host
+  class SOCKSConnectionPeerAddress < String
+    attr_reader :socks_server, :socks_port
+
     def initialize(socks_server, socks_port, peer_host)
-      @socks_server, @socks_port, @peer_host = socks_server, socks_port, peer_host
+      @socks_server, @socks_port = socks_server, socks_port
+      super peer_host
+    end
+
+    def inspect
+      "#{to_s} (via #{@socks_server}:#{@socks_port})"
     end
 
-    def to_s
-      "#{@peer_host} (via #{@socks_server}:#{@socks_port})"
+    def peer_host
+      to_s
     end
-    alias_method :to_str, :to_s
   end
 
   alias :initialize_tcp :initialize
 
   # See http://tools.ietf.org/html/rfc1928
-  def initialize(host=nil, port=0, local_host="0.0.0.0", local_port=0)
+  def initialize(host=nil, port=0, local_host=nil, local_port=nil)
     if host.is_a?(SOCKSConnectionPeerAddress)
       socks_peer = host
       socks_server = socks_peer.socks_server
@@ -178,7 +184,7 @@ class TCPSocket
   def socks_authenticate
     if self.class.socks_username || self.class.socks_password
       Socksify::debug_debug "Sending username/password authentication"
-      write "\005\001\001\002"
+      write "\005\001\002"
     else
       Socksify::debug_debug "Sending no authentication"
       write "\005\001\000"

data/lib/socksify/http.rb

@@ -46,8 +46,14 @@ module Net
       end
 
       module InstanceMethods
-        def conn_address
-          TCPSocket::SOCKSConnectionPeerAddress.new(self.class.socks_server, self.class.socks_port, address())
+        if RUBY_VERSION[0..0] >= '2'
+          def address
+            TCPSocket::SOCKSConnectionPeerAddress.new(self.class.socks_server, self.class.socks_port, @address)
+          end
+        else
+          def conn_address
+            TCPSocket::SOCKSConnectionPeerAddress.new(self.class.socks_server, self.class.socks_port, address())
+          end
         end
       end
     end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socksify
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - Stephan Maka
@@ -14,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: stephan@spaceboyz.net
@@ -22,40 +21,39 @@ executables:
 - socksify_ruby
 extensions: []
 extra_rdoc_files:
-- doc/index.css
 - doc/index.html
+- doc/index.css
 - COPYING
 files:
 - COPYING
-- lib/socksify/debug.rb
-- lib/socksify/http.rb
-- lib/socksify.rb
-- lib/socksify.rb.orig
 - bin/socksify_ruby
 - doc/index.css
 - doc/index.html
+- lib/socksify.rb
+- lib/socksify/debug.rb
+- lib/socksify/http.rb
 homepage: http://socksify.rubyforge.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: socksify
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Redirect all TCPSockets through a SOCKS5 proxy
 test_files: []
+has_rdoc: false

data/lib/socksify.rb.orig

@@ -1,244 +0,0 @@
-=begin
-    Copyright (C) 2007 Stephan Maka <stephan@spaceboyz.net>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
-
-require 'socket'
-require 'socksify_debug'
-
-class SOCKSError < RuntimeError
-  def initialize(msg)
-    Socksify::debug_error("#{self.class}: #{msg}")
-    super
-  end
-
-  class ServerFailure < SOCKSError
-    def initialize
-      super("general SOCKS server failure")
-    end
-  end
-  class NotAllowed < SOCKSError
-    def initialize
-      super("connection not allowed by ruleset")
-    end
-  end
-  class NetworkUnreachable < SOCKSError
-    def initialize
-      super("Network unreachable")
-    end
-  end
-  class HostUnreachable < SOCKSError
-    def initialize
-      super("Host unreachable")
-    end
-  end
-  class ConnectionRefused < SOCKSError
-    def initialize
-      super("Connection refused")
-    end
-  end
-  class TTLExpired < SOCKSError
-    def initialize
-      super("TTL expired")
-    end
-  end
-  class CommandNotSupported < SOCKSError
-    def initialize
-      super("Command not supported")
-    end
-  end
-  class AddressTypeNotSupported < SOCKSError
-    def initialize
-      super("Address type not supported")
-    end
-  end
-
-  def self.for_response_code(code)
-    case code
-    when 1
-      ServerFailure
-    when 2
-      NotAllowed
-    when 3
-      NetworkUnreachable
-    when 4
-      HostUnreachable
-    when 5
-      ConnectionRefused
-    when 6
-      TTLExpired
-    when 7
-      CommandNotSupported
-    when 8
-      AddressTypeNotSupported
-    else
-      self
-    end
-  end
-end
-
-class TCPSocket
-  def self.socks_server
-    @@socks_server
-  end
-  def self.socks_server=(host)
-    @@socks_server = host
-  end
-  def self.socks_port
-    @@socks_port
-  end
-  def self.socks_port=(port)
-    @@socks_port = port
-  end
-  def self.socks_ignores
-    @@socks_ignores ||= []
-  end
-  def self.socks_ignores=(ignores)
-    @@socks_ignores = ignores
-  end
-
-  alias :initialize_tcp :initialize
-
-  # See http://tools.ietf.org/html/rfc1928
-  def initialize(host=nil, port=0, local_host="0.0.0.0", local_port=0)
-    socks_server = self.class.socks_server
-    socks_port = self.class.socks_port
-    socks_ignores = self.class.socks_ignores
-
-    if socks_server and socks_port and not socks_ignores.include?(host)
-      Socksify::debug_notice "Connecting to SOCKS server #{socks_server}:#{socks_port}"
-      initialize_tcp socks_server, socks_port
-
-      socks_authenticate
-
-      if host
-        socks_connect(host, port)
-      end
-    else
-      Socksify::debug_notice "Connecting directly to #{host}:#{port}"
-      initialize_tcp host, port, local_host, local_port
-      Socksify::debug_debug "Connected to #{host}:#{port}"
-    end
-  end
-  
-  # Authentication
-  def socks_authenticate
-    Socksify::debug_debug "Sending no authentication"
-    write "\005\001\000"
-    Socksify::debug_debug "Waiting for authentication reply"
-    auth_reply = recv(2)
-    if auth_reply[0] != 4 and auth_reply[0] != 5
-      raise SOCKSError.new("SOCKS version #{auth_reply[0]} not supported")
-    end
-    if auth_reply[1] != 0
-      raise SOCKSError.new("SOCKS authentication method #{auth_reply[1]} neither requested nor supported")
-    end
-  end
-
-  # Connect
-  def socks_connect(host, port)
-    Socksify::debug_debug "Sending destination address"
-    write "\005\001\000"
-    if host =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/  # to IPv4 address
-      write "\001" + [$1.to_i,
-                      $2.to_i,
-                      $3.to_i,
-                      $4.to_i
-                     ].pack('CCCC')
-    elsif host =~ /^[:0-9a-f]+$/  # to IPv6 address
-      raise "TCP/IPv6 over SOCKS is not yet supported (inet_pton missing in Ruby & not supported by Tor"
-      write "\004"
-    else                          # to hostname
-      write "\003" + [host.size].pack('C') + host
-    end
-    write [port].pack('n')
-
-    socks_receive_reply
-    Socksify::debug_notice "Connected to #{host}:#{port} over SOCKS"
-  end
-
-  # returns [bind_addr: String, bind_port: Fixnum]
-  def socks_receive_reply
-    Socksify::debug_debug "Waiting for SOCKS reply"
-    connect_reply = recv(4)
-    if connect_reply[0] != 5
-      raise SOCKSError.new("SOCKS version #{connect_reply[0]} is not 5")
-    end
-    if connect_reply[1] != 0
-      raise SOCKSError.for_response_code(connect_reply[1])
-    end
-    Socksify::debug_debug "Waiting for bind_addr"
-    bind_addr_len = case connect_reply[3]
-                    when 1
-                      4
-                    when 3
-                      recv(1)[0]
-                    when 4
-                      16
-                    else
-                      raise SOCKSError.for_response_code(connect_reply[3])
-                    end
-    bind_addr_s = recv(bind_addr_len)
-    bind_addr = case connect_reply[3]
-                when 1
-                  "#{bind_addr_s[0]}.#{bind_addr_s[1]}.#{bind_addr_s[2]}.#{bind_addr_s[3]}"
-                when 3
-                  bind_addr_s
-                when 4  # Untested!
-                  i = 0
-                  ip6 = ""
-                  bind_addr_s.each_byte do |b|
-                    if i > 0 and i % 2 == 0
-                      ip6 += ":"
-                    end
-                    i += 1
-
-                    ip6 += b.to_s(16).rjust(2, '0')
-                  end
-                end
-    bind_port = recv(bind_addr_len + 2)
-    [bind_addr, bind_port.unpack('n')]
-  end
-end
-
-module Socksify
-  def self.resolve(host)
-    s = TCPSocket.new
-
-    begin
-      Socksify::debug_debug "Sending hostname to resolve: #{host}"
-      s.write "\005"
-      if host =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/  # to IPv4 address
-        s.write "\xF1\000\001" + [$1.to_i,
-                                  $2.to_i,
-                                  $3.to_i,
-                                  $4.to_i
-                                 ].pack('CCCC')
-      elsif host =~ /^[:0-9a-f]+$/  # to IPv6 address
-        raise "TCP/IPv6 over SOCKS is not yet supported (inet_pton missing in Ruby & not supported by Tor"
-        s.write "\004"
-      else                          # to hostname
-        s.write "\xF0\000\003" + [host.size].pack('C') + host
-      end
-      s.write [0].pack('n')  # Port
-      
-      addr, port = s.socks_receive_reply
-      Socksify::debug_notice "Resolved #{host} as #{addr} over SOCKS"
-      addr
-    ensure
-      s.close
-    end
-  end
-end