proxy_chain_rb 0.1.0 → 0.1.2

data/lib/proxy_chain_rb/server.rb

@@ -1,16 +1,18 @@
 module ProxyChainRb
   class Server
-    attr_accessor :script_path, :instance_id, :command, :pid, :generated_proxy_url
+    attr_accessor :script_path, :instance_id, :pid_command, :pid, :generated_proxy_url
   
     def initialize(instance_id = nil)
       self.script_path          =   File.expand_path("../node_js/proxy-chain-server/server.js", __FILE__)
       self.instance_id          =   instance_id.to_s.empty? ? SecureRandom.hex : instance_id
-      self.command              =   "ps aux | awk '/proxy-chain-instance-id-#{instance_id}/'"
+      self.pid_command          =   "ps aux | grep \"[n]ode\" | awk '/proxy-chain-instance-id-#{self.instance_id}/'"
       self.generated_proxy_url  =   nil
     end
-  
-    def start(proxy_url, wait: 3)
-      IO.popen("((node #{self.script_path} \"#{proxy_url}\" proxy-chain-instance-id-#{instance_id} &)&)") do |io|
+    
+    def start(proxy_url, tag: "default", started_at: Time.now, wait: 3)
+      command                   =   "((node #{self.script_path} \"#{proxy_url}\" proxy-chain-instance-id-#{self.instance_id} tag-#{tag} started-#{started_at.to_i} &)&)"
+      
+      IO.popen(command) do |io|
         self.generated_proxy_url   =   io.gets&.strip
       end
       
@@ -23,7 +25,7 @@ module ProxyChainRb
     end
   
     def identify_pid
