From 4c1eb5bf0360e2c603437c69cf46e993fbb3c837 Mon Sep 17 00:00:00 2001 From: Carl Lei Date: Fri, 16 Oct 2015 16:29:34 +0800 Subject: [PATCH] repl: create history file with mode 0600 Set the mode bits on the history file to 0o600 instead of leaving it unspecified, which resulted in 0o755 on Unices. Test code mostly written by Trott: https://github.com/nodejs/node/issues/3392#issuecomment-148634126. PR-URL: https://github.com/nodejs/node/pull/3394 Fixes: https://github.com/nodejs/node/issues/3392 Reviewed-By: Rich Trott Reviewed-By: Roman Reiss Reviewed-By: Jeremiah Senkpiel Reviewed-By: Santiago Gimeno Reviewed-By: James M Snell --- lib/internal/repl.js | 5 ++- test/parallel/test-repl-history-perm.js | 53 +++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 test/parallel/test-repl-history-perm.js diff --git a/lib/internal/repl.js b/lib/internal/repl.js index 371446a83b..cea681f583 100644 --- a/lib/internal/repl.js +++ b/lib/internal/repl.js @@ -93,7 +93,10 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) { var writing = false; var pending = false; repl.pause(); - fs.open(historyPath, 'a+', oninit); + // History files are conventionally not readable by others: + // https://github.com/nodejs/node/issues/3392 + // https://github.com/nodejs/node/pull/3394 + fs.open(historyPath, 'a+', 0o0600, oninit); function oninit(err, hnd) { if (err) { diff --git a/test/parallel/test-repl-history-perm.js b/test/parallel/test-repl-history-perm.js new file mode 100644 index 0000000000..717728bc4f --- /dev/null +++ b/test/parallel/test-repl-history-perm.js @@ -0,0 +1,53 @@ +'use strict'; +// Flags: --expose_internals + +const common = require('../common'); + +if (common.isWindows) { + console.log('1..0 # Skipped: Win32 uses ACLs for file permissions, ' + + 'modes are always 0666 and says nothing about group/other ' + + 'read access.'); + return; +} + +const assert = require('assert'); +const path = require('path'); +const fs = require('fs'); +const repl = require('internal/repl'); +const Duplex = require('stream').Duplex; +// Invoking the REPL should create a repl history file at the specified path +// and mode 600. + +var stream = new Duplex(); +stream.pause = stream.resume = function() {}; +// ends immediately +stream._read = function() { + this.push(null); +}; +stream._write = function(c, e, cb) { + cb(); +}; +stream.readable = stream.writable = true; + +common.refreshTmpDir(); +const replHistoryPath = path.join(common.tmpDir, '.node_repl_history'); + +const checkResults = common.mustCall(function(err, r) { + if (err) + throw err; + r.input.end(); + const stat = fs.statSync(replHistoryPath); + assert.strictEqual( + stat.mode & 0o777, 0o600, + 'REPL history file should be mode 0600'); +}); + +repl.createInternalRepl( + {NODE_REPL_HISTORY: replHistoryPath}, + { + terminal: true, + input: stream, + output: stream + }, + checkResults +);