r_socks 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83fd1b16e6fe57dd2c8370023d0b2d2540fd472d871d304b14efb8cdef31db23
-  data.tar.gz: 617ab279bbb464955f8453dda146b8ea6d3e5b668232ebae316ce95c51487b74
+  metadata.gz: 8aeaa60ff88cdf8c84892a5c95c9613d1bc8726fdaf3a5e8d113eeb47f6fb77a
+  data.tar.gz: 84ec2ec281d97bf06bfd3838131cb35c11869f85361157088e593f2be03c78cb
 SHA512:
-  metadata.gz: d9c5c5edf153de04d45bc21237b0c0d2a61c6b071d23daaaaad3eafb7668f0f15e77d268e249abfede7584e31fc685c1b3fecaad983cd215695df9a1d811d4a9
-  data.tar.gz: cb28113a10dfd13bb5597bd013bbb6b1a7c2570d6385c1aa60209d84a243147a1674106841dfed5df28435f0e7a9adcd76dba1a221036e442c9863a1d198fae3
+  metadata.gz: 0b2c40a1456321518b5ce51918f34046ddb3f06056b634b08a026bd95cb231fe221c443848bf1dfd4c6d8add73363afcb47864c7de251c42786ce7778d08876e
+  data.tar.gz: 96df7a1ac2898bf062a8801b49570d351d5110946f309e8c3e74185e3e3f303f3b981d3781127f13971a6cd8a4f76c4dc6f0191c8fcd23f2e33f57cf42c68981

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    r_socks (0.1.7)
+    r_socks (0.2.0)
       eventmachine (~> 1.2, >= 1.2.7)
 
 GEM

data/lib/r_socks/authenticator.rb

@@ -5,7 +5,7 @@ module RSocks
     def initialize(adaptor = nil)
       @default_user = ENV['RSOCKS_USER'] || 'default'
       @default_password = ENV['RSOCKS_PASSWORD'] || 'default'
-      @adaptor = nil
+      @adaptor = adaptor
     end
 
     def auth!(data)

data/lib/r_socks/config.rb

@@ -14,17 +14,29 @@ module RSocks
 
     def auth_method=(method)
       if method == :no_auth
-        @store[:auth_method] = RSocks::NO_AUTH
+        @store[:auth_method] = :no_auth
       elsif method == :password
-        @store[:auth_method] = RSocks::PASSWORD_LOGIN
-
+        @store[:auth_method] = :password
       else
         raise Error, "unknown auth method #{method}"
       end
     end
 
     def auth_method
-      @store[:auth_method]
+      @store[:auth_method] || :password
+    end
+
+    def proxy_type=(type)
+      if type == :http
+        @store[:proxy_type] = :http
+
+      elsif type == :socks5
+        @store[:proxy_type] = :socks5
+      end
+    end
+
+    def proxy_type
+      @store[:proxy_type] || :socks5
     end
 
     def proxy_buffer_size

data/lib/r_socks/connection_handler.rb

@@ -1,12 +1,10 @@
 require 'socket'
 require 'eventmachine'
 require 'socket'
-require 'ipaddr'
-require 'r_socks/errors'
-require 'r_socks/socks5_bit_codes'
-require 'r_socks/state_machine'
+require 'r_socks/http_proxy_response_codes'
+require 'r_socks/http_proxy_parser'
 require 'r_socks/target_connection_handler'
-require 'r_socks/authenticator'
+require 'r_socks/socks5_proxy_parser'
 
 module RSocks
 
@@ -15,10 +13,8 @@ module RSocks
     def initialize(config, *args)
       super(*args)
       @state_machine = RSocks::StateMachine.new
-      @original_addr = nil
-      @original_port = nil
-      @authenticator = RSocks::Authenticator.new(config.auth_adaptor)
       @config = config
+      @parser = create_proxy_parser
     end
 
     def post_init
@@ -29,39 +25,29 @@ module RSocks
         close_connection
       end
     end
-    # sample \x05\x01\x00\x03\ngoogle.com\x00P
 
     def receive_data(data)
 
       return send_data(not_accept) if data.nil? || data == ''
 
       begin
-
-        if @state_machine.handshake?
-          return init_handshake(data)
-        end
-
-        if @state_machine.auth?
-          passed = @authenticator.auth!(data)
-          if passed
-            send_data(RSocks::SUCCESS_RESPONSE)
-            @state_machine.connect!
-            return
-          end
-
+        begin
+          @addr, @port = @parser.call(data)
+        rescue RSocks::HttpAuthFailed, RSocks::HttpNotSupport
+          send_data(RSocks::HttpProxyResponseCodes::FAILED_AUTH)
+          close_connection_after_writing
+        rescue RSocks::NotSupport
           send_data(RSocks::FAILED_RESPONSE)
