Skip to content

Instantly share code, notes, and snippets.

@glasser

glasser/bcrypt.diff

Created December 6, 2016 01:58
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save glasser/98826a5fbf5d63f0f265acf167009bd6 to your computer and use it in GitHub Desktop.
Save glasser/98826a5fbf5d63f0f265acf167009bd6 to your computer and use it in GitHub Desktop.
Download ZIP
bcrypt.diff
Raw
bcrypt.diff
diff -ruN saved/built/bundle/programs/server/config.json unsaved/built/bundle/programs/server/config.json
--- saved/built/bundle/programs/server/config.json 2016-12-05 17:52:51.000000000 -0800
+++ unsaved/built/bundle/programs/server/config.json 2016-12-05 17:51:08.000000000 -0800
@@ -1,6 +1,6 @@
{
"meteorRelease": "METEOR@1.4.2.3",
- "appId": "ykn8om1jt9gmlgdoxdu",
+ "appId": "16imlabn8356hotzre7",
"clientPaths": {
"web.browser": "../web.browser/program.json"
}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/har-validator unsaved/built/bundle/programs/server/npm/node_modules/.bin/har-validator
--- saved/built/bundle/programs/server/npm/node_modules/.bin/har-validator 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/har-validator 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+'use strict'
+
+var chalk = require('chalk')
+var cmd = require('commander')
+var fs = require('fs')
+var path = require('path')
+var pkg = require('../package.json')
+var Promise = require('pinkie-promise')
+var validate = require('..')
+var ValidationError = require('../lib/error')
+
+cmd
+ .version(pkg.version)
+ .usage('[options] <files ...>')
+ .option('-s, --schema [name]', 'validate schema name (log, request, response, etc ...)')
+ .parse(process.argv)
+
+if (!cmd.args.length) {
+ cmd.help()
+}
+
+cmd.args.map(function (fileName) {
+ var file = chalk.yellow.italic(path.basename(fileName))
+
+ new Promise(function (resolve, reject) {
+ fs.readFile(fileName, function (err, data) {
+ return err === null ? resolve(data) : reject(err)
+ })
+ })
+
+ .then(JSON.parse)
+
+ .then(cmd.schema ? validate[cmd.schema] : validate)
+
+ .then(function (data) {
+ console.log('%s [%s] is valid', chalk.green('✓'), file)
+ })
+
+ .catch(function (err) {
+ if (err instanceof SyntaxError) {
+ return console.error('%s [%s] failed to read JSON: %s', chalk.red('✖'), file, chalk.red(err.message))
+ }
+
+ if (err instanceof ValidationError) {
+ err.errors.forEach(function (details) {
+ console.error('%s [%s] failed validation: (%s: %s) %s', chalk.red('✖'), file, chalk.cyan.italic(details.field), chalk.magenta.italic(details.value), chalk.red(details.message))
+ })
+
+ return
+ }
+
+ console.error('%s [%s] an unknown error has occured: %s', chalk.red('✖'), file, chalk.red(err.message))
+ })
+})
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/mkdirp unsaved/built/bundle/programs/server/npm/node_modules/.bin/mkdirp
--- saved/built/bundle/programs/server/npm/node_modules/.bin/mkdirp 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/mkdirp 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+var mkdirp = require('../');
+var minimist = require('minimist');
+var fs = require('fs');
+
+var argv = minimist(process.argv.slice(2), {
+ alias: { m: 'mode', h: 'help' },
+ string: [ 'mode' ]
+});
+if (argv.help) {
+ fs.createReadStream(__dirname + '/usage.txt').pipe(process.stdout);
+ return;
+}
+
+var paths = argv._.slice();
+var mode = argv.mode ? parseInt(argv.mode, 8) : undefined;
+
+(function next () {
+ if (paths.length === 0) return;
+ var p = paths.shift();
+
+ if (mode === undefined) mkdirp(p, cb)
+ else mkdirp(p, mode, cb)
+
+ function cb (err) {
+ if (err) {
+ console.error(err.message);
+ process.exit(1);
+ }
+ else next();
+ }
+})();
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/node-pre-gyp unsaved/built/bundle/programs/server/npm/node_modules/.bin/node-pre-gyp
--- saved/built/bundle/programs/server/npm/node_modules/.bin/node-pre-gyp 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/node-pre-gyp 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,131 @@
+#!/usr/bin/env node
+
+"use strict";
+
+/**
+ * Set the title.
+ */
+
+process.title = 'node-pre-gyp';
+
+/**
+ * Module dependencies.
+ */
+
+var node_pre_gyp = require('../');
+var log = require('npmlog');
+
+/**
+ * Process and execute the selected commands.
+ */
+
+var prog = new node_pre_gyp.Run();
+var completed = false;
+prog.parseArgv(process.argv);
+
+if (prog.todo.length === 0) {
+ if (~process.argv.indexOf('-v') || ~process.argv.indexOf('--version')) {
+ console.log('v%s', prog.version);
+ } else {
+ console.log('%s', prog.usage());
+ }
+ return process.exit(0);
+}
+
+// if --no-color is passed
+if (prog.opts && prog.opts.hasOwnProperty('color') && !prog.opts.color) {
+ log.disableColor();
+}
+
+log.info('it worked if it ends with', 'ok');
+log.verbose('cli', process.argv);
+log.info('using', process.title + '@%s', prog.version);
+log.info('using', 'node@%s | %s | %s', process.versions.node, process.platform, process.arch);
+
+
+/**
+ * Change dir if -C/--directory was passed.
+ */
+
+var dir = prog.opts.directory;
+if (dir) {
+ var fs = require('fs');
+ try {
+ var stat = fs.statSync(dir);
+ if (stat.isDirectory()) {
+ log.info('chdir', dir);
+ process.chdir(dir);
+ } else {
+ log.warn('chdir', dir + ' is not a directory');
+ }
+ } catch (e) {
+ if (e.code === 'ENOENT') {
+ log.warn('chdir', dir + ' is not a directory');
+ } else {
+ log.warn('chdir', 'error during chdir() "%s"', e.message);
+ }
+ }
+}
+
+function run () {
+ var command = prog.todo.shift();
+ if (!command) {
+ // done!
+ completed = true;
+ log.info('ok');
+ return;
+ }
+
+ prog.commands[command.name](command.args, function (err) {
+ if (err) {
+ log.error(command.name + ' error');
+ log.error('stack', err.stack);
+ errorMessage();
+ log.error('not ok');
+ console.log(err.message);
+ return process.exit(1);
+ }
+ var args_array = [].slice.call(arguments, 1);
+ if (args_array.length) {
+ console.log.apply(console, args_array);
+ }
+ // now run the next command in the queue
+ process.nextTick(run);
+ });
+}
+
+process.on('exit', function (code) {
+ if (!completed && !code) {
+ log.error('Completion callback never invoked!');
+ issueMessage();
+ process.exit(6);
+ }
+});
+
+process.on('uncaughtException', function (err) {
+ log.error('UNCAUGHT EXCEPTION');
+ log.error('stack', err.stack);
+ issueMessage();
+ process.exit(7);
+});
+
+function errorMessage () {
+ // copied from npm's lib/util/error-handler.js
+ var os = require('os');
+ log.error('System', os.type() + ' ' + os.release());
+ log.error('command', process.argv.map(JSON.stringify).join(' '));
+ log.error('cwd', process.cwd());
+ log.error('node -v', process.version);
+ log.error(process.title+' -v', 'v' + prog.package.version);
+}
+
+function issueMessage () {
+ errorMessage();
+ log.error('', [ 'This is a bug in `'+process.title+'`.',
+ 'Try to update '+process.title+' and file an issue if it does not help:',
+ ' <https://github.com/mapbox/'+process.title+'/issues>',
+ ].join('\n'));
+}
+
+// start running the given commands!
+run();
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/nopt unsaved/built/bundle/programs/server/npm/node_modules/.bin/nopt
--- saved/built/bundle/programs/server/npm/node_modules/.bin/nopt 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/nopt 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+var nopt = require("../lib/nopt")
+ , path = require("path")
+ , types = { num: Number
+ , bool: Boolean
+ , help: Boolean
+ , list: Array
+ , "num-list": [Number, Array]
+ , "str-list": [String, Array]
+ , "bool-list": [Boolean, Array]
+ , str: String
+ , clear: Boolean
+ , config: Boolean
+ , length: Number
+ , file: path
+ }
+ , shorthands = { s: [ "--str", "astring" ]
+ , b: [ "--bool" ]
+ , nb: [ "--no-bool" ]
+ , tft: [ "--bool-list", "--no-bool-list", "--bool-list", "true" ]
+ , "?": ["--help"]
+ , h: ["--help"]
+ , H: ["--help"]
+ , n: [ "--num", "125" ]
+ , c: ["--config"]
+ , l: ["--length"]
+ , f: ["--file"]
+ }
+ , parsed = nopt( types
+ , shorthands
+ , process.argv
+ , 2 )
+
+console.log("parsed", parsed)
+
+if (parsed.help) {
+ console.log("")
+ console.log("nopt cli tester")
+ console.log("")
+ console.log("types")
+ console.log(Object.keys(types).map(function M (t) {
+ var type = types[t]
+ if (Array.isArray(type)) {
+ return [t, type.map(function (type) { return type.name })]
+ }
+ return [t, type && type.name]
+ }).reduce(function (s, i) {
+ s[i[0]] = i[1]
+ return s
+ }, {}))
+ console.log("")
+ console.log("shorthands")
+ console.log(shorthands)
+}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/rc unsaved/built/bundle/programs/server/npm/node_modules/.bin/rc
--- saved/built/bundle/programs/server/npm/node_modules/.bin/rc 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/rc 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,60 @@
+#! /usr/bin/env node
+var cc = require('./lib/utils')
+var join = require('path').join
+var deepExtend = require('deep-extend')
+var etc = '/etc'
+var win = process.platform === "win32"
+var home = win
+ ? process.env.USERPROFILE
+ : process.env.HOME
+
+module.exports = function (name, defaults, argv, parse) {
+ if('string' !== typeof name)
+ throw new Error('rc(name): name *must* be string')
+ if(!argv)
+ argv = require('minimist')(process.argv.slice(2))
+ defaults = (
+ 'string' === typeof defaults
+ ? cc.json(defaults) : defaults
+ ) || {}
+
+ parse = parse || cc.parse
+
+ var env = cc.env(name + '_')
+
+ var configs = [defaults]
+ var configFiles = []
+ function addConfigFile (file) {
+ if (configFiles.indexOf(file) >= 0) return
+ var fileConfig = cc.file(file)
+ if (fileConfig) {
+ configs.push(parse(fileConfig))
+ configFiles.push(file)
+ }
+ }
+
+ // which files do we look at?
+ if (!win)
+ [join(etc, name, 'config'),
+ join(etc, name + 'rc')].forEach(addConfigFile)
+ if (home)
+ [join(home, '.config', name, 'config'),
+ join(home, '.config', name),
+ join(home, '.' + name, 'config'),
+ join(home, '.' + name + 'rc')].forEach(addConfigFile)
+ addConfigFile(cc.find('.'+name+'rc'))
+ if (env.config) addConfigFile(env.config)
+ if (argv.config) addConfigFile(argv.config)
+
+ return deepExtend.apply(null, configs.concat([
+ env,
+ argv,
+ configFiles.length ? {configs: configFiles, config: configFiles[configFiles.length - 1]} : undefined,
+ ]))
+}
+
+if(!module.parent) {
+ console.log(
+ JSON.stringify(module.exports(process.argv[2]), false, 2)
+ )
+}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/rimraf unsaved/built/bundle/programs/server/npm/node_modules/.bin/rimraf
--- saved/built/bundle/programs/server/npm/node_modules/.bin/rimraf 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/rimraf 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,40 @@
+#!/usr/bin/env node
+
+var rimraf = require('./')
+
+var help = false
+var dashdash = false
+var args = process.argv.slice(2).filter(function(arg) {
+ if (dashdash)
+ return !!arg
+ else if (arg === '--')
+ dashdash = true
+ else if (arg.match(/^(-+|\/)(h(elp)?|\?)$/))
+ help = true
+ else
+ return !!arg
+});
+
+if (help || args.length === 0) {
+ // If they didn't ask for help, then this is not a "success"
+ var log = help ? console.log : console.error
+ log('Usage: rimraf <path> [<path> ...]')
+ log('')
+ log(' Deletes all files and folders at "path" recursively.')
+ log('')
+ log('Options:')
+ log('')
+ log(' -h, --help Display this usage info')
+ process.exit(help ? 0 : 1)
+} else
+ go(0)
+
+function go (n) {
+ if (n >= args.length)
+ return
+ rimraf(args[n], function (er) {
+ if (er)
+ throw er
+ go(n+1)
+ })
+}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/semver unsaved/built/bundle/programs/server/npm/node_modules/.bin/semver
--- saved/built/bundle/programs/server/npm/node_modules/.bin/semver 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/semver 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,133 @@
+#!/usr/bin/env node
+// Standalone semver comparison program.
+// Exits successfully and prints matching version(s) if
+// any supplied version is valid and passes all tests.
+
+var argv = process.argv.slice(2)
+ , versions = []
+ , range = []
+ , gt = []
+ , lt = []
+ , eq = []
+ , inc = null
+ , version = require("../package.json").version
+ , loose = false
+ , identifier = undefined
+ , semver = require("../semver")
+ , reverse = false
+
+main()
+
+function main () {
+ if (!argv.length) return help()
+ while (argv.length) {
+ var a = argv.shift()
+ var i = a.indexOf('=')
+ if (i !== -1) {
+ a = a.slice(0, i)
+ argv.unshift(a.slice(i + 1))
+ }
+ switch (a) {
+ case "-rv": case "-rev": case "--rev": case "--reverse":
+ reverse = true
+ break
+ case "-l": case "--loose":
+ loose = true
+ break
+ case "-v": case "--version":
+ versions.push(argv.shift())
+ break
+ case "-i": case "--inc": case "--increment":
+ switch (argv[0]) {
+ case "major": case "minor": case "patch": case "prerelease":
+ case "premajor": case "preminor": case "prepatch":
+ inc = argv.shift()
+ break
+ default:
+ inc = "patch"
+ break
+ }
+ break
+ case "--preid":
+ identifier = argv.shift()
+ break
+ case "-r": case "--range":
+ range.push(argv.shift())
+ break
+ case "-h": case "--help": case "-?":
+ return help()
+ default:
+ versions.push(a)
+ break
+ }
+ }
+
+ versions = versions.filter(function (v) {
+ return semver.valid(v, loose)
+ })
+ if (!versions.length) return fail()
+ if (inc && (versions.length !== 1 || range.length))
+ return failInc()
+
+ for (var i = 0, l = range.length; i < l ; i ++) {
+ versions = versions.filter(function (v) {
+ return semver.satisfies(v, range[i], loose)
+ })
+ if (!versions.length) return fail()
+ }
+ return success(versions)
+}
+
+function failInc () {
+ console.error("--inc can only be used on a single version with no range")
+ fail()
+}
+
+function fail () { process.exit(1) }
+
+function success () {
+ var compare = reverse ? "rcompare" : "compare"
+ versions.sort(function (a, b) {
+ return semver[compare](a, b, loose)
+ }).map(function (v) {
+ return semver.clean(v, loose)
+ }).map(function (v) {
+ return inc ? semver.inc(v, inc, loose, identifier) : v
+ }).forEach(function (v,i,_) { console.log(v) })
+}
+
+function help () {
+ console.log(["SemVer " + version
+ ,""
+ ,"A JavaScript implementation of the http://semver.org/ specification"
+ ,"Copyright Isaac Z. Schlueter"
+ ,""
+ ,"Usage: semver [options] <version> [<version> [...]]"
+ ,"Prints valid versions sorted by SemVer precedence"
+ ,""
+ ,"Options:"
+ ,"-r --range <range>"
+ ," Print versions that match the specified range."
+ ,""
+ ,"-i --increment [<level>]"
+ ," Increment a version by the specified level. Level can"
+ ," be one of: major, minor, patch, premajor, preminor,"
+ ," prepatch, or prerelease. Default level is 'patch'."
+ ," Only one version may be specified."
+ ,""
+ ,"--preid <identifier>"
+ ," Identifier to be used to prefix premajor, preminor,"
+ ," prepatch or prerelease version increments."
+ ,""
+ ,"-l --loose"
+ ," Interpret versions and ranges loosely"
+ ,""
+ ,"Program exits successfully if any valid version satisfies"
+ ,"all supplied ranges, and prints all satisfying versions."
+ ,""
+ ,"If no satisfying versions are found, then exits failure."
+ ,""
+ ,"Versions are printed in ascending order, so supplying"
+ ,"multiple versions to the utility will just sort them."
+ ].join("\n"))
+}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-conv unsaved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-conv
--- saved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-conv 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-conv 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,201 @@
+#!/usr/bin/env node
+// -*- mode: js -*-
+// vim: set filetype=javascript :
+// Copyright 2015 Joyent, Inc. All rights reserved.
+
+var dashdash = require('dashdash');
+var sshpk = require('../lib/index');
+var fs = require('fs');
+var path = require('path');
+var tty = require('tty');
+var readline = require('readline');
+var getPassword = require('getpass').getPass;
+
+var options = [
+ {
+ names: ['outformat', 't'],
+ type: 'string',
+ help: 'Output format'
+ },
+ {
+ names: ['informat', 'T'],
+ type: 'string',
+ help: 'Input format'
+ },
+ {
+ names: ['file', 'f'],
+ type: 'string',
+ help: 'Input file name (default stdin)'
+ },
+ {
+ names: ['out', 'o'],
+ type: 'string',
+ help: 'Output file name (default stdout)'
+ },
+ {
+ names: ['private', 'p'],
+ type: 'bool',
+ help: 'Produce a private key as output'
+ },
+ {
+ names: ['derive', 'd'],
+ type: 'string',
+ help: 'Output a new key derived from this one, with given algo'
+ },
+ {
+ names: ['identify', 'i'],
+ type: 'bool',
+ help: 'Print key metadata instead of converting'
+ },
+ {
+ names: ['comment', 'c'],
+ type: 'string',
+ help: 'Set key comment, if output format supports'
+ },
+ {
+ names: ['help', 'h'],
+ type: 'bool',
+ help: 'Shows this help text'
+ }
+];
+
+if (require.main === module) {
+ var parser = dashdash.createParser({
+ options: options
+ });
+
+ try {
+ var opts = parser.parse(process.argv);
+ } catch (e) {
+ console.error('sshpk-conv: error: %s', e.message);
+ process.exit(1);
+ }
+
+ if (opts.help || opts._args.length > 1) {
+ var help = parser.help({}).trimRight();
+ console.error('sshpk-conv: converts between SSH key formats\n');
+ console.error(help);
+ console.error('\navailable formats:');
+ console.error(' - pem, pkcs1 eg id_rsa');
+ console.error(' - ssh eg id_rsa.pub');
+ console.error(' - pkcs8 format you want for openssl');
+ console.error(' - openssh like output of ssh-keygen -o');
+ console.error(' - rfc4253 raw OpenSSH wire format');
+ process.exit(1);
+ }
+
+ /*
+ * Key derivation can only be done on private keys, so use of the -d
+ * option necessarily implies -p.
+ */
+ if (opts.derive)
+ opts.private = true;
+
+ var inFile = process.stdin;
+ var inFileName = 'stdin';
+
+ var inFilePath;
+ if (opts.file) {
+ inFilePath = opts.file;
+ } else if (opts._args.length === 1) {
+ inFilePath = opts._args[0];
+ }
+
+ if (inFilePath)
+ inFileName = path.basename(inFilePath);
+
+ try {
+ if (inFilePath) {
+ fs.accessSync(inFilePath, fs.R_OK);
+ inFile = fs.createReadStream(inFilePath);
+ }
+ } catch (e) {
+ console.error('sshpk-conv: error opening input file' +
+ ': ' + e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ var outFile = process.stdout;
+
+ try {
+ if (opts.out && !opts.identify) {
+ fs.accessSync(path.dirname(opts.out), fs.W_OK);
+ outFile = fs.createWriteStream(opts.out);
+ }
+ } catch (e) {
+ console.error('sshpk-conv: error opening output file' +
+ ': ' + e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ var bufs = [];
+ inFile.on('readable', function () {
+ var data;
+ while ((data = inFile.read()))
+ bufs.push(data);
+ });
+ var parseOpts = {};
+ parseOpts.filename = inFileName;
+ inFile.on('end', function processKey() {
+ var buf = Buffer.concat(bufs);
+ var fmt = 'auto';
+ if (opts.informat)
+ fmt = opts.informat;
+ var f = sshpk.parseKey;
+ if (opts.private)
+ f = sshpk.parsePrivateKey;
+ try {
+ var key = f(buf, fmt, parseOpts);
+ } catch (e) {
+ if (e.name === 'KeyEncryptedError') {
+ getPassword(function (err, pw) {
+ if (err) {
+ console.log('sshpk-conv: ' +
+ err.name + ': ' +
+ err.message);
+ process.exit(1);
+ }
+ parseOpts.passphrase = pw;
+ processKey();
+ });
+ return;
+ }
+ console.error('sshpk-conv: ' +
+ e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ if (opts.derive)
+ key = key.derive(opts.derive);
+
+ if (opts.comment)
+ key.comment = opts.comment;
+
+ if (!opts.identify) {
+ fmt = undefined;
+ if (opts.outformat)
+ fmt = opts.outformat;
+ outFile.write(key.toBuffer(fmt));
+ if (fmt === 'ssh' ||
+ (!opts.private && fmt === undefined))
+ outFile.write('\n');
+ outFile.once('drain', function () {
+ process.exit(0);
+ });
+ } else {
+ var kind = 'public';
+ if (sshpk.PrivateKey.isPrivateKey(key))
+ kind = 'private';
+ console.log('%s: a %d bit %s %s key', inFileName,
+ key.size, key.type.toUpperCase(), kind);
+ if (key.type === 'ecdsa')
+ console.log('ECDSA curve: %s', key.curve);
+ if (key.comment)
+ console.log('Comment: %s', key.comment);
+ console.log('Fingerprint:');
+ console.log(' ' + key.fingerprint().toString());
+ console.log(' ' + key.fingerprint('md5').toString());
+ process.exit(0);
+ }
+ });
+}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-sign unsaved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-sign
--- saved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-sign 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-sign 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,191 @@
+#!/usr/bin/env node
+// -*- mode: js -*-
+// vim: set filetype=javascript :
+// Copyright 2015 Joyent, Inc. All rights reserved.
+
+var dashdash = require('dashdash');
+var sshpk = require('../lib/index');
+var fs = require('fs');
+var path = require('path');
+var getPassword = require('getpass').getPass;
+
+var options = [
+ {
+ names: ['hash', 'H'],
+ type: 'string',
+ help: 'Hash algorithm (sha1, sha256, sha384, sha512)'
+ },
+ {
+ names: ['verbose', 'v'],
+ type: 'bool',
+ help: 'Display verbose info about key and hash used'
+ },
+ {
+ names: ['identity', 'i'],
+ type: 'string',
+ help: 'Path to key to use'
+ },
+ {
+ names: ['file', 'f'],
+ type: 'string',
+ help: 'Input filename'
+ },
+ {
+ names: ['out', 'o'],
+ type: 'string',
+ help: 'Output filename'
+ },
+ {
+ names: ['format', 't'],
+ type: 'string',
+ help: 'Signature format (asn1, ssh, raw)'
+ },
+ {
+ names: ['binary', 'b'],
+ type: 'bool',
+ help: 'Output raw binary instead of base64'
+ },
+ {
+ names: ['help', 'h'],
+ type: 'bool',
+ help: 'Shows this help text'
+ }
+];
+
+var parseOpts = {};
+
+if (require.main === module) {
+ var parser = dashdash.createParser({
+ options: options
+ });
+
+ try {
+ var opts = parser.parse(process.argv);
+ } catch (e) {
+ console.error('sshpk-sign: error: %s', e.message);
+ process.exit(1);
+ }
+
+ if (opts.help || opts._args.length > 1) {
+ var help = parser.help({}).trimRight();
+ console.error('sshpk-sign: sign data using an SSH key\n');
+ console.error(help);
+ process.exit(1);
+ }
+
+ if (!opts.identity) {
+ var help = parser.help({}).trimRight();
+ console.error('sshpk-sign: the -i or --identity option ' +
+ 'is required\n');
+ console.error(help);
+ process.exit(1);
+ }
+
+ var keyData = fs.readFileSync(opts.identity);
+ parseOpts.filename = opts.identity;
+
+ run();
+}
+
+function run() {
+ var key;
+ try {
+ key = sshpk.parsePrivateKey(keyData, 'auto', parseOpts);
+ } catch (e) {
+ if (e.name === 'KeyEncryptedError') {
+ getPassword(function (err, pw) {
+ parseOpts.passphrase = pw;
+ run();
+ });
+ return;
+ }
+ console.error('sshpk-sign: error loading private key "' +
+ opts.identity + '": ' + e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ var hash = opts.hash || key.defaultHashAlgorithm();
+
+ var signer;
+ try {
+ signer = key.createSign(hash);
+ } catch (e) {
+ console.error('sshpk-sign: error creating signer: ' +
+ e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ if (opts.verbose) {
+ console.error('sshpk-sign: using %s-%s with a %d bit key',
+ key.type, hash, key.size);
+ }
+
+ var inFile = process.stdin;
+ var inFileName = 'stdin';
+
+ var inFilePath;
+ if (opts.file) {
+ inFilePath = opts.file;
+ } else if (opts._args.length === 1) {
+ inFilePath = opts._args[0];
+ }
+
+ if (inFilePath)
+ inFileName = path.basename(inFilePath);
+
+ try {
+ if (inFilePath) {
+ fs.accessSync(inFilePath, fs.R_OK);
+ inFile = fs.createReadStream(inFilePath);
+ }
+ } catch (e) {
+ console.error('sshpk-sign: error opening input file' +
+ ': ' + e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ var outFile = process.stdout;
+
+ try {
+ if (opts.out && !opts.identify) {
+ fs.accessSync(path.dirname(opts.out), fs.W_OK);
+ outFile = fs.createWriteStream(opts.out);
+ }
+ } catch (e) {
+ console.error('sshpk-sign: error opening output file' +
+ ': ' + e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ inFile.pipe(signer);
+ inFile.on('end', function () {
+ var sig;
+ try {
+ sig = signer.sign();
+ } catch (e) {
+ console.error('sshpk-sign: error signing data: ' +
+ e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ var fmt = opts.format || 'asn1';
+ var output;
+ try {
+ output = sig.toBuffer(fmt);
+ if (!opts.binary)
+ output = output.toString('base64');
+ } catch (e) {
+ console.error('sshpk-sign: error converting signature' +
+ ' to ' + fmt + ' format: ' + e.name + ': ' +
+ e.message);
+ process.exit(1);
+ }
+
+ outFile.write(output);
+ if (!opts.binary)
+ outFile.write('\n');
+ outFile.once('drain', function () {
+ process.exit(0);
+ });
+ });
+}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-verify unsaved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-verify
--- saved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-verify 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/sshpk-verify 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,166 @@
+#!/usr/bin/env node
+// -*- mode: js -*-
+// vim: set filetype=javascript :
+// Copyright 2015 Joyent, Inc. All rights reserved.
+
+var dashdash = require('dashdash');
+var sshpk = require('../lib/index');
+var fs = require('fs');
+var path = require('path');
+
+var options = [
+ {
+ names: ['hash', 'H'],
+ type: 'string',
+ help: 'Hash algorithm (sha1, sha256, sha384, sha512)'
+ },
+ {
+ names: ['verbose', 'v'],
+ type: 'bool',
+ help: 'Display verbose info about key and hash used'
+ },
+ {
+ names: ['identity', 'i'],
+ type: 'string',
+ help: 'Path to (public) key to use'
+ },
+ {
+ names: ['file', 'f'],
+ type: 'string',
+ help: 'Input filename'
+ },
+ {
+ names: ['format', 't'],
+ type: 'string',
+ help: 'Signature format (asn1, ssh, raw)'
+ },
+ {
+ names: ['signature', 's'],
+ type: 'string',
+ help: 'base64-encoded signature data'
+ },
+ {
+ names: ['help', 'h'],
+ type: 'bool',
+ help: 'Shows this help text'
+ }
+];
+
+if (require.main === module) {
+ var parser = dashdash.createParser({
+ options: options
+ });
+
+ try {
+ var opts = parser.parse(process.argv);
+ } catch (e) {
+ console.error('sshpk-verify: error: %s', e.message);
+ process.exit(3);
+ }
+
+ if (opts.help || opts._args.length > 1) {
+ var help = parser.help({}).trimRight();
+ console.error('sshpk-verify: sign data using an SSH key\n');
+ console.error(help);
+ process.exit(3);
+ }
+
+ if (!opts.identity) {
+ var help = parser.help({}).trimRight();
+ console.error('sshpk-verify: the -i or --identity option ' +
+ 'is required\n');
+ console.error(help);
+ process.exit(3);
+ }
+
+ if (!opts.signature) {
+ var help = parser.help({}).trimRight();
+ console.error('sshpk-verify: the -s or --signature option ' +
+ 'is required\n');
+ console.error(help);
+ process.exit(3);
+ }
+
+ var keyData = fs.readFileSync(opts.identity);
+
+ var key;
+ try {
+ key = sshpk.parseKey(keyData);
+ } catch (e) {
+ console.error('sshpk-verify: error loading key "' +
+ opts.identity + '": ' + e.name + ': ' + e.message);
+ process.exit(2);
+ }
+
+ var fmt = opts.format || 'asn1';
+ var sigData = new Buffer(opts.signature, 'base64');
+
+ var sig;
+ try {
+ sig = sshpk.parseSignature(sigData, key.type, fmt);
+ } catch (e) {
+ console.error('sshpk-verify: error parsing signature: ' +
+ e.name + ': ' + e.message);
+ process.exit(2);
+ }
+
+ var hash = opts.hash || key.defaultHashAlgorithm();
+
+ var verifier;
+ try {
+ verifier = key.createVerify(hash);
+ } catch (e) {
+ console.error('sshpk-verify: error creating verifier: ' +
+ e.name + ': ' + e.message);
+ process.exit(2);
+ }
+
+ if (opts.verbose) {
+ console.error('sshpk-verify: using %s-%s with a %d bit key',
+ key.type, hash, key.size);
+ }
+
+ var inFile = process.stdin;
+ var inFileName = 'stdin';
+
+ var inFilePath;
+ if (opts.file) {
+ inFilePath = opts.file;
+ } else if (opts._args.length === 1) {
+ inFilePath = opts._args[0];
+ }
+
+ if (inFilePath)
+ inFileName = path.basename(inFilePath);
+
+ try {
+ if (inFilePath) {
+ fs.accessSync(inFilePath, fs.R_OK);
+ inFile = fs.createReadStream(inFilePath);
+ }
+ } catch (e) {
+ console.error('sshpk-verify: error opening input file' +
+ ': ' + e.name + ': ' + e.message);
+ process.exit(2);
+ }
+
+ inFile.pipe(verifier);
+ inFile.on('end', function () {
+ var ret;
+ try {
+ ret = verifier.verify(sig);
+ } catch (e) {
+ console.error('sshpk-verify: error verifying data: ' +
+ e.name + ': ' + e.message);
+ process.exit(1);
+ }
+
+ if (ret) {
+ console.error('OK');
+ process.exit(0);
+ }
+
+ console.error('NOT OK');
+ process.exit(1);
+ });
+}
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/strip-json-comments unsaved/built/bundle/programs/server/npm/node_modules/.bin/strip-json-comments
--- saved/built/bundle/programs/server/npm/node_modules/.bin/strip-json-comments 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/strip-json-comments 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+'use strict';
+var fs = require('fs');
+var strip = require('./strip-json-comments');
+var input = process.argv[2];
+
+
+function getStdin(cb) {
+ var ret = '';
+
+ process.stdin.setEncoding('utf8');
+
+ process.stdin.on('data', function (data) {
+ ret += data;
+ });
+
+ process.stdin.on('end', function () {
+ cb(ret);
+ });
+}
+
+if (process.argv.indexOf('-h') !== -1 || process.argv.indexOf('--help') !== -1) {
+ console.log('strip-json-comments input-file > output-file');
+ console.log('or');
+ console.log('strip-json-comments < input-file > output-file');
+ return;
+}
+
+if (process.argv.indexOf('-v') !== -1 || process.argv.indexOf('--version') !== -1) {
+ console.log(require('./package').version);
+ return;
+}
+
+if (input) {
+ process.stdout.write(strip(fs.readFileSync(input, 'utf8')));
+ return;
+}
+
+getStdin(function (data) {
+ process.stdout.write(strip(data));
+});
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/supports-color unsaved/built/bundle/programs/server/npm/node_modules/.bin/supports-color
--- saved/built/bundle/programs/server/npm/node_modules/.bin/supports-color 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/supports-color 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,28 @@
+#!/usr/bin/env node
+'use strict';
+var pkg = require('./package.json');
+var supportsColor = require('./');
+var input = process.argv[2];
+
+function help() {
+ console.log([
+ pkg.description,
+ '',
+ 'Usage',
+ ' $ supports-color',
+ '',
+ 'Exits with code 0 if color is supported and 1 if not'
+ ].join('\n'));
+}
+
+if (!input || process.argv.indexOf('--help') !== -1) {
+ help();
+ return;
+}
+
+if (process.argv.indexOf('--version') !== -1) {
+ console.log(pkg.version);
+ return;
+}
+
+process.exit(supportsColor ? 0 : 1);
diff -ruN saved/built/bundle/programs/server/npm/node_modules/.bin/uuid unsaved/built/bundle/programs/server/npm/node_modules/.bin/uuid
--- saved/built/bundle/programs/server/npm/node_modules/.bin/uuid 1969-12-31 16:00:00.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/.bin/uuid 2016-12-05 17:51:13.000000000 -0800
@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+
+var path = require('path');
+var uuid = require(path.join(__dirname, '..'));
+
+var arg = process.argv[2];
+
+if ('--help' === arg) {
+ console.log('\n USAGE: uuid [version] [options]\n\n');
+ console.log(' options:\n');
+ console.log(' --help Display this message and exit\n');
+ process.exit(0);
+}
+
+if (null == arg) {
+ console.log(uuid());
+ process.exit(0);
+}
+
+if ('v1' !== arg && 'v4' !== arg) {
+ console.error('Version must be RFC4122 version 1 or version 4, denoted as "v1" or "v4"');
+ process.exit(1);
+}
+
+console.log(uuid[arg]());
+process.exit(0);
Binary files saved/built/bundle/programs/server/npm/node_modules/bcrypt/build/Release/bcrypt_lib.node and unsaved/built/bundle/programs/server/npm/node_modules/bcrypt/build/Release/bcrypt_lib.node differ
diff -ruN saved/built/bundle/programs/server/npm/node_modules/bcrypt/build/config.gypi unsaved/built/bundle/programs/server/npm/node_modules/bcrypt/build/config.gypi
--- saved/built/bundle/programs/server/npm/node_modules/bcrypt/build/config.gypi 2016-12-05 17:52:53.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/bcrypt/build/config.gypi 2016-12-05 17:51:12.000000000 -0800
@@ -104,8 +104,8 @@
"init_module": "/Users/glasser/.npm-init.js",
"user": "501",
"node_version": "4.6.2",
+ "save": "",
"editor": "/usr/local/bin/emacsclient",
- "save": "true",
"tag": "latest",
"progress": "true",
"global": "",
Binary files saved/built/bundle/programs/server/npm/node_modules/bcrypt/lib/binding/bcrypt_lib.node and unsaved/built/bundle/programs/server/npm/node_modules/bcrypt/lib/binding/bcrypt_lib.node differ
diff -ruN saved/built/bundle/programs/server/npm/node_modules/bcrypt/package.json unsaved/built/bundle/programs/server/npm/node_modules/bcrypt/package.json
--- saved/built/bundle/programs/server/npm/node_modules/bcrypt/package.json 2016-12-05 17:52:53.000000000 -0800
+++ unsaved/built/bundle/programs/server/npm/node_modules/bcrypt/package.json 2016-12-05 17:51:12.000000000 -0800
@@ -38,8 +38,7 @@
"type": "tag"
},
"_requiredBy": [
- "#USER",
- "/"
+ "#USER"
],
"_resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.0.tgz",
"_shasum": "e91170e6b8464e62200e66184cb55c5fa0161a21",
diff -ruN saved/source/.meteor/.id unsaved/source/.meteor/.id
--- saved/source/.meteor/.id 2016-12-05 17:51:50.000000000 -0800
+++ unsaved/source/.meteor/.id 2016-12-05 17:50:05.000000000 -0800
@@ -4,4 +4,4 @@
# - ensuring you don't accidentally deploy one app on top of another
# - providing package authors with aggregated statistics
-ykn8om1jt9gmlgdoxdu
+16imlabn8356hotzre7
Binary files saved/source/node_modules/bcrypt/build/Release/bcrypt_lib.node and unsaved/source/node_modules/bcrypt/build/Release/bcrypt_lib.node differ
diff -ruN saved/source/node_modules/bcrypt/build/config.gypi unsaved/source/node_modules/bcrypt/build/config.gypi
--- saved/source/node_modules/bcrypt/build/config.gypi 2016-12-05 17:52:08.000000000 -0800
+++ unsaved/source/node_modules/bcrypt/build/config.gypi 2016-12-05 17:50:33.000000000 -0800
@@ -104,8 +104,8 @@
"init_module": "/Users/glasser/.npm-init.js",
"user": "501",
"node_version": "4.6.2",
+ "save": "",
"editor": "/usr/local/bin/emacsclient",
- "save": "true",
"tag": "latest",
"progress": "true",
"global": "",
Binary files saved/source/node_modules/bcrypt/lib/binding/bcrypt_lib.node and unsaved/source/node_modules/bcrypt/lib/binding/bcrypt_lib.node differ
diff -ruN saved/source/node_modules/bcrypt/package.json unsaved/source/node_modules/bcrypt/package.json
--- saved/source/node_modules/bcrypt/package.json 2016-12-05 17:52:06.000000000 -0800
+++ unsaved/source/node_modules/bcrypt/package.json 2016-12-05 17:50:31.000000000 -0800
@@ -38,8 +38,7 @@
"type": "tag"
},
"_requiredBy": [
- "#USER",
- "/"
+ "#USER"
],
"_resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.0.tgz",
"_shasum": "e91170e6b8464e62200e66184cb55c5fa0161a21",
diff -ruN saved/source/package.json unsaved/source/package.json
--- saved/source/package.json 2016-12-05 17:52:10.000000000 -0800
+++ unsaved/source/package.json 2016-12-05 17:50:05.000000000 -0800
@@ -5,8 +5,7 @@
"start": "meteor run"
},
"dependencies": {
- "babel-runtime": "6.18.0",
- "bcrypt": "^1.0.0",
- "meteor-node-stubs": "~0.2.0"
+ "meteor-node-stubs": "~0.2.0",
+ "babel-runtime": "6.18.0"
}
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment