r_socks 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eedc173179a56ad67727bdecfe8624e116d460d51929ab39087a37fc3261813e
-  data.tar.gz: efc729c5cf92ede55d578d8d6d37228175e3db6940a22b6c79c3cb63873b7073
+  metadata.gz: f41d6fb140bb7ae00bcf456e514764dcfbc3fe6d35ea829697b223552a7ec400
+  data.tar.gz: 240c58c0258d93a55dc5ec625ae7a56c0cc823a956c991ce757d4c7e6a9a1ee6
 SHA512:
-  metadata.gz: 56496f12b33b1ba403015b26e1e9d5c6867031093fe4bfcccd5f42666e83a216d22f8b70cdf80c6891efe53fda1d0625f075e58b2aafb0d4eb2a44219a009b1c
-  data.tar.gz: 26565fd6aa0566cb97ca3cea88928683816d9e2232ee870a105e1cf6b6781cb3e3ff5a9222d566a11562a3984adde3535a52eadbef4b18dc02f6932e5201b6ab
+  metadata.gz: cebd665f25d59e3cd88d277e55916b7ffe4cd999a89f52c406d0588486a67ba999289dab5b7f441b8ada63426af4e19714e9c09cbb789b96092e5ab617567073
+  data.tar.gz: 4c80ef76836e1b3a776c465116d152dd79ee66d4eed65d630170fbfdd4d407e13c294f81fb0689a3648c5790a87c08dc3a5c9afcdabd1f73e3c5740bf82ffe49

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    r_socks (0.1.0)
+    r_socks (0.1.2)
+      eventmachine (~> 1.2, >= 1.2.7)
 
 GEM
   remote: https://rubygems.org/

data/lib/r_socks/connection_handler.rb

@@ -23,40 +23,48 @@ module RSocks
 
     def post_init
       @port, @ip = Socket.unpack_sockaddr_in(get_peername)
-      puts "new #{@ip}:#{@port} connected."
     end
     # sample \x05\x01\x00\x03\ngoogle.com\x00P
 
     def receive_data(data)
-      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 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
+
+          send_data(RSocks::FAILED_RESPONSE)
           return
         end
 
-        send_data(RSocks::FAILED_RESPONSE)
-        return
-      end
+        if @state_machine.connect?
+          connect_request(data)
+          @target = EventMachine.attach(@current_socket, RSocks::TargetConnectionHandler)
+          @target.source_io = self
+          return
+        end
 
-      if @state_machine.connect?
-        connect_request(data)
-        @target = EventMachine.attach(@current_socket, RSocks::TargetConnectionHandler)
-        @target.source_io = self
-        return
-      end
+        return send_data(not_accept) unless @state_machine.start?
+        @target.send_data(data)
 
-      return send_data(not_accept) unless @state_machine.start?
-      @target.send_data(data)
+      rescue => error
+        put "Error at #{@ip}:#{@port}, message: #{data}, error: #{error.message}"
+        puts error.backtrace
+      end
     end
 
     def unbind
-      puts "#{@ip}:#{@port} had disconnected."
       if @current_socket && !@current_socket.closed?
         @current_socket.close
       end

data/lib/r_socks/version.rb

@@ -1,3 +1,3 @@
 module RSocks
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/r_socks.gemspec

@@ -5,6 +5,7 @@ Gem::Specification.new do |spec|
   spec.version       = RSocks::VERSION
   spec.authors       = ["Nick An"]
   spec.email         = ["anning0322@gmail.com"]
+  spec.licenses      = ['Apache-2.0']
 
   spec.summary       = %q{socks5 proxy server}
   spec.description   = %q{ruby proxy socks5 shadowsocks}
@@ -24,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency 'eventmachine', '~> 1.2', '>= 1.2.7'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: r_socks
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick An
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
-dependencies: []
+date: 2020-03-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.7
 description: ruby proxy socks5 shadowsocks
 email:
 - anning0322@gmail.com
@@ -38,7 +58,8 @@ files:
 - lib/r_socks/version.rb
 - r_socks.gemspec
 homepage: https://github.com/nickoan/r_socks
-licenses: []
+licenses:
+- Apache-2.0
 metadata:
   homepage_uri: https://github.com/nickoan/r_socks
   source_code_uri: https://github.com/nickoan/r_socks