-          return
-        end
-
-        if @state_machine.connect?
-          connect_request(data)
-          return
+          close_connection_after_writing
         end
 
-        return send_data(not_accept) unless @state_machine.start?
+        return unless @state_machine.start?
 
         if @target.nil?
-          @target = EventMachine.connect(@addr, @port, RSocks::TargetConnectionHandler, self, @config, data)
+          @target = EventMachine.connect(@addr, @port, RSocks::TargetConnectionHandler, self, @config)
+          if @config.proxy_type == :http
+            send_data(RSocks::HttpProxyResponseCodes::SUCCESS)
+          end
         end
 
         proxy_incoming_to(@target, @config.proxy_buffer_size)
@@ -82,116 +68,14 @@ module RSocks
 
     private
 
-    def init_handshake(data)
-
-      version, num = data.unpack('CC')
-
-      if version != RSocks::VERSION || num <= 0
-        send_data(not_accept)
-        close_connection
-      end
-
-      position = 'C' * num
-
-      methods = data[2..-1].unpack(position)
-
-      data = nil
-
-      auth_method = @config.auth_method || RSocks::NO_AUTH
-
-      if methods.include?(auth_method)
-
-        if auth_method == RSocks::NO_AUTH
-          @state_machine.connect!
-        elsif auth_method == RSocks::PASSWORD_LOGIN
-          @state_machine.auth!
-        end
-
-        data = [RSocks::VERSION, auth_method].pack('CC')
-      end
-
-      if data.nil?
-        send_data(not_accept)
-        close_connection
-      end
-
-      send_data(data)
-    end
-
-    def connect_request(data)
-      version, cmd = data.unpack('CC')
-      return not_accept if version != RSocks::VERSION
-
-      begin
-        @addr, @port, @type = check_sock_cmd(cmd, data[2..-1])
-      rescue
-        send_data([RSocks::VERSION,RSocks::CONNECT_FAIL].pack('CC'))
-        return close_connection
+    def create_proxy_parser
+      if @config.proxy_type == :http
+        return RSocks::HttpProxyParser.new(@state_machine, @config)
       end
 
-      @state_machine.start!
-
-      send_data([RSocks::VERSION, RSocks::CONNECT_SUCCESS].
-        pack('CC') + pack_address_and_port_info(@type))
-    end
-
-    def check_sock_cmd(cmd, data)
-      raise RSocks::NotSupport unless cmd == RSocks::CMD_CONNECT
-
-      _, addr_type = data.unpack('CC')
-
-      address = nil
-      port = nil
-      type = nil
-
-      if addr_type == RSocks::ADDR_IPV4
-        type = RSocks::ADDR_IPV4
-        address, port = parse_address_port(data[2..-1], 4, type)
-      elsif addr_type == RSocks::ADDR_IPV6
-        type = RSocks::ADDR_IPV6
-        address, port = parse_address_port(data[2..-1], 16, type)
-      elsif addr_type == RSocks::ADDR_DOMAIN
-        type = RSocks::ADDR_DOMAIN
-        padding = data[2].unpack('C')[0]
-        address, port = parse_address_port(data[3..-1], padding, type)
+      if @config.proxy_type == :socks5
+        return RSocks::Socks5ProxyParser.new(@state_machine, @config, self)
       end
-
-      [address, port, type]
-    end
-
-    def not_accept
-      [RSocks::VERSION, RSocks::NOT_ACCEPT].pack('CC')
-    end
-
-    def parse_address_port(data, padding, type)
-      address = data[0...padding]
-      port_start = padding
-
-      @original_port = data[port_start..-1]
-      @original_addr = address
-
-      temp = @original_port.unpack('CC')
-
-      port = (temp[0] << 8) | temp[1]
-
-      addr_str = if type == RSocks::ADDR_DOMAIN
-                   address
-                 else
-                   IPAddr.ntop(address)
-                 end
-
-      [addr_str, port]
-    end
-
-    def pack_address_and_port_info(type)
-      addr = @original_addr
-      if type == RSocks::ADDR_DOMAIN
-        domain_size = [addr.size].pack('C')
-        addr = domain_size + @original_addr
-      end
-
-      temp = [RSocks::KEEP_ONE_BIT, type]
-      temp.pack('C' * temp.size) + addr + @original_port
     end
 
   end

data/lib/r_socks/errors.rb

@@ -1,4 +1,6 @@
 module RSocks
   class Error < StandardError; end
   class NotSupport < Error; end
+  class HttpNotSupport < Error; end
+  class HttpAuthFailed < Error; end
 end

data/lib/r_socks/http_proxy_parser.rb

