socksify 1.4.1 → 1.5.0

data/lib/socksify.rb

@@ -111,6 +111,18 @@ class TCPSocket
   def self.socks_port=(port)
     @@socks_port = port
   end
+  def self.socks_username
+    @@socks_username ||= nil
+  end
+  def self.socks_username=(username)
+    @@socks_username = username
+  end
+  def self.socks_password
+    @@socks_password ||= nil
+  end
+  def self.socks_password=(password)
+    @@socks_password = password
+  end
   def self.socks_ignores
     @@socks_ignores ||= %w(localhost)
   end
@@ -161,18 +173,39 @@ class TCPSocket
       Socksify::debug_debug "Connected to #{host}:#{port}"
     end
   end
-  
+
   # Authentication
   def socks_authenticate
-    Socksify::debug_debug "Sending no authentication"
-    write "\005\001\000"
+    if self.class.socks_username || self.class.socks_password
+      Socksify::debug_debug "Sending username/password authentication"
+      write "\005\001\001\002"
+    else
+      Socksify::debug_debug "Sending no authentication"
+      write "\005\001\000"
+    end
     Socksify::debug_debug "Waiting for authentication reply"
     auth_reply = recv(2)
     if auth_reply[0..0] != "\004" and auth_reply[0..0] != "\005"
       raise SOCKSError.new("SOCKS version #{auth_reply[0..0]} not supported")
     end
-    if auth_reply[1..1] != "\000"
-      raise SOCKSError.new("SOCKS authentication method #{auth_reply[1..1]} neither requested nor supported")
+    if self.class.socks_username || self.class.socks_password
+      if auth_reply[1..1] != "\002"
+        raise SOCKSError.new("SOCKS authentication method #{auth_reply[1..1]} neither requested nor supported")
+      end
+      auth = "\001"
+      auth += self.class.socks_username.to_s.length.chr
+      auth += self.class.socks_username.to_s
+      auth += self.class.socks_password.to_s.length.chr
+      auth += self.class.socks_password.to_s
+      write auth
+      auth_reply = recv(2)
+      if auth_reply[1..1] != "\000"
+        raise SOCKSError.new("SOCKS authentication failed")
+      end
+    else
+      if auth_reply[1..1] != "\000"
+        raise SOCKSError.new("SOCKS authentication method #{auth_reply[1..1]} neither requested nor supported")
+      end
     end
   end
 

data/lib/socksify/debug.rb

@@ -1,30 +1,30 @@
-class Color
-  class Reset
+module Socksify
+  class Color
+    class Reset
+      def self::to_s
+        "\e[0m\e[37m"
+      end
+    end
+  
+    class Red < Color
+      def num; 31; end
+    end
+    class Green < Color
+      def num; 32; end
+    end
+    class Yellow < Color
+      def num; 33; end
+    end
+  
     def self::to_s
-      "\e[0m\e[37m"
+      new.to_s
+    end
+  
+    def to_s
+      "\e[1m\e[#{num}m"
     end
   end
 
-  class Red < Color
-    def num; 31; end
-  end
-  class Green < Color
-    def num; 32; end
-  end
-  class Yellow < Color
-    def num; 33; end
-  end
-
-  def self::to_s
-    new.to_s
-  end
-
-  def to_s
-    "\e[1m\e[#{num}m"
-  end
-end
-
-module Socksify
   def self.debug=(enabled)
     @@debug = enabled
   end

metadata

@@ -1,77 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: socksify
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 1
-  version: 1.4.1
+version: !ruby/object:Gem::Version
+  version: 1.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephan Maka
 - Andrey Kouznetsov
 - Christopher Thorpe
 - Musy Bite
 - Yuichi Tateno
+- David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-07 00:00:00 +02:00
-default_executable: 
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: stephan@spaceboyz.net
-executables: 
+executables:
 - socksify_ruby
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - doc/index.css
 - doc/index.html
 - COPYING
-files: 
+files:
 - COPYING
-- lib/socksify.rb.orig
 - lib/socksify/debug.rb
 - lib/socksify/http.rb
 - lib/socksify.rb
+- lib/socksify.rb.orig
 - bin/socksify_ruby
 - doc/index.css
 - doc/index.html
-has_rdoc: true
 homepage: http://socksify.rubyforge.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: socksify
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Redirect all TCPSockets through a SOCKS5 proxy
 test_files: []
-