Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

tls: only emit data after 'secure' event

  • Loading branch information...
commit 9de5043b506f9da8cd136e2acd55462030b21fcf 1 parent 38d8cd6
@ry ry authored
Showing with 22 additions and 5 deletions.
  1. +22 −5 lib/tls.js
View
27 lib/tls.js
@@ -8,7 +8,7 @@ var assert = require('assert').ok;
var debug;
if (process.env.NODE_DEBUG && /tls/.test(process.env.NODE_DEBUG)) {
- debug = function() { util.error.apply(this, arguments); };
+ debug = function(a) { console.error("TLS: ", a); };
} else {
debug = function() { };
}
@@ -38,6 +38,7 @@ util.inherits(CryptoStream, stream.Stream);
CryptoStream.prototype.write = function(data /* , encoding, cb */) {
+ debug('CryptoStream.prototype.write called with <<<<' + data.toString() + '>>>');
if (!this.writable) {
throw new Error('CryptoStream is not writable');
}
@@ -69,13 +70,13 @@ CryptoStream.prototype.write = function(data /* , encoding, cb */) {
CryptoStream.prototype.pause = function() {
- debug('paused cleartext');
+ debug('paused ' + (this == this.pair.cleartext ? 'cleartext' : 'encrypted'));
this._writeState = false;
};
CryptoStream.prototype.resume = function() {
- debug('resumed cleartext');
+ debug('resume ' + (this == this.pair.cleartext ? 'cleartext' : 'encrypted'));
this._writeState = true;
this.pair._cycle();
};
@@ -220,6 +221,8 @@ CryptoStream.prototype._push = function() {
return;
}
+ this.pair._maybeInitFinished();
+
if (chunkBytes >= 0) {
bytesRead += chunkBytes;
}
@@ -238,6 +241,8 @@ CryptoStream.prototype._push = function() {
var chunk = pool.slice(0, bytesRead);
+ debug('emit "data" called with <<<<' + chunk.toString() + '>>>');
+
if (this._decoder) {
var string = this._decoder.write(chunk);
if (string.length) this.emit('data', string);
@@ -279,7 +284,7 @@ CryptoStream.prototype._pull = function() {
if (tmp === END_OF_FILE) {
// Sending EOF
if (this === this.pair.encrypted) {
- debug('end encrypted');
+ debug('end encrypted ' + this.pair.fd);
this.pair.cleartext._destroyAfterPush = true;
} else {
// CleartextStream
@@ -306,6 +311,8 @@ CryptoStream.prototype._pull = function() {
return;
}
+ this.pair._maybeInitFinished();
+
if (rv === 0 || rv < 0) {
this._pending.unshift(tmp);
this._pendingCallbacks.unshift(cb);
@@ -489,16 +496,25 @@ SecurePair.prototype._cycle = function() {
return;
}
+ var established = this._secureEstablished;
+
this.encrypted._pull();
this.cleartext._pull();
this.cleartext._push();
this.encrypted._push();
+ if (!established && this._secureEstablished) {
+ // If we were not established but now we are, let's cycle again.
+ this._cycle();
+ }
+};
+
+
+SecurePair.prototype._maybeInitFinished = function() {
if (this._ssl && !this._secureEstablished && this._ssl.isInitFinished()) {
this._secureEstablished = true;
debug('secure established');
this.emit('secure');
- this._cycle();
}
};
@@ -766,6 +782,7 @@ function pipe(pair, socket) {
pair.encrypted.pipe(socket);
socket.pipe(pair.encrypted);
+ pair.fd = socket.fd;
var cleartext = pair.cleartext;
cleartext.socket = socket;
cleartext.encrypted = pair.encrypted;
Please sign in to comment.
Something went wrong with that request. Please try again.