diff --git a/index.js b/index.js index 0f4c3d3..d8c85b5 100644 --- a/index.js +++ b/index.js @@ -6,11 +6,13 @@ See the accompanying LICENSE file for terms. 'use strict'; -var isRegExp = require('util').isRegExp; +var isRegExp = require('util').isRegExp; +var randomBytes = require('randombytes'); // Generate an internal UID to make the regexp pattern harder to guess. -var UID = Math.floor(Math.random() * 0x10000000000).toString(16); -var PLACE_HOLDER_REGEXP = new RegExp('"@__(F|R)-' + UID + '-(\\d+)__@"', 'g'); +var UID_LENGTH = 16; +var UID = generateUID(); +var PLACE_HOLDER_REGEXP = new RegExp('(\\\\)?"@__(F|R)-' + UID + '-(\\d+)__@"', 'g'); var IS_NATIVE_CODE_REGEXP = /\{\s*\[native code\]\s*\}/g; var UNSAFE_CHARS_REGEXP = /[<>\/\u2028\u2029]/g; @@ -29,6 +31,15 @@ function escapeUnsafeChars(unsafeChar) { return ESCAPED_CHARS[unsafeChar]; } +function generateUID() { + var bytes = randomBytes(UID_LENGTH); + var result = ''; + for(var i=0; i-0__@"` and thus outputting + // invalid JS. + if (backSlash) { + return match; + } if (type === 'R') { return regexps[valueIndex].toString(); } diff --git a/package.json b/package.json index f8950e1..ea4509e 100644 --- a/package.json +++ b/package.json @@ -30,5 +30,8 @@ "istanbul": "^0.3.2", "mocha": "^1.21.4", "xunit-file": "0.0.5" + }, + "dependencies": { + "randombytes": "^2.0.3" } } diff --git a/test/unit/serialize.js b/test/unit/serialize.js index 882351e..5a3eba9 100644 --- a/test/unit/serialize.js +++ b/test/unit/serialize.js @@ -1,9 +1,23 @@ /* global describe, it, beforeEach */ 'use strict'; +// temporarily monkeypatch `crypto.randomBytes` so we'll have a +// predictable UID for our tests +var crypto = require('crypto'); +var oldRandom = crypto.randomBytes; +crypto.randomBytes = function(len, cb) { + var buf = new Buffer(len); + buf.fill(0x00); + if (cb) + cb(null, buf); + return buf; +}; + var serialize = require('../../'), expect = require('chai').expect; +crypto.randomBytes = oldRandom; + describe('serialize( obj )', function () { it('should be a function', function () { expect(serialize).to.be.a('function'); @@ -111,6 +125,18 @@ describe('serialize( obj )', function () { }); }); + describe('placeholders', function() { + it('should not be replaced within string literals', function () { + // Since we made the UID deterministic this should always be the placeholder + var fakePlaceholder = '"@__R-0000000000000000-0__@'; + var serialized = serialize({bar: /1/i, foo: fakePlaceholder}, {uid: 'foo'}); + var obj = eval('(' + serialized + ')'); + expect(obj).to.be.a('Object'); + expect(obj.foo).to.be.a('String'); + expect(obj.foo).to.equal(fakePlaceholder); + }); + }); + describe('regexps', function () { it('should serialize constructed regexps', function () { var re = new RegExp('asdf');