@electerm/ssh2 0.8.11 → 1.5.0

package/lib/http-agents.js

@@ -1,63 +1,84 @@
-var HttpAgent = require('http').Agent;
-var HttpsAgent = require('https').Agent;
-var inherits = require('util').inherits;
+'use strict';
 
-var Client;
+const { Agent: HttpAgent } = require('http');
+const { Agent: HttpsAgent } = require('https');
+const { connect: tlsConnect } = require('tls');
 
-[HttpAgent, HttpsAgent].forEach((ctor) => {
-  function SSHAgent(connectCfg, agentOptions) {
-    if (!(this instanceof SSHAgent))
-      return new SSHAgent(connectCfg, agentOptions);
+let Client;
 
-    ctor.call(this, agentOptions);
+for (const ctor of [HttpAgent, HttpsAgent]) {
+  class SSHAgent extends ctor {
+    constructor(connectCfg, agentOptions) {
+      super(agentOptions);
 
-    this._connectCfg = connectCfg;
-    this._defaultSrcIP = (agentOptions && agentOptions.srcIP) || 'localhost';
-  }
-  inherits(SSHAgent, ctor);
+      this._connectCfg = connectCfg;
+      this._defaultSrcIP = (agentOptions && agentOptions.srcIP) || 'localhost';
+    }
+
+    createConnection(options, cb) {
+      const srcIP = (options && options.localAddress) || this._defaultSrcIP;
+      const srcPort = (options && options.localPort) || 0;
+      const dstIP = options.host;
+      const dstPort = options.port;
 
-  SSHAgent.prototype.createConnection = createConnection;
+      if (Client === undefined)
+        Client = require('./client.js');
+
+      const client = new Client();
+      let triedForward = false;
+      client.on('ready', () => {
+        client.forwardOut(srcIP, srcPort, dstIP, dstPort, (err, stream) => {
+          triedForward = true;
+          if (err) {
+            client.end();
+            return cb(err);
+          }
+          stream.once('close', () => client.end());
+          cb(null, decorateStream(stream, ctor, options));
+        });
+      }).on('error', cb).on('close', () => {
+        if (!triedForward)
+          cb(new Error('Unexpected connection close'));
+      }).connect(this._connectCfg);
+    }
+  }
 
   exports[ctor === HttpAgent ? 'SSHTTPAgent' : 'SSHTTPSAgent'] = SSHAgent;
-});
-
-function createConnection(options, cb) {
-  var srcIP = (options && options.localAddress) || this._defaultSrcIP;
-  var srcPort = (options && options.localPort) || 0;
-  var dstIP = options.host;
-  var dstPort = options.port;
-
-  if (Client === undefined)
-    Client = require('./client').Client;
-
-  var client = new Client();
-  var triedForward = false;
-  client.on('ready', () => {
-    client.forwardOut(srcIP, srcPort, dstIP, dstPort, (err, stream) => {
-      triedForward = true;
-      if (err) {
-        client.end();
-        return cb(err);
-      }
-      stream.once('close', () => {
-        client.end();
-      });
-      cb(null, decorateStream(stream));
-    });
-  }).on('error', cb).on('close', () => {
-    if (!triedForward)
-      cb(new Error('Unexpected connection loss'));
-  }).connect(this._connectCfg);
 }
 
 function noop() {}
 
-function decorateStream(stream) {
-  stream.setKeepAlive = noop;
-  stream.setNoDelay = noop;
-  stream.setTimeout = noop;
-  stream.ref = noop;
-  stream.unref = noop;
-  stream.destroySoon = stream.destroy;
-  return stream;
+function decorateStream(stream, ctor, options) {
+  if (ctor === HttpAgent) {
+    // HTTP
+    stream.setKeepAlive = noop;
+    stream.setNoDelay = noop;
+    stream.setTimeout = noop;
+    stream.ref = noop;
+    stream.unref = noop;
+    stream.destroySoon = stream.destroy;
+    return stream;
+  }
+
+  // HTTPS
+  options.socket = stream;
+  const wrapped = tlsConnect(options);
+
+  // This is a workaround for a regression in node v12.16.3+
+  // https://github.com/nodejs/node/issues/35904
+  const onClose = (() => {
+    let called = false;
+    return () => {
+      if (called)
+        return;
+      called = true;
+      if (stream.isPaused())
+        stream.resume();
+    };
+  })();
+  // 'end' listener is needed because 'close' is not emitted in some scenarios
+  // in node v12.x for some unknown reason
+  wrapped.on('end', onClose).on('close', onClose);
+
+  return wrapped;
 }

package/lib/index.js

@@ -0,0 +1,43 @@
+'use strict';
+
+const {
+  AgentProtocol,
+  BaseAgent,
+  createAgent,
+  CygwinAgent,
+  OpenSSHAgent,
+  PageantAgent,
+} = require('./agent.js');
+const {
+  SSHTTPAgent: HTTPAgent,
+  SSHTTPSAgent: HTTPSAgent,
+} = require('./http-agents.js');
+const { parseKey } = require('./protocol/keyParser.js');
+const {
+  flagsToString,
+  OPEN_MODE,
+  STATUS_CODE,
+  stringToFlags,
+} = require('./protocol/SFTP.js');
+
+module.exports = {
+  AgentProtocol,
+  BaseAgent,
+  createAgent,
+  Client: require('./client.js'),
+  CygwinAgent,
+  HTTPAgent,
+  HTTPSAgent,
+  OpenSSHAgent,
+  PageantAgent,
+  Server: require('./server.js'),
+  utils: {
+    parseKey,
+    sftp: {
+      flagsToString,
+      OPEN_MODE,
+      STATUS_CODE,
+      stringToFlags,
+    },
+  },
+};