socksify 1.2.0 → 1.3.0

data/lib/socksify.rb

@@ -17,7 +17,7 @@
 
 require 'socket'
 require 'resolv'
-require 'socksify_debug'
+require 'socksify/debug'
 
 class SOCKSError < RuntimeError
   def initialize(msg)
@@ -118,13 +118,33 @@ class TCPSocket
     @@socks_ignores = ignores
   end
 
+  class SOCKSConnectionPeerAddress
+    attr_reader :socks_server, :socks_port, :peer_host
+    def initialize(socks_server, socks_port, peer_host)
+      @socks_server, @socks_port, @peer_host = socks_server, socks_port, peer_host
+    end
+
+    def to_s
+      "#{@peer_host} (via #{@socks_server}:#{@socks_port}"
+    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)
-    socks_server = self.class.socks_server
-    socks_port = self.class.socks_port
-    socks_ignores = self.class.socks_ignores
+    if host.is_a?(SOCKSConnectionPeerAddress)
+      socks_peer = host
+      socks_server = socks_peer.socks_server
+      socks_port = socks_peer.socks_port
+      socks_ignores = []
+      host = socks_peer.peer_host
+    else
+      socks_server = self.class.socks_server
+      socks_port = self.class.socks_port
+      socks_ignores = self.class.socks_ignores
+    end
 
     if socks_server and socks_port and not socks_ignores.include?(host)
       Socksify::debug_notice "Connecting to SOCKS server #{socks_server}:#{socks_port}"

data/lib/socksify/http.rb

@@ -0,0 +1,55 @@
+=begin
+    Copyright (C) 2007 Stephan Maka <stephan@spaceboyz.net>
+    Copyright (C) 2011 Musy Bite <musybite@gmail.com>
+
+    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 'socksify'
+require 'net/http'
+
+module Net
+  class HTTP
+    def self.SOCKSProxy(p_host, p_port)
+      delta = SOCKSProxyDelta
+      proxyclass = Class.new(self)
+      proxyclass.send(:include, delta)
+      proxyclass.module_eval {
+        include delta::InstanceMethods
+        extend delta::ClassMethods
+        @socks_server = p_host
+        @socks_port = p_port
+      }
+      proxyclass
+    end
+
+    module SOCKSProxyDelta
+      module ClassMethods
+        def socks_server
+          @socks_server
+        end
+
+        def socks_port
+          @socks_port
+        end
+      end
+
+      module InstanceMethods
+        def conn_address
+          TCPSocket::SOCKSConnectionPeerAddress.new(self.class.socks_server, self.class.socks_port, address())
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: socksify
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Stephan Maka
 - Andrey Kouznetsov
 - Christopher Thorpe
+- Musy Bite
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +01:00
+date: 2011-02-22 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -33,9 +34,10 @@ extra_rdoc_files:
 - COPYING
 files: 
 - COPYING
-- lib/socksify_debug.rb
 - lib/socksify.rb.orig
 - lib/socksify.rb
+- lib/socksify/debug.rb
+- lib/socksify/http.rb
 - bin/socksify_ruby
 - doc/index.css
 - doc/index.html