sockit 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c3573605d7f098845826d1e1be93105351ba8c
-  data.tar.gz: a4dfbbe50dc3458b2f82144fae7163fba1b2073e
+  metadata.gz: 9f119ae1ef934eccc52447bc1a6858ba528fd246
+  data.tar.gz: 32c92a29a247a47ae15951c0e136fe6aebe2b320
 SHA512:
-  metadata.gz: dd52aeffe4d0e8f19050faab68669bb8b7c0309164fe207b984542e21432206b4726f5030f449d52dd13900010a886d0e6dd32bbac76fbfb5cb39469416e796d
-  data.tar.gz: f198b98c10ff53ca6c7889f46165af6eb50d428e05a1a432d0d141b01854cbace19beb0bd091d44e78d1aa3446f5a543562b0545a6eb2009cc7fc7d6c8fa3130
+  metadata.gz: 1631707e3357000ff835b13b5ad788a1c94b7c1d7b8b178cfd8410c2d92c8e5899522f968c30cc83afdf28d04edb3f22160b9215fb721a16ddb41f4429dab86a
+  data.tar.gz: 26422b90f818c9cb59b07d7101fefc0238198e51e3343c24cfde5e5338774d826cabfc916f3c2d08be89435106f7ea9cc56201d4f7a4e60e2f9d69272497c5db

data/lib/sockit/v5/authentication.rb

@@ -2,7 +2,7 @@ module Sockit
   module V5
     module Authentication
 
-      def perform_v5_authenticate(socket)
+      def build_v5_authentication_request(socket)
         log(:yellow, "Authenticating with SOCKS server #{config.host}:#{config.port}")
 
         # The authentication methods supported are numbered as follows:
@@ -33,10 +33,12 @@ module Sockit
           dump(:write, data)
           socket.write(data)
         end
+      end
 
-        # The server's choice is communicated:
-        # field 1: SOCKS version, 1 byte (0x05 for this version)
-        # field 2: chosen authentication method, 1 byte, or 0xFF if no acceptable methods were offered
+      # The server's choice is communicated:
+      # field 1: SOCKS version, 1 byte (0x05 for this version)
+      # field 2: chosen authentication method, 1 byte, or 0xFF if no acceptable methods were offered
+      def process_v5_authentication_response(socket)
         log(:yellow, "Waiting for SOCKS authentication reply")
         auth_reply = socket.recv(2).unpack("C*")
         dump(:read, auth_reply)
@@ -53,51 +55,60 @@ module Sockit
           log(:green, build_v5_authentication_method_message(server_auth_method))
         end
 
-        # The subsequent authentication is method-dependent. Username and password authentication (method 0x02) is described in RFC 1929:
-        case server_auth_method
+        server_auth_method
+      end
+
+      def perform_v5_password_authentication_request(socket)
+        # For username/password authentication the client's authentication request is
+        # field 1: version number, 1 byte (must be 0x01)
+        # field 2: username length, 1 byte
+        # field 3: username
+        # field 4: password length, 1 byte
+        # field 5: password
+        data = Array.new
+        data << [0x01].pack("C*")
+        data << [config.username.length.to_i].pack("C*")
+        data << config.username
+        data << [config.password.length.to_i].pack("C*")
+        data << config.password
+        data = data.flatten.join
+
+        log(:yellow, "Sending username and password")
+        dump(:write, data)
+        socket.write(data)
+
+        # Server response for username/password authentication:
+        # field 1: version, 1 byte
+        # field 2: status code, 1 byte.
+        # 0x00 = success
+        # any other value = failure, connection must be closed
+        log(:yellow, "Waiting for SOCKS authentication reply")
+        auth_reply = socket.recv(2).unpack("C*")
+        dump(:read, auth_reply)
+        version = auth_reply[0]
+        status_code = auth_reply[1]
+
+        if status_code == 0x00
+          log(:green, build_v5_authentication_status_message(status_code))
+        else
+          raise SockitError, build_v5_authentication_status_message(status_code)
+        end
+
+        log(:green, "Authenticated to SOCKS server #{config.host}:#{config.port}")
+      end
+
+      def perform_v5_authenticate(socket)
+        build_v5_authentication_request(socket)
+
+        case process_v5_authentication_response(socket)
         when 0x00 then
           # No authentication
         when 0x01 then
           # GSSAPI
           raise SockitError, "Authentication method GSSAPI not implemented"
         when 0x02 then
-          # For username/password authentication the client's authentication request is
-          # field 1: version number, 1 byte (must be 0x01)
-          # field 2: username length, 1 byte
-          # field 3: username
-          # field 4: password length, 1 byte
-          # field 5: password
-          data = Array.new
-          data << [0x01].pack("C*")
-          data << [config.username.length.to_i].pack("C*")
-          data << config.username
-          data << [config.password.length.to_i].pack("C*")
-          data << config.password
-          data = data.flatten.join
-
-          log(:yellow, "Sending username and password")
-          dump(:write, data)
-          socket.write(data)
-
-          # Server response for username/password authentication:
-          # field 1: version, 1 byte
-          # field 2: status code, 1 byte.
-          # 0x00 = success
-          # any other value = failure, connection must be closed
-          log(:yellow, "Waiting for SOCKS authentication reply")
-          auth_reply = socket.recv(2).unpack("C*")
-          dump(:read, auth_reply)
-          version = auth_reply[0]
-          status_code = auth_reply[1]
-
-          if status_code == 0x00
-            log(:green, build_v5_authentication_status_message(status_code))
-          else
-            raise SockitError, build_v5_authentication_status_message(status_code)
-          end
+          perform_v5_password_authentication_request(socket)
         end
-
-        log(:green, "Authenticated to SOCKS server #{config.host}:#{config.port}")
       end
 
     end

data/lib/sockit/version.rb

@@ -21,7 +21,7 @@
 module Sockit
 
   unless const_defined?(:VERSION)
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sockit
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Zachary Patten