r_socks 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2499018b47dd3233d537be32107df8e398150a21b4b3aef5eca8a960123b52a7
-  data.tar.gz: f0c479c2e0de2be8e1bc1851b9755225a35d4eb36a9344aa7f946ebe8576e5d7
+  metadata.gz: f9f3daabf6b654e432702a1f8ec25cb8a31360cbd199badd407d3f8b0beb4a75
+  data.tar.gz: 20a333f1b28ffd89094362e27b7dccd4c0b7053bd8f5e83154fd29c2485a11ab
 SHA512:
-  metadata.gz: 025e9d38508b50bc500fc2484874c4f70610365932d9f974609d5f4d2bc0c626a9588296373cbc2fcb18fffab96536b8b2f20cddf061da890d3f43ad6c2a0bc5
-  data.tar.gz: cd82808668a124bd4d601cd31f2f85a45c08b7212c27fa020627cadbe968710084ac23f823ff2b06cdb81c18d64e50e64ffbe6755578e6c91ac70661905e8f83
+  metadata.gz: 9cbb6b31615e0448dab30fb0eb6a6b39485415d091d8f559b01d4a60a1982496c998c45b0870971ee002b3ac4d9e0eba078b5efce546baa5909170600b525624
+  data.tar.gz: 991c43cbb67f8f52c2ffce971bfd0e7cecdaad8a02565e0489494ac6893036e2464e5404053887f8b5cbaeca840927c698a1a41b9023afc34f41698d9c1d3fbc

data/Gemfile.lock

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

data/lib/r_socks/config.rb

@@ -94,5 +94,29 @@ module RSocks
     def unbind_handler
       @store[:unbind_handler]
     end
+
+    def forward_server?
+      @store[:forward_server] || false
+    end
+
+    def forward_server=(value)
+      @store[:forward_server] = value
+    end
+
+    def forward_port
+      @store[:forward_port]
+    end
+
+    def forward_addr
+      @store[:forward_addr]
+    end
+
+    def forward_port=(value)
+      @store[:forward_port] = value.to_i
+    end
+
+    def forward_addr=(value)
+      @store[:forward_addr] = value.to_s
+    end
   end
 end

data/lib/r_socks/connection_handler.rb

@@ -53,6 +53,16 @@ module RSocks
 
         return unless @state_machine.start?
 
+        if @config.forward_server? && @config.proxy_type == :http
+          @target = EventMachine.connect(@config.forward_addr,
+                                         @config.forward_port,
+                                         RSocks::TargetConnectionHandler,
+                                         self,
+                                         @config,
+                                         data)
+          @target.assign_user_and_password(@username, @password)
+        end
+
         @username = @parser.username
         @password = @parser.password
         if @target.nil?
@@ -81,6 +91,11 @@ module RSocks
 
     private
 
+    def forward_request
+      @port = @config.forward_port
+      @addr = @config.forward_addr
+    end
+
     def create_proxy_parser
       if @config.proxy_type == :http
         return RSocks::HttpProxyParser.new(@state_machine, @config)

data/lib/r_socks/target_connection_handler.rb

@@ -4,9 +4,12 @@ require 'r_socks/http_proxy_response_codes'
 module RSocks
   class TargetConnectionHandler < EM::Connection
 
-    def initialize(client, config)
+    def initialize(client, config, connect_data = nil)
       @client = client
       @config = config
+      @connect_data = connect_data
+      @forward_connection = !@connect_data.nil?
+      @forward_success = false
     end
 
     def assign_user_and_password(username, password)
@@ -15,15 +18,20 @@ module RSocks
     end
 
     def connection_completed
-      if @config.proxy_type == :http
-        @client.send_data(RSocks::HttpProxyResponseCodes::SUCCESS)
+      if @connect_data
+        send_data(@connect_data)
+      else
+        response_proxy_connect_ready
       end
-      @client.proxy_incoming_to(self, @config.proxy_buffer_size)
-      proxy_incoming_to(@client, @config.proxy_buffer_size)
     end
 
     def receive_data(data)
-      @client.send_data(data)
+      if @forward_connection && !@forward_success
+        if data == RSocks::HttpProxyResponseCodes::SUCCESS
+          @forward_success = true
+          response_proxy_connect_ready
+        end
+      end
     end
 
     def proxy_target_unbound
@@ -36,5 +44,15 @@ module RSocks
         @config.unbind_handler.call(get_proxied_bytes, @username, @password)
       end
     end
+
+    private
+
+    def response_proxy_connect_ready
+      if @config.proxy_type == :http
+        @client.send_data(RSocks::HttpProxyResponseCodes::SUCCESS)
+      end
+      @client.proxy_incoming_to(self, @config.proxy_buffer_size)
+      proxy_incoming_to(@client, @config.proxy_buffer_size)
+    end
   end
 end

data/lib/r_socks/version.rb

@@ -1,3 +1,3 @@
 module RSocks
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/r_socks.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.licenses      = ['Apache-2.0']
 
   spec.summary       = %q{socks5 proxy server}
-  spec.description   = %q{ruby proxy socks5 shadowsocks}
+  spec.description   = %q{ruby socks5 and http proxy}
   spec.homepage      = "https://github.com/nickoan/r_socks"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_socks
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Nick An
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -30,7 +30,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.7
-description: ruby proxy socks5 shadowsocks
+description: ruby socks5 and http proxy
 email:
 - anning0322@gmail.com
 executables: []