Skip to content

Commit

Permalink
tls: write pending data of opposite side
Browse files Browse the repository at this point in the history
Fix stucked CryptoStream behaviour, happening when one of the sides
locks-up in queued state.

fix nodejs#5023
  • Loading branch information
indutny committed Mar 17, 2013
1 parent a0867e1 commit b5ddc0c
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/tls.js
Expand Up @@ -435,6 +435,7 @@ CryptoStream.prototype._read = function read(size) {

// Try writing pending data
if (this._pending !== null) this._writePending();
if (this._opposite._pending !== null) this._opposite._writePending();

if (bytesRead === 0) {
// EOF when cleartext has finished and we have nothing to read
Expand Down
74 changes: 74 additions & 0 deletions test/simple/test-tls-server-large-request.js
@@ -0,0 +1,74 @@
// 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 tls = require('tls');
var fs = require('fs');
var stream = require('stream');
var util = require('util');

var clientConnected = 0;
var serverConnected = 0;
var request = new Buffer(new Array(1024 * 256).join('ABCD')); // 1mb

var options = {
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
};

function Mediator() {
stream.Writable.call(this);
this.buf = '';
};
util.inherits(Mediator, stream.Writable);

Mediator.prototype._write = function write(data, enc, cb) {
this.buf += data;
setTimeout(cb, 0);

if (this.buf.length >= request.length) {
assert.equal(this.buf, request.toString());
server.close();
}
};

var mediator = new Mediator();

var server = tls.Server(options, function(socket) {
socket.pipe(mediator);
serverConnected++;
});

server.listen(common.PORT, function() {
var client1 = tls.connect({
port: common.PORT,
rejectUnauthorized: false
}, function() {
++clientConnected;
client1.end(request);
});
});

process.on('exit', function() {
assert.equal(clientConnected, 1);
assert.equal(serverConnected, 1);
});

0 comments on commit b5ddc0c

Please sign in to comment.