From 4bf1d1007fbd249d1d07b662278a5a34c6be12fd Mon Sep 17 00:00:00 2001 From: isaacs Date: Mon, 8 Apr 2013 08:43:20 -0700 Subject: [PATCH] crypto: LazyTransform on properties, not methods It needs to apply the Transform class when the _readableState, _writableState, or _transformState properties are accessed, otherwise things like setEncoding and on('data') don't work properly. Also, the methods wrappers are no longer needed, since they're only problematic because they access the undefined properties. --- lib/crypto.js | 34 ++++++++++------- test/simple/test-crypto-hash-stream-pipe.js | 42 +++++++++++++++++++++ 2 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 test/simple/test-crypto-hash-stream-pipe.js diff --git a/lib/crypto.js b/lib/crypto.js index 1ae4c7aae43..8793c5c4883 100644 --- a/lib/crypto.js +++ b/lib/crypto.js @@ -155,19 +155,27 @@ function LazyTransform(options) { } util.inherits(LazyTransform, stream.Transform); -var transformMethods = ['read', 'write', 'end', 'pipe', 'unpipe', - 'setEncoding', 'pause', 'resume']; - -transformMethods.forEach(function(action, i, actions) { - LazyTransform.prototype[action] = function() { - stream.Transform.call(this, this._options); - - actions.forEach(function(action) { - this[action] = stream.Transform.prototype[action]; - }, this); - - return this[action].apply(this, arguments); - }; +[ + '_readableState', + '_writableState', + '_transformState' +].forEach(function(prop, i, props) { + Object.defineProperty(LazyTransform.prototype, prop, { + get: function() { + stream.Transform.call(this, this._options); + return this[prop]; + }, + set: function(val) { + Object.defineProperty(this, prop, { + value: val, + enumerable: true, + configurable: true, + writable: true + }); + }, + configurable: true, + enumerable: true + }); }); diff --git a/test/simple/test-crypto-hash-stream-pipe.js b/test/simple/test-crypto-hash-stream-pipe.js new file mode 100644 index 00000000000..1394903fab0 --- /dev/null +++ b/test/simple/test-crypto-hash-stream-pipe.js @@ -0,0 +1,42 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); + +var crypto = require('crypto'); +var stream = require('stream') +var s = new stream.PassThrough(); +var h = crypto.createHash('sha1'); +var expect = '15987e60950cf22655b9323bc1e281f9c4aff47e'; +var gotData = false; + +process.on('exit', function() { + assert(gotData); + console.log('ok'); +}); + +s.pipe(h).on('data', function(c) { + assert.equal(c, expect); + gotData = true; +}).setEncoding('hex'); + +s.end('aoeu');