fsevents 1.0.15 → 1.1.1

package/node_modules/sshpk/lib/identity.js

@@ -0,0 +1,277 @@
+// Copyright 2016 Joyent, Inc.
+
+module.exports = Identity;
+
+var assert = require('assert-plus');
+var algs = require('./algs');
+var crypto = require('crypto');
+var Fingerprint = require('./fingerprint');
+var Signature = require('./signature');
+var errs = require('./errors');
+var util = require('util');
+var utils = require('./utils');
+var asn1 = require('asn1');
+
+/*JSSTYLED*/
+var DNS_NAME_RE = /^([*]|[a-z0-9][a-z0-9\-]{0,62})(?:\.([*]|[a-z0-9][a-z0-9\-]{0,62}))*$/i;
+
+var oids = {};
+oids.cn = '2.5.4.3';
+oids.o = '2.5.4.10';
+oids.ou = '2.5.4.11';
+oids.l = '2.5.4.7';
+oids.s = '2.5.4.8';
+oids.c = '2.5.4.6';
+oids.sn = '2.5.4.4';
+oids.dc = '0.9.2342.19200300.100.1.25';
+oids.uid = '0.9.2342.19200300.100.1.1';
+oids.mail = '0.9.2342.19200300.100.1.3';
+
+var unoids = {};
+Object.keys(oids).forEach(function (k) {
+	unoids[oids[k]] = k;
+});
+
+function Identity(opts) {
+	var self = this;
+	assert.object(opts, 'options');
+	assert.arrayOfObject(opts.components, 'options.components');
+	this.components = opts.components;
+	this.componentLookup = {};
+	this.components.forEach(function (c) {
+		if (c.name && !c.oid)
+			c.oid = oids[c.name];
+		if (c.oid && !c.name)
+			c.name = unoids[c.oid];
+		if (self.componentLookup[c.name] === undefined)
+			self.componentLookup[c.name] = [];
+		self.componentLookup[c.name].push(c);
+	});
+	if (this.componentLookup.cn && this.componentLookup.cn.length > 0) {
+		this.cn = this.componentLookup.cn[0].value;
+	}
+	assert.optionalString(opts.type, 'options.type');
+	if (opts.type === undefined) {
+		if (this.components.length === 1 &&
+		    this.componentLookup.cn &&
+		    this.componentLookup.cn.length === 1 &&
+		    this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
+			this.type = 'host';
+			this.hostname = this.componentLookup.cn[0].value;
+
+		} else if (this.componentLookup.dc &&
+		    this.components.length === this.componentLookup.dc.length) {
+			this.type = 'host';
+			this.hostname = this.componentLookup.dc.map(
+			    function (c) {
+				return (c.value);
+			}).join('.');
+
+		} else if (this.componentLookup.uid &&
+		    this.components.length ===
+		    this.componentLookup.uid.length) {
+			this.type = 'user';
+			this.uid = this.componentLookup.uid[0].value;
+
+		} else if (this.componentLookup.cn &&
+		    this.componentLookup.cn.length === 1 &&
+		    this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
+			this.type = 'host';
+			this.hostname = this.componentLookup.cn[0].value;
+
+		} else if (this.componentLookup.uid &&
+		    this.componentLookup.uid.length === 1) {
+			this.type = 'user';
+			this.uid = this.componentLookup.uid[0].value;
+
+		} else if (this.componentLookup.mail &&
+		    this.componentLookup.mail.length === 1) {
+			this.type = 'email';
+			this.email = this.componentLookup.mail[0].value;
+
+		} else if (this.componentLookup.cn &&
+		    this.componentLookup.cn.length === 1) {
+			this.type = 'user';
+			this.uid = this.componentLookup.cn[0].value;
+
+		} else {
+			this.type = 'unknown';
+		}
+	} else {
+		this.type = opts.type;
+		if (this.type === 'host')
+			this.hostname = opts.hostname;
+		else if (this.type === 'user')
+			this.uid = opts.uid;
+		else if (this.type === 'email')
+			this.email = opts.email;
+		else
+			throw (new Error('Unknown type ' + this.type));
+	}
+}
+
+Identity.prototype.toString = function () {
+	return (this.components.map(function (c) {
+		return (c.name.toUpperCase() + '=' + c.value);
+	}).join(', '));
+};
+
+/*
+ * These are from X.680 -- PrintableString allowed chars are in section 37.4
+ * table 8. Spec for IA5Strings is "1,6 + SPACE + DEL" where 1 refers to
+ * ISO IR #001 (standard ASCII control characters) and 6 refers to ISO IR #006
+ * (the basic ASCII character set).
+ */
+/* JSSTYLED */
+var NOT_PRINTABLE = /[^a-zA-Z0-9 '(),+.\/:=?-]/;
+/* JSSTYLED */
+var NOT_IA5 = /[^\x00-\x7f]/;
+
+Identity.prototype.toAsn1 = function (der, tag) {
+	der.startSequence(tag);
+	this.components.forEach(function (c) {
+		der.startSequence(asn1.Ber.Constructor | asn1.Ber.Set);
+		der.startSequence();
+		der.writeOID(c.oid);
+		/*
+		 * If we fit in a PrintableString, use that. Otherwise use an
+		 * IA5String or UTF8String.
+		 */
+		if (c.value.match(NOT_IA5)) {
+			var v = new Buffer(c.value, 'utf8');
+			der.writeBuffer(v, asn1.Ber.Utf8String);
+		} else if (c.value.match(NOT_PRINTABLE)) {
+			der.writeString(c.value, asn1.Ber.IA5String);
+		} else {
+			der.writeString(c.value, asn1.Ber.PrintableString);
+		}
+		der.endSequence();
+		der.endSequence();
+	});
+	der.endSequence();
+};
+
+function globMatch(a, b) {
+	if (a === '**' || b === '**')
+		return (true);
+	var aParts = a.split('.');
+	var bParts = b.split('.');
+	if (aParts.length !== bParts.length)
+		return (false);
+	for (var i = 0; i < aParts.length; ++i) {
+		if (aParts[i] === '*' || bParts[i] === '*')
+			continue;
+		if (aParts[i] !== bParts[i])
+			return (false);
+	}
+	return (true);
+}
+
+Identity.prototype.equals = function (other) {
+	if (!Identity.isIdentity(other, [1, 0]))
+		return (false);
+	if (other.components.length !== this.components.length)
+		return (false);
+	for (var i = 0; i < this.components.length; ++i) {
+		if (this.components[i].oid !== other.components[i].oid)
+			return (false);
+		if (!globMatch(this.components[i].value,
+		    other.components[i].value)) {
+			return (false);
+		}
+	}
+	return (true);
+};
+
+Identity.forHost = function (hostname) {
+	assert.string(hostname, 'hostname');
+	return (new Identity({
+		type: 'host',
+		hostname: hostname,
+		components: [ { name: 'cn', value: hostname } ]
+	}));
+};
+
+Identity.forUser = function (uid) {
+	assert.string(uid, 'uid');
+	return (new Identity({
+		type: 'user',
+		uid: uid,
+		components: [ { name: 'uid', value: uid } ]
+	}));
+};
+
+Identity.forEmail = function (email) {
+	assert.string(email, 'email');
+	return (new Identity({
+		type: 'email',
+		email: email,
+		components: [ { name: 'mail', value: email } ]
+	}));
+};
+
+Identity.parseDN = function (dn) {
+	assert.string(dn, 'dn');
+	var parts = dn.split(',');
+	var cmps = parts.map(function (c) {
+		c = c.trim();
+		var eqPos = c.indexOf('=');
+		var name = c.slice(0, eqPos).toLowerCase();
+		var value = c.slice(eqPos + 1);
+		return ({ name: name, value: value });
+	});
+	return (new Identity({ components: cmps }));
+};
+
+Identity.parseAsn1 = function (der, top) {
+	var components = [];
+	der.readSequence(top);
+	var end = der.offset + der.length;
+	while (der.offset < end) {
+		der.readSequence(asn1.Ber.Constructor | asn1.Ber.Set);
+		var after = der.offset + der.length;
+		der.readSequence();
+		var oid = der.readOID();
+		var type = der.peek();
+		var value;
+		switch (type) {
+		case asn1.Ber.PrintableString:
+		case asn1.Ber.IA5String:
+		case asn1.Ber.OctetString:
+		case asn1.Ber.T61String:
+			value = der.readString(type);
+			break;
+		case asn1.Ber.Utf8String:
+			value = der.readString(type, true);
+			value = value.toString('utf8');
+			break;
+		case asn1.Ber.CharacterString:
+		case asn1.Ber.BMPString:
+			value = der.readString(type, true);
+			value = value.toString('utf16le');
+			break;
+		default:
+			throw (new Error('Unknown asn1 type ' + type));
+		}
+		components.push({ oid: oid, value: value });
+		der._offset = after;
+	}
+	der._offset = end;
+	return (new Identity({
+		components: components
+	}));
+};
+
+Identity.isIdentity = function (obj, ver) {
+	return (utils.isCompatible(obj, Identity, ver));
+};
+
+/*
+ * API versions for Identity:
+ * [1,0] -- initial ver
+ */
+Identity.prototype._sshpkApiVersion = [1, 0];
+
+Identity._oldVersionDetect = function (obj) {
+	return ([1, 0]);
+};

package/node_modules/sshpk/lib/index.js

@@ -4,6 +4,8 @@ var Key = require('./key');
 var Fingerprint = require('./fingerprint');
 var Signature = require('./signature');
 var PrivateKey = require('./private-key');
+var Certificate = require('./certificate');
+var Identity = require('./identity');
 var errs = require('./errors');
 
 module.exports = {
@@ -16,11 +18,21 @@ module.exports = {
 	parseSignature: Signature.parse,
 	PrivateKey: PrivateKey,
 	parsePrivateKey: PrivateKey.parse,
+	Certificate: Certificate,
+	parseCertificate: Certificate.parse,
+	createSelfSignedCertificate: Certificate.createSelfSigned,
+	createCertificate: Certificate.create,
+	Identity: Identity,
+	identityFromDN: Identity.parseDN,
+	identityForHost: Identity.forHost,
+	identityForUser: Identity.forUser,
+	identityForEmail: Identity.forEmail,
 
 	/* errors */
 	FingerprintFormatError: errs.FingerprintFormatError,
 	InvalidAlgorithmError: errs.InvalidAlgorithmError,
 	KeyParseError: errs.KeyParseError,
 	SignatureParseError: errs.SignatureParseError,
-	KeyEncryptedError: errs.KeyEncryptedError
+	KeyEncryptedError: errs.KeyEncryptedError,
+	CertificateParseError: errs.CertificateParseError
 };

package/node_modules/sshpk/lib/key.js

@@ -117,6 +117,7 @@ Key.prototype.fingerprint = function (algo) {
 		algo = 'sha256';
 	assert.string(algo, 'algorithm');
 	var opts = {
+		type: 'key',
 		hash: this.hash(algo),
 		algorithm: algo
 	};

package/node_modules/sshpk/lib/signature.js

@@ -65,23 +65,31 @@ Signature.prototype.toBuffer = function (format) {
 			buf = new SSHBuffer({});
 			buf.writeString('ssh-dss');
 			r = this.part.r.data;
-			if (r[0] === 0x00)
+			if (r.length > 20 && r[0] === 0x00)
 				r = r.slice(1);
 			s = this.part.s.data;
+			if (s.length > 20 && s[0] === 0x00)
+				s = s.slice(1);
+			if ((this.hashAlgorithm &&
+			    this.hashAlgorithm !== 'sha1') ||
+			    r.length + s.length !== 40) {
+				throw (new Error('OpenSSH only supports ' +
+				    'DSA signatures with SHA1 hash'));
+			}
 			buf.writeBuffer(Buffer.concat([r, s]));
 			return (buf.toBuffer());
 		} else if (format === 'ssh' && this.type === 'ecdsa') {
 			var inner = new SSHBuffer({});
-			r = this.part.r;
-			if (r[0] === 0x00)
-				r = r.slice(1);
-			inner.writePart(r);
+			r = this.part.r.data;
+			inner.writeBuffer(r);
 			inner.writePart(this.part.s);
 
 			buf = new SSHBuffer({});
 			/* XXX: find a more proper way to do this? */
 			var curve;
-			var sz = this.part.r.data.length * 8;
+			if (r[0] === 0x00)
+				r = r.slice(1);
+			var sz = r.length * 8;
 			if (sz === 256)
 				curve = 'nistp256';
 			else if (sz === 384)

package/node_modules/sshpk/lib/ssh-buffer.js

@@ -73,6 +73,14 @@ SSHBuffer.prototype.readInt = function () {
 	return (v);
 };
 
+SSHBuffer.prototype.readInt64 = function () {
+	assert.ok(this._offset + 8 < this._buffer.length,
+	    'buffer not long enough to read Int64');
+	var v = this._buffer.slice(this._offset, this._offset + 8);
+	this._offset += 8;
+	return (v);
+};
+
 SSHBuffer.prototype.readChar = function () {
 	var v = this._buffer[this._offset++];
 	return (v);
@@ -106,6 +114,22 @@ SSHBuffer.prototype.writeInt = function (v) {
 	this._offset += 4;
 };
 
+SSHBuffer.prototype.writeInt64 = function (v) {
+	assert.buffer(v, 'value');
+	if (v.length > 8) {
+		var lead = v.slice(0, v.length - 8);
+		for (var i = 0; i < lead.length; ++i) {
+			assert.strictEqual(lead[i], 0,
+			    'must fit in 64 bits of precision');
+		}
+		v = v.slice(v.length - 8, v.length);
+	}
+	while (this._offset + 8 > this._size)
+		this.expand();
+	v.copy(this._buffer, this._offset);
+	this._offset += 8;
+};
+
 SSHBuffer.prototype.writeChar = function (v) {
 	while (this._offset + 1 > this._size)
 		this.expand();

package/node_modules/sshpk/lib/utils.js

@@ -9,7 +9,8 @@ module.exports = {
 	countZeros: countZeros,
 	assertCompatible: assertCompatible,
 	isCompatible: isCompatible,
-	opensslKeyDeriv: opensslKeyDeriv
+	opensslKeyDeriv: opensslKeyDeriv,
+	opensshCipherInfo: opensshCipherInfo
 };
 
 var assert = require('assert-plus');
@@ -244,3 +245,44 @@ function addRSAMissing(key) {
 		key.parts.push(key.part.dmodq);
 	}
 }
+
+function opensshCipherInfo(cipher) {
+	var inf = {};
+	switch (cipher) {
+	case '3des-cbc':
+		inf.keySize = 24;
+		inf.blockSize = 8;
+		inf.opensslName = 'des-ede3-cbc';
+		break;
+	case 'blowfish-cbc':
+		inf.keySize = 16;
+		inf.blockSize = 8;
+		inf.opensslName = 'bf-cbc';
+		break;
+	case 'aes128-cbc':
+	case 'aes128-ctr':
+	case 'aes128-gcm@openssh.com':
+		inf.keySize = 16;
+		inf.blockSize = 16;
+		inf.opensslName = 'aes-128-' + cipher.slice(7, 10);
+		break;
+	case 'aes192-cbc':
+	case 'aes192-ctr':
+	case 'aes192-gcm@openssh.com':
+		inf.keySize = 24;
+		inf.blockSize = 16;
+		inf.opensslName = 'aes-192-' + cipher.slice(7, 10);
+		break;
+	case 'aes256-cbc':
+	case 'aes256-ctr':
+	case 'aes256-gcm@openssh.com':
+		inf.keySize = 32;
+		inf.blockSize = 16;
+		inf.opensslName = 'aes-256-' + cipher.slice(7, 10);
+		break;
+	default:
+		throw (new Error(
+		    'Unsupported openssl cipher "' + cipher + '"'));
+	}
+	return (inf);
+}

package/node_modules/sshpk/node_modules/assert-plus/package.json

@@ -1,27 +1,35 @@
 {
   "_args": [
     [
-      "assert-plus@^1.0.0",
+      {
+        "raw": "assert-plus@^1.0.0",
+        "scope": null,
+        "escapedName": "assert-plus",
+        "name": "assert-plus",
+        "rawSpec": "^1.0.0",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
       "/Users/eshanker/Code/fsevents/node_modules/sshpk"
     ]
   ],
   "_from": "assert-plus@>=1.0.0 <2.0.0",
   "_id": "assert-plus@1.0.0",
   "_inCache": true,
-  "_installable": true,
   "_location": "/sshpk/assert-plus",
   "_nodeVersion": "0.10.40",
   "_npmUser": {
-    "email": "patrick.f.mooney@gmail.com",
-    "name": "pfmooney"
+    "name": "pfmooney",
+    "email": "patrick.f.mooney@gmail.com"
   },
   "_npmVersion": "3.3.9",
   "_phantomChildren": {},
   "_requested": {
-    "name": "assert-plus",
     "raw": "assert-plus@^1.0.0",
-    "rawSpec": "^1.0.0",
     "scope": null,
+    "escapedName": "assert-plus",
+    "name": "assert-plus",
+    "rawSpec": "^1.0.0",
     "spec": ">=1.0.0 <2.0.0",
     "type": "range"
   },
@@ -34,8 +42,8 @@
   "_spec": "assert-plus@^1.0.0",
   "_where": "/Users/eshanker/Code/fsevents/node_modules/sshpk",
   "author": {
-    "email": "mcavage@gmail.com",
-    "name": "Mark Cavage"
+    "name": "Mark Cavage",
+    "email": "mcavage@gmail.com"
   },
   "bugs": {
     "url": "https://github.com/mcavage/node-assert-plus/issues"

package/node_modules/sshpk/package.json

@@ -1,39 +1,47 @@
 {
   "_args": [
     [
-      "sshpk@^1.7.0",
+      {
+        "raw": "sshpk@^1.7.0",
+        "scope": null,
+        "escapedName": "sshpk",
+        "name": "sshpk",
+        "rawSpec": "^1.7.0",
+        "spec": ">=1.7.0 <2.0.0",
+        "type": "range"
+      },
       "/Users/eshanker/Code/fsevents/node_modules/http-signature"
     ]
   ],
   "_from": "sshpk@>=1.7.0 <2.0.0",
-  "_id": "sshpk@1.8.3",
+  "_id": "sshpk@1.10.2",
   "_inCache": true,
-  "_installable": true,
   "_location": "/sshpk",
-  "_nodeVersion": "0.12.13",
+  "_nodeVersion": "0.12.15",
   "_npmOperationalInternal": {
-    "host": "packages-16-east.internal.npmjs.com",
-    "tmp": "tmp/sshpk-1.8.3.tgz_1461968607532_0.32797130732797086"
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/sshpk-1.10.2.tgz_1484356342573_0.6690851037856191"
   },
   "_npmUser": {
-    "email": "alex@cooperi.net",
-    "name": "arekinath"
+    "name": "arekinath",
+    "email": "alex@cooperi.net"
   },
-  "_npmVersion": "2.15.1",
+  "_npmVersion": "3.10.10",
   "_phantomChildren": {},
   "_requested": {
-    "name": "sshpk",
     "raw": "sshpk@^1.7.0",
-    "rawSpec": "^1.7.0",
     "scope": null,
+    "escapedName": "sshpk",
+    "name": "sshpk",
+    "rawSpec": "^1.7.0",
     "spec": ">=1.7.0 <2.0.0",
     "type": "range"
   },
   "_requiredBy": [
     "/http-signature"
   ],
-  "_resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
-  "_shasum": "890cc9d614dc5292e5cb1a543b03c9abaa5c374e",
+  "_resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz",
+  "_shasum": "d5a804ce22695515638e798dbe23273de070a5fa",
   "_shrinkwrap": null,
   "_spec": "sshpk@^1.7.0",
   "_where": "/Users/eshanker/Code/fsevents/node_modules/http-signature",
@@ -65,12 +73,13 @@
   "dependencies": {
     "asn1": "~0.2.3",
     "assert-plus": "^1.0.0",
+    "bcrypt-pbkdf": "^1.0.0",
     "dashdash": "^1.12.0",
     "ecc-jsbn": "~0.1.1",
     "getpass": "^0.1.1",
     "jodid25519": "^1.0.0",
     "jsbn": "~0.1.0",
-    "tweetnacl": "~0.13.0"
+    "tweetnacl": "~0.14.0"
   },
   "description": "A library for finding and using SSH public keys",
   "devDependencies": {
@@ -85,13 +94,13 @@
     "man": "./man/man1"
   },
   "dist": {
-    "shasum": "890cc9d614dc5292e5cb1a543b03c9abaa5c374e",
-    "tarball": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz"
+    "shasum": "d5a804ce22695515638e798dbe23273de070a5fa",
+    "tarball": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"
   },
   "engines": {
     "node": ">=0.10.0"
   },
-  "gitHead": "82d39066b2df4e8284350ff5ebb08c5b95c74652",
+  "gitHead": "3ae535658f83e610c0dd5bb97a1b2105db7220c7",
   "homepage": "https://github.com/arekinath/node-sshpk#readme",
   "license": "MIT",
   "main": "lib/index.js",
@@ -102,16 +111,17 @@
     }
   ],
   "man": [
-    "/Users/alex.wilson/dev/sshpk/man/man1/sshpk-conv.1",
-    "/Users/alex.wilson/dev/sshpk/man/man1/sshpk-sign.1",
-    "/Users/alex.wilson/dev/sshpk/man/man1/sshpk-verify.1"
+    "/Users/alex.wilson/dev/node-sshpk/man/man1/sshpk-conv.1",
+    "/Users/alex.wilson/dev/node-sshpk/man/man1/sshpk-sign.1",
+    "/Users/alex.wilson/dev/node-sshpk/man/man1/sshpk-verify.1"
   ],
   "name": "sshpk",
   "optionalDependencies": {
+    "bcrypt-pbkdf": "^1.0.0",
     "ecc-jsbn": "~0.1.1",
     "jodid25519": "^1.0.0",
     "jsbn": "~0.1.0",
-    "tweetnacl": "~0.13.0"
+    "tweetnacl": "~0.14.0"
   },
   "readme": "ERROR: No README data found!",
   "repository": {
@@ -121,5 +131,5 @@
   "scripts": {
     "test": "tape test/*.js"
   },
-  "version": "1.8.3"
+  "version": "1.10.2"
 }

package/node_modules/string-width/index.js

@@ -16,6 +16,11 @@ module.exports = function (str) {
 	for (var i = 0; i < str.length; i++) {
 		var code = codePointAt(str, i);
 
+		// ignore control characters
+		if (code <= 0x1f || (code >= 0x7f && code <= 0x9f)) {
+			continue;
+		}
+
 		// surrogates
 		if (code >= 0x10000) {
 			i++;