lib/sockit/v5/authentication.rb in sockit-1.0.6 vs lib/sockit/v5/authentication.rb in sockit-1.0.7

@@ -1,10 +1,10 @@
 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:
         # 0x00: No authentication
         # 0x01: GSSAPI[10]
@@ -31,14 +31,16 @@
 
           log(:yellow, "Requesting no authentication")
           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)
         server_socks_version = auth_reply[0]
         server_auth_method = auth_reply[1]
@@ -51,54 +53,63 @@
           raise SockitError, build_v5_authentication_method_message(server_auth_method)
         else
           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
   end
 end