@@ -0,0 +1,76 @@
+require 'base64'
+
+module RSocks
+  class HttpProxyParser
+
+    def initialize(state_machine, config)
+      @state_machine = state_machine
+      @auth_method = config.auth_method
+      @default_user = ENV['RSOCKS_USER'] || 'default'
+      @default_password = ENV['RSOCKS_PASSWORD'] || 'default'
+      @adaptor = config.auth_adaptor
+    end
+
+    def call(data)
+      parser_connect_http(data)
+      @state_machine.start!
+      [@schema_parse.host, @schema_parse.port]
+    end
+
+    private
+
+    def parser_connect_http(data)
+      temp = data.split("\r\n")
+      host_format_checking(temp.shift)
+      generate_header(temp)
+
+      state = auth_user
+      raise RSocks::HttpAuthFailed unless state
+      state
+    end
+
+    def auth_user
+      temp = @header['Proxy-Authorization']
+      pattern = /^Basic /
+      token = temp.gsub(pattern, '')
+      begin
+        str = Base64.decode64(token)
+        @user, @password = str.split(':')
+      rescue
+        raise RSocks::HttpNotSupport, "token parse failed #{token}"
+      end
+
+      if @adaptor
+        return @adaptor.call(@user, @password)
+      else
+        return @password == @default_password && @user == @default_user
+      end
+    end
+
+    def host_format_checking(data)
+      temp = data.split("\s")
+      raise RSocks::HttpNotSupport if temp[0] != 'CONNECT'
+      @schema_parse = URI("tcp://#{temp[1]}/")
+    end
+
+    def generate_header(arr)
+      header = {}
+      arr.each do |val|
+        name, value = val.split(':')
+        next if name.nil?
+        header[name.strip] = value&.strip
+      end
+      @header = header
+    end
+  end
+end
+
+# state_machine = RSocks::StateMachine.new
+# a = RSocks::HttpProxyParser.new(state_machine, RSocks::Config.new)
+#
+# data = "CONNECT www.google.com.sg:80 HTTP/1.1\r\nHost: www.google.com.sg:80\r\nUser-Agent: Surge macOS/939\r\nConnection: keep-alive\r\nProxy-Connection: keep-alive\r\nProxy-Authorization: Basic ZGVmYXVsdDpkZWZhdWx0\r\n\r\n"
+#
+# host, port = a.call(data)
+#
+# puts host
+# puts port

data/lib/r_socks/http_proxy_response_codes.rb

@@ -0,0 +1,6 @@
+module RSocks
+  module HttpProxyResponseCodes
+    SUCCESS = "HTTP/1.1 200 OK\r\n\r\n"
+    FAILED_AUTH = "HTTP/1.1 401 Unauthorized\r\n\r\n"
+  end
+end

data/lib/r_socks/socks5_proxy_parser.rb

