r_socks 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e3ebfd9f09c01afeafb934e7f8896bc1995222836d781b4970e95faf99e6b4
-  data.tar.gz: 2854a33a484d8a958f27bdb5194c4fe6e30de11b24d86bf5eede79f02e22ab80
+  metadata.gz: 2499018b47dd3233d537be32107df8e398150a21b4b3aef5eca8a960123b52a7
+  data.tar.gz: f0c479c2e0de2be8e1bc1851b9755225a35d4eb36a9344aa7f946ebe8576e5d7
 SHA512:
-  metadata.gz: 2c9674f0ab2988329a3bfdd461e39eac4cb3ccc2102f504a7a75d68ecc92abc5a3b24cf3c615aa98c7043245f265b31acc73681463cf6001e755816fbae4f20f
-  data.tar.gz: 37fbcfc1d17518bec910cb485f4b4fa2cb78e263ef46044fb5129ca01d3a89e5c6124eb6a4882d3d28ec2445380665c88293f76fddd47f0dba76e267ae07e8e3
+  metadata.gz: 025e9d38508b50bc500fc2484874c4f70610365932d9f974609d5f4d2bc0c626a9588296373cbc2fcb18fffab96536b8b2f20cddf061da890d3f43ad6c2a0bc5
+  data.tar.gz: cd82808668a124bd4d601cd31f2f85a45c08b7212c27fa020627cadbe968710084ac23f823ff2b06cdb81c18d64e50e64ffbe6755578e6c91ac70661905e8f83

data/Gemfile.lock

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

data/lib/r_socks/authenticator.rb

@@ -2,6 +2,8 @@ module RSocks
 
   class Authenticator
 
+    attr_reader :username, :password
+
     def initialize(adaptor = nil)
       @default_user = ENV['RSOCKS_USER'] || 'default'
       @default_password = ENV['RSOCKS_PASSWORD'] || 'default'
@@ -16,13 +18,13 @@ module RSocks
     private
 
     def validate(data)
-      username, remain = get_username(data)
-      password = get_password(remain)
+      @username, remain = get_username(data)
+      @password = get_password(remain)
 
       if @adaptor.nil?
-        username == @default_user && password == @default_password
+        @username == @default_user && @password == @default_password
       else
-        @adaptor.call(username, password)
+        @adaptor.call(@username, @password)
       end
     end
 

data/lib/r_socks/connection_handler.rb

@@ -53,8 +53,11 @@ module RSocks
 
         return unless @state_machine.start?
 
+        @username = @parser.username
+        @password = @parser.password
         if @target.nil?
           @target = EventMachine.connect(@addr, @port, RSocks::TargetConnectionHandler, self, @config)
+          @target.assign_user_and_password(@username, @password)
         end
       rescue => error
         puts "Error at #{@ip}:#{@port}, message: #{data}, error: #{error.message}"
@@ -68,7 +71,7 @@ module RSocks
       @target.close_connection_after_writing if @target
 
       if @config.unbind_handler
-        @config.unbind_handler.call(get_proxied_bytes)
+        @config.unbind_handler.call(get_proxied_bytes, @username, @password)
       end
     end
 

data/lib/r_socks/http_proxy_parser.rb

@@ -3,6 +3,8 @@ require 'base64'
 module RSocks
   class HttpProxyParser
 
+    attr_reader :username, :password
+
     def initialize(state_machine, config)
       @state_machine = state_machine
       @auth_method = config.auth_method
@@ -36,15 +38,15 @@ module RSocks
       token = temp.gsub(pattern, '')
       begin
         str = Base64.decode64(token)
-        @user, @password = str.split(':')
+        @username, @password = str.split(':')
       rescue
         raise RSocks::HttpNotSupport, "token parse failed #{token}"
       end
 
       if @adaptor
-        return @adaptor.call(@user, @password)
+        return @adaptor.call(@username, @password)
       else
-        return @password == @default_password && @user == @default_user
+        return @password == @default_password && @username == @default_user
       end
     end
 

data/lib/r_socks/socks5_proxy_parser.rb

@@ -8,6 +8,9 @@ require 'r_socks/socks5_proxy_parser'
 
 module RSocks
   class Socks5ProxyParser
+
+    attr_reader :username, :password
+
     def initialize(state_machine, config, client)
       @state_machine = state_machine
       @auth_method = config.auth_method
@@ -42,6 +45,8 @@ module RSocks
 
       if @state_machine.connect?
         connect_request(data)
+        @username = @authenticator.username
+        @password = @authenticator.password
         return [@addr, @port]
       end
 

data/lib/r_socks/target_connection_handler.rb

@@ -9,6 +9,11 @@ module RSocks
       @config = config
     end
 
+    def assign_user_and_password(username, password)
+      @username = username
+      @password = password
+    end
+
     def connection_completed
       if @config.proxy_type == :http
         @client.send_data(RSocks::HttpProxyResponseCodes::SUCCESS)
@@ -28,7 +33,7 @@ module RSocks
     def unbind
       @client.close_connection_after_writing
       if @config.unbind_handler
-        @config.unbind_handler.call(get_proxied_bytes)
+        @config.unbind_handler.call(get_proxied_bytes, @username, @password)
       end
     end
   end

data/lib/r_socks/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r_socks
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Nick An