Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
tls: prevent stalls by using read(0)
Browse files Browse the repository at this point in the history
Do not `.push()` the same data as just passed to `.ondata()`, it
may be read by 'data' event listeners.

fix #6277
  • Loading branch information
indutny committed Nov 8, 2013
1 parent 8f221bc commit ac2263b
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 4 deletions.
14 changes: 10 additions & 4 deletions lib/tls.js
Original file line number Diff line number Diff line change
Expand Up @@ -506,10 +506,16 @@ CryptoStream.prototype._read = function read(size) {
if (this.ondata) {
this.ondata(pool, start, start + bytesRead);

// Consume data automatically
// simple/test-https-drain fails without it
this.push(pool.slice(start, start + bytesRead));
this.read(bytesRead);
// Deceive streams2
var self = this;

setImmediate(function() {
// Force state.reading to set to false
self.push('');

// Try reading more, we most likely have some data
self.read(0);
});
} else {
this.push(pool.slice(start, start + bytesRead));
}
Expand Down
75 changes: 75 additions & 0 deletions test/simple/test-https-req-split.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// 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.

if (!process.versions.openssl) {
console.error('Skipping because node compiled without OpenSSL.');
process.exit(0);
}

// disable strict server certificate validation by the client
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';

var common = require('../common');
var assert = require('assert');
var https = require('https');
var tls = require('tls');
var fs = require('fs');

var seen_req = false;

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

// Force splitting incoming data
tls.SLAB_BUFFER_SIZE = 1;

var server = https.createServer(options);
server.on('upgrade', function(req, socket, upgrade) {
socket.on('data', function(data) {
throw new Error('Unexpected data: ' + data);
});
socket.end('HTTP/1.1 200 Ok\r\n\r\n');
seen_req = true;
});

server.listen(common.PORT, function() {
var req = https.request({
host: '127.0.0.1',
port: common.PORT,
agent: false,
headers: {
Connection: 'Upgrade',
Upgrade: 'Websocket'
}
}, function() {
req.socket.destroy();
server.close();
});

req.end();
});

process.on('exit', function() {
assert(seen_req);
console.log('ok');
});

0 comments on commit ac2263b

Please sign in to comment.