@@ -0,0 +1,174 @@
+require 'ipaddr'
+require 'r_socks/errors'
+require 'r_socks/socks5_bit_codes'
+require 'r_socks/state_machine'
+require 'r_socks/target_connection_handler'
+require 'r_socks/authenticator'
+require 'r_socks/socks5_proxy_parser'
+
+module RSocks
+  class Socks5ProxyParser
+    def initialize(state_machine, config, client)
+      @state_machine = state_machine
+      @auth_method = config.auth_method
+      @default_user = ENV['RSOCKS_USER'] || 'default'
+      @default_password = ENV['RSOCKS_PASSWORD'] || 'default'
+      @authenticator = RSocks::Authenticator.new(config.auth_adaptor)
+      @original_addr = nil
+      @original_port = nil
+      @config = config
+      @adaptor = config.auth_adaptor
+      @client = client
+    end
+
+
+    def call(data)
+      if @state_machine.handshake?
+        init_handshake(data)
+        return
+      end
+
+      if @state_machine.auth?
+        passed = @authenticator.auth!(data)
+        if passed
+          send_data(RSocks::SUCCESS_RESPONSE)
+          @state_machine.connect!
+          return
+        end
+
+        send_data(RSocks::FAILED_RESPONSE)
+        return
+      end
+
+      if @state_machine.connect?
+        connect_request(data)
+        return [@addr, @port]
+      end
+
+      return send_data(not_accept) unless @state_machine.start?
+    end
+
+    private
+
+    def init_handshake(data)
+
+      version, num = data.unpack('CC')
+
+      if version != RSocks::VERSION || num <= 0
+        send_data(not_accept)
+        close_connection
+      end
+
+      position = 'C' * num
+
+      methods = data[2..-1].unpack(position)
+
+      data = nil
+
+
+      auth_method = @config.auth_method == :password ? PASSWORD_LOGIN : RSocks::NO_AUTH
+
+      if methods.include?(auth_method)
+
+        if auth_method == RSocks::NO_AUTH
+          @state_machine.connect!
+        elsif auth_method == RSocks::PASSWORD_LOGIN
+          @state_machine.auth!
+        end
+
+        data = [RSocks::VERSION, auth_method].pack('CC')
+      end
+
+      if data.nil?
+        send_data(not_accept)
+        close_connection
+      end
+
+      send_data(data)
+    end
+
+    def connect_request(data)
+      version, cmd = data.unpack('CC')
+      return not_accept if version != RSocks::VERSION
+
+      begin
+        @addr, @port, @type = check_sock_cmd(cmd, data[2..-1])
+      rescue
+        send_data([RSocks::VERSION,RSocks::CONNECT_FAIL].pack('CC'))
+        return close_connection
+      end
+
+      @state_machine.start!
+
+      send_data([RSocks::VERSION, RSocks::CONNECT_SUCCESS].
+        pack('CC') + pack_address_and_port_info(@type))
+    end
+
+    def check_sock_cmd(cmd, data)
+      raise RSocks::NotSupport unless cmd == RSocks::CMD_CONNECT
+
+      _, addr_type = data.unpack('CC')
+
+      address = nil
+      port = nil
+      type = nil
+
+      if addr_type == RSocks::ADDR_IPV4
+        type = RSocks::ADDR_IPV4
+        address, port = parse_address_port(data[2..-1], 4, type)
+      elsif addr_type == RSocks::ADDR_IPV6
+        type = RSocks::ADDR_IPV6
+        address, port = parse_address_port(data[2..-1], 16, type)
+      elsif addr_type == RSocks::ADDR_DOMAIN
+        type = RSocks::ADDR_DOMAIN
+        padding = data[2].unpack('C')[0]
+        address, port = parse_address_port(data[3..-1], padding, type)
+      end
+
+      [address, port, type]
+    end
+
+    def not_accept
+      [RSocks::VERSION, RSocks::NOT_ACCEPT].pack('CC')
+    end
+
+    def parse_address_port(data, padding, type)
+      address = data[0...padding]
+      port_start = padding
+
+      @original_port = data[port_start..-1]
+      @original_addr = address
+
+      temp = @original_port.unpack('CC')
+
+      port = (temp[0] << 8) | temp[1]
+
+      addr_str = if type == RSocks::ADDR_DOMAIN
+                   address
+                 else
+                   IPAddr.ntop(address)
+                 end
+
+      [addr_str, port]
+    end
+
+    def pack_address_and_port_info(type)
+      addr = @original_addr
+      if type == RSocks::ADDR_DOMAIN
+        domain_size = [addr.size].pack('C')
+        addr = domain_size + @original_addr
+      end
+
+      temp = [RSocks::KEEP_ONE_BIT, type]
+      temp.pack('C' * temp.size) + addr + @original_port
+    end
+
+    def send_data(data)
+      @client.send_data(data)
+    end
+
+    def close_connection
+      @client.close_connection_after_writing
+    end
+  end
+end

data/lib/r_socks/target_connection_handler.rb

@@ -1,21 +1,20 @@
 require 'eventmachine'
+require 'r_socks/http_proxy_response_codes'
 
 module RSocks
   class TargetConnectionHandler < EM::Connection
 
-    def initialize(client, config, data)
+    def initialize(client, config)
       @client = client
-      @init_data = data
       @config = config
     end
 
     def post_init
-      proxy_incoming_to(@client,60000)
+      proxy_incoming_to(@client, @config.proxy_buffer_size)
     end
 
-    def connection_completed
-      send_data @init_data
-      @init_data = nil
+    def receive_data(data)
+      @client.send_data(data)
     end
 
     def proxy_target_unbound

data/lib/r_socks/version.rb

@@ -1,3 +1,3 @@
 module RSocks
-  VERSION = "0.1.8"
-end
+  VERSION = "0.2.0"
+end

data/lib/r_socks.rb

@@ -1,3 +1,8 @@
+require 'r_socks/state_machine'
+require 'r_socks/config'
+require 'r_socks/http_proxy_response_codes'
+require 'r_socks/errors'
+require 'r_socks/connection_handler'
 require 'r_socks/tcp_server'
 # example
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_socks
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick An
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -51,7 +51,10 @@ files:
 - lib/r_socks/config.rb
 - lib/r_socks/connection_handler.rb
 - lib/r_socks/errors.rb
+- lib/r_socks/http_proxy_parser.rb
+- lib/r_socks/http_proxy_response_codes.rb
 - lib/r_socks/socks5_bit_codes.rb
+- lib/r_socks/socks5_proxy_parser.rb
 - lib/r_socks/state_machine.rb
 - lib/r_socks/target_connection_handler.rb
 - lib/r_socks/tcp_server.rb