-      process                   =   `#{self.command}`.split("\n")&.select { |p| p =~ /proxy-chain-instance-id-#{self.instance_id}$/i }&.first
+      process                   =   `#{self.pid_command}`.split("\n")&.select { |p| p =~ /proxy-chain-instance-id-#{self.instance_id}/i }&.first
       parts                     =   process&.split(' ')
       pid                       =   parts && parts.any? ? parts[1] : nil
       self.pid                  =   !pid.to_s.empty? ? pid.to_i : nil

data/lib/proxy_chain_rb/version.rb

@@ -1,3 +1,3 @@
 module ProxyChainRb
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/proxy_chain_rb.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", ">= 1.17.2"
+  spec.add_development_dependency "rake",    ">= 12.3.2"
+  spec.add_development_dependency "rspec",   ">= 3.0"
   
   spec.add_development_dependency "pry", "~> 0.12.2"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: proxy_chain_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Sebastian Johnsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -86,6 +86,7 @@ files:
 - bin/setup
 - lib/proxy_chain_rb.rb
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/.bin/portastic
+- lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/.yarn-integrity
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/bluebird/LICENSE
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/bluebird/README.md
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/bluebird/changelog.md
@@ -220,13 +221,14 @@ files:
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/handler_forward.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/handler_tunnel_chain.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/handler_tunnel_direct.js
-- lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/handler_tunnel_tcp_chain.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/index.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/run_locally.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/server.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/tcp_tunnel.js
+- lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/tcp_tunnel_tools.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/testing_tcp_service.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/tools.js
+- lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/node_modules/.bin/portastic
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/package.json
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/underscore/LICENSE
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/underscore/README.md
@@ -234,9 +236,9 @@ files:
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/underscore/underscore-min.js
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/underscore/underscore-min.js.map
 - lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/underscore/underscore.js
-- lib/proxy_chain_rb/node_js/proxy-chain-server/package-lock.json
 - lib/proxy_chain_rb/node_js/proxy-chain-server/package.json
 - lib/proxy_chain_rb/node_js/proxy-chain-server/server.js
+- lib/proxy_chain_rb/node_js/proxy-chain-server/yarn.lock
 - lib/proxy_chain_rb/server.rb
 - lib/proxy_chain_rb/version.rb
 - proxy_chain_rb.gemspec

data/lib/proxy_chain_rb/node_js/proxy-chain-server/node_modules/proxy-chain/build/handler_tunnel_tcp_chain.js

@@ -1,271 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _http = require('http');
-
-var _http2 = _interopRequireDefault(_http);
-
-var _tools = require('./tools');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-/* globals Buffer */
-
-// TODO: please rename this class to something else than "Handler", it makes it look like the class inherits from HandlerBase, which it doesn't
-
-/**
- * Represents a connection from source client to an external proxy using HTTP CONNECT tunnel, allows TCP connection.
- */
-var HandlerTunnelTcpChain = function () {
-    function HandlerTunnelTcpChain(_ref) {
-        var srcSocket = _ref.srcSocket,
-            trgParsed = _ref.trgParsed,
-            upstreamProxyUrlParsed = _ref.upstreamProxyUrlParsed,
-            log = _ref.log;
-
-        _classCallCheck(this, HandlerTunnelTcpChain);
-
-        this.log = log;
-
-        // Bind all event handlers to this instance
-        this.bindHandlersToThis(['onSrcSocketClose', 'onSrcSocketEnd', 'onSrcSocketError', 'onTrgSocket', 'onTrgSocketClose', 'onTrgSocketEnd', 'onTrgSocketError', 'onTrgRequestConnect', 'onTrgRequestAbort', 'onTrgRequestError']);
-
-        if (!trgParsed.hostname) throw new Error('The "trgParsed.hostname" option is required');
-        if (!trgParsed.port) throw new Error('The "trgParsed.port" option is required');
-
-        this.trgRequest = null;
-        this.trgSocket = null;
-        this.trgParsed = trgParsed;
-        this.trgParsed.port = this.trgParsed.port || DEFAULT_TARGET_PORT;
-
-        this.srcSocket = srcSocket;
-        this.srcSocket.once('close', this.onSrcSocketClose);
-        this.srcSocket.once('end', this.onSrcSocketEnd);
-        this.srcSocket.once('error', this.onSrcSocketError);
-
-        this.upstreamProxyUrlParsed = upstreamProxyUrlParsed;
-
-        this.isClosed = false;
-    }
-
-    _createClass(HandlerTunnelTcpChain, [{
-        key: 'bindHandlersToThis',
-        value: function bindHandlersToThis(handlerNames) {
-            var _this = this;
-
-            handlerNames.forEach(function (evt) {
-                _this[evt] = _this[evt].bind(_this);
-            });
-        }
-    }, {
-        key: 'run',
-        value: function run() {
-            this.log('Connecting to upstream proxy...');
-
-            var options = {
-                method: 'CONNECT',
-                hostname: this.upstreamProxyUrlParsed.hostname,
-                port: this.upstreamProxyUrlParsed.port,
-                path: this.trgParsed.hostname + ':' + this.trgParsed.port,
-                headers: {}
-            };
-
-            (0, _tools.maybeAddProxyAuthorizationHeader)(this.upstreamProxyUrlParsed, options.headers);
-
-            this.trgRequest = _http2.default.request(options);
-
-            this.trgRequest.once('connect', this.onTrgRequestConnect);
-            this.trgRequest.once('abort', this.onTrgRequestAbort);
-            this.trgRequest.once('error', this.onTrgRequestError);
-            this.trgRequest.on('socket', this.onTrgSocket);
-
-            // Send the data
-            this.trgRequest.end();
-        }
-
-        // If the client closes the connection prematurely,
-        // then immediately destroy the upstream socket, there's nothing we can do with it
-
-    }, {
-        key: 'onSrcSocketClose',
-        value: function onSrcSocketClose() {
-            if (this.isClosed) return;
-            this.log('Source socket closed');
-            this.close();
-        }
-    }, {
-        key: 'onSrcSocketEnd',
-        value: function onSrcSocketEnd() {
-            if (this.isClosed) return;
-            this.log('Source socket ended');
-            this.close();
-        }
-    }, {
-        key: 'onSrcSocketError',
-        value: function onSrcSocketError(err) {
-            if (this.isClosed) return;
-            this.log('Source socket failed: ' + (err.stack || err));
-            this.close();
-        }
-    }, {
-        key: 'onTrgSocket',
-        value: function onTrgSocket(socket) {
-            if (this.isClosed) return;
-
-            this.log('Target socket assigned');
-
-            this.trgSocket = socket;
-
-            socket.once('close', this.onTrgSocketClose);
-            socket.once('end', this.onTrgSocketEnd);
-            socket.once('error', this.onTrgSocketError);
-        }
-
-        // Once target socket closes, we need to give time
-        // to source socket to receive pending data, so we only call end()
-
-    }, {
-        key: 'onTrgSocketClose',
-        value: function onTrgSocketClose() {
-            var _this2 = this;
-
-            if (this.isClosed) return;
-            this.log('Target socket closed');
-            setTimeout(function () {
-                if (_this2.srcSocket) _this2.srcSocket.end();
-            }, 100);
-        }
-    }, {
-        key: 'onTrgSocketEnd',
-        value: function onTrgSocketEnd() {
-            var _this3 = this;
-
-            if (this.isClosed) return;
-            this.log('Target socket ended');
-            setTimeout(function () {
-                if (_this3.srcSocket) _this3.srcSocket.end();
-            }, 100);
-        }
-    }, {
-        key: 'onTrgSocketError',
-        value: function onTrgSocketError(err) {
-            if (this.isClosed) return;
-            this.log('Target socket failed: ' + (err.stack || err));
-            this.fail(err);
-        }
-    }, {
-        key: 'onTrgRequestConnect',
-        value: function onTrgRequestConnect(response) {
-            if (this.isClosed) return;
-            this.log('Connected to upstream proxy');
-
-            if (this.checkUpstreamProxy407(response)) return;
-
-            // Setup bi-directional tunnel
-            this.trgSocket.pipe(this.srcSocket);
-            this.srcSocket.pipe(this.trgSocket);
-
-            this.srcSocket.resume();
-        }
-    }, {
-        key: 'onTrgRequestAbort',
-        value: function onTrgRequestAbort() {
-            if (this.isClosed) return;
-            this.log('Target aborted');
-            this.close();
-        }
-    }, {
-        key: 'onTrgRequestError',
-        value: function onTrgRequestError(err) {
-            if (this.isClosed) return;
-            this.log('Target request failed: ' + (err.stack || err));
-            this.fail(err);
-        }
-
-        /**
-         * Checks whether response from upstream proxy is 407 Proxy Authentication Required
-         * and if so, responds 502 Bad Gateway to client.
-         * @param response
-         * @return {boolean}
-         */
-
-    }, {
-        key: 'checkUpstreamProxy407',
-        value: function checkUpstreamProxy407(response) {
-            if (this.upstreamProxyUrlParsed && response.statusCode === 407) {
-                this.fail('Invalid credentials provided for the upstream proxy.', 502);
-                return true;
-            }
-            return false;
-        }
-    }, {
-        key: 'fail',
-        value: function fail(err, statusCode) {
-            if (this.srcGotResponse) {
-                this.log('Source already received a response, just destroying the socket...');
-                this.close();
-            } else if (statusCode) {
-                // Manual error
-                this.log(err + ', responding with custom status code ' + statusCode + ' to client');
-            } else if (err.code === 'ENOTFOUND' && !this.upstreamProxyUrlParsed) {
-                this.log('Target server not found, sending 404 to client');
-            } else if (err.code === 'ENOTFOUND' && this.upstreamProxyUrlParsed) {
-                this.log('Upstream proxy not found, sending 502 to client');
-            } else if (err.code === 'ECONNREFUSED') {
-                this.log('Upstream proxy refused connection, sending 502 to client');
-            } else if (err.code === 'ETIMEDOUT') {
-                this.log('Connection timed out, sending 502 to client');
-            } else if (err.code === 'ECONNRESET') {
-                this.log('Connection lost, sending 502 to client');
-            } else if (err.code === 'EPIPE') {
-                this.log('Socket closed before write, sending 502 to client');
-            } else {
-                this.log('Unknown error, sending 500 to client');
-            }
-        }
-        /**
-         * Detaches all listeners and destroys all sockets.
-         */
-
-    }, {
-        key: 'close',
-        value: function close() {
-            if (!this.isClosed) {
-                this.log('Closing handler');
-
-                if (this.srcRequest) {
-                    this.srcRequest.destroy();
-                    this.srcRequest = null;
-                }
-
-                if (this.srcSocket) {
-                    this.srcSocket.destroy();
-                    this.srcSocket = null;
-                }
-
-                if (this.trgRequest) {
-                    this.trgRequest.abort();
-                    this.trgRequest = null;
-                }
-
-                if (this.trgSocket) {
-                    this.trgSocket.destroy();
-                    this.trgSocket = null;
-                }
-
-                this.isClosed = true;
-            }
-        }
-    }]);
-
-    return HandlerTunnelTcpChain;
-}();
-
-exports.default = HandlerTunnelTcpChain;

data/lib/proxy_chain_rb/node_js/proxy-chain-server/package-lock.json

@@ -1,63 +0,0 @@
-{
-  "name": "proxy-chain-server",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "bluebird": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
-    },
-    "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "portastic": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/portastic/-/portastic-1.0.1.tgz",
-      "integrity": "sha1-HJgF1D+uj2pAzw28d5QJGi6dDSo=",
-      "requires": {
-        "bluebird": "^2.9.34",
-        "commander": "^2.8.1",
-        "debug": "^2.2.0"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-          "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE="
-        }
-      }
-    },
-    "proxy-chain": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/proxy-chain/-/proxy-chain-0.2.7.tgz",
-      "integrity": "sha512-e0s94WDfooeC3zQkvIJ/Eudiy/AywTQK4K6PMYbZdBE2m/eug54ThgCPdBE4txHvzi0A0gAVbX04Kt4RygTlRQ==",
-      "requires": {
-        "bluebird": "^3.5.1",
-        "portastic": "^1.0.1",
-        "underscore": "^1.9.1"
-      }
-    },
-    "underscore": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
-    }
-  }
-}