-
Notifications
You must be signed in to change notification settings - Fork 99
Incomplete file when uploaded over TLS data connection #123
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,25 +2,7 @@ | |
| // https://github.com/andris9/rai/blob/master/lib/starttls.js | ||
| // (This code is MIT licensed.) | ||
|
|
||
| // | ||
| // Target API: | ||
| // | ||
| // var s = require('net').createStream(25, 'smtp.example.com'); | ||
| // s.on('connect', function() { | ||
| // require('starttls')(s, options, function() { | ||
| // if (!s.authorized) { | ||
| // s.destroy(); | ||
| // return; | ||
| // } | ||
| // | ||
| // s.end("hello world\n"); | ||
| // }); | ||
| // }); | ||
| // | ||
| // | ||
|
|
||
| var tls = require('tls'); | ||
| var crypto = require('crypto'); | ||
|
|
||
| // From Node docs for TLS module. | ||
| var RECOMMENDED_CIPHERS = 'ECDHE-RSA-AES256-SHA:AES256-SHA:RC4-SHA:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM'; | ||
|
|
@@ -33,111 +15,46 @@ function starttlsClient(socket, options, callback) { | |
| } | ||
|
|
||
| function starttls(socket, options, callback, isServer) { | ||
| var sslcontext; | ||
|
|
||
| var opts = {}; | ||
|
|
||
| Object.keys(options).forEach(function(key) { | ||
| opts[key] = options[key]; | ||
| }); | ||
| if (!opts.ciphers) { | ||
| opts.ciphers = RECOMMENDED_CIPHERS; | ||
| } | ||
| opts.isServer = isServer; | ||
| opts.secureContext = tls.createSecureContext(opts); | ||
|
|
||
| socket.removeAllListeners('data'); | ||
| if (tls.createSecureContext) { | ||
| sslcontext = tls.createSecureContext(opts); | ||
| } else { | ||
| sslcontext = crypto.createCredentials(opts); | ||
| } | ||
| var pair = tls.createSecurePair(sslcontext, isServer); | ||
| var cleartext = pipe(pair, socket); | ||
|
|
||
| var secureSocket = new tls.TLSSocket(socket, opts); | ||
| var erroredOut = false; | ||
| pair.on('secure', function() { | ||
|
|
||
| // NodeJS documentation bug: secure vs secureConnect | ||
| // https://github.com/nodejs/node/issues/10555 | ||
| secureSocket.on('secure', function() { | ||
| if (erroredOut) { | ||
| pair.end(); | ||
| secureSocket.end(); | ||
| return; | ||
| } | ||
|
|
||
| var verifyError = (pair._ssl || pair.ssl).verifyError(); | ||
|
|
||
| if (verifyError) { | ||
| cleartext.authorized = false; | ||
| cleartext.authorizationError = verifyError; | ||
| var authError = secureSocket.ssl.verifyError(); | ||
| if (authError) { | ||
| secureSocket.authorized = false; | ||
| secureSocket.authorizationError = authError; | ||
| } else { | ||
| cleartext.authorized = true; | ||
| secureSocket.authorized = true; | ||
|
||
| } | ||
|
|
||
| callback(null, cleartext); | ||
| callback(null, secureSocket); | ||
| }); | ||
| pair.once('error', function(err) { | ||
| secureSocket.once('error', function(err) { | ||
| if (!erroredOut) { | ||
| erroredOut = true; | ||
| callback(err); | ||
| } | ||
| }); | ||
|
|
||
| cleartext._controlReleased = true; | ||
| pair; | ||
| } | ||
|
|
||
| function forwardEvents(events, emitterSource, emitterDestination) { | ||
| var map = []; | ||
|
|
||
| for (var i = 0, len = events.length; i < len; i++) { | ||
| var name = events[i]; | ||
|
|
||
| var handler = forwardEvent.bind(emitterDestination, name); | ||
|
|
||
| map.push(name); | ||
| emitterSource.on(name, handler); | ||
| } | ||
|
|
||
| return map; | ||
| } | ||
|
|
||
| function forwardEvent() { | ||
| this.emit.apply(this, arguments); | ||
| } | ||
|
|
||
| function removeEvents(map, emitterSource) { | ||
| for (var i = 0, len = map.length; i < len; i++) { | ||
| emitterSource.removeAllListeners(map[i]); | ||
| } | ||
| } | ||
|
|
||
| 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; | ||
| cleartext.authorized = false; | ||
|
|
||
| function onerror(e) { | ||
| if (cleartext._controlReleased) { | ||
| cleartext.emit('error', e); | ||
| } | ||
| } | ||
|
|
||
| var map = forwardEvents(['timeout', 'end', 'close', 'drain', 'error'], socket, cleartext); | ||
|
|
||
| function onclose() { | ||
| socket.removeListener('error', onerror); | ||
| socket.removeListener('close', onclose); | ||
| removeEvents(map, socket); | ||
| } | ||
|
|
||
| socket.on('error', onerror); | ||
| socket.on('close', onclose); | ||
|
|
||
| return cleartext; | ||
| } | ||
|
|
||
| exports.starttlsServer = starttlsServer; | ||
| exports.starttlsClient = starttlsClient; | ||
| exports.RECOMMENDED_CIPHERS = RECOMMENDED_CIPHERS; | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:-(. I will document the API.