From 0066fdb0720ce02c02f4541496d326676143600f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 25 Dec 2018 22:22:50 -0800 Subject: test: move test-tls-securepair-client out of pummel test-tls-securepair-client does not seem to need to be in the pummel directory. Move it to sequential. (It can't go into parallel because it uses common.PORT and therefore might conflict with another test that is using system-assigned available ports.) PR-URL: https://github.com/nodejs/node/pull/25222 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Denys Otrishko Reviewed-By: James M Snell --- test/pummel/test-tls-securepair-client.js | 181 -------------------------- test/sequential/test-tls-securepair-client.js | 181 ++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 181 deletions(-) delete mode 100644 test/pummel/test-tls-securepair-client.js create mode 100644 test/sequential/test-tls-securepair-client.js diff --git a/test/pummel/test-tls-securepair-client.js b/test/pummel/test-tls-securepair-client.js deleted file mode 100644 index eec65af8a1..0000000000 --- a/test/pummel/test-tls-securepair-client.js +++ /dev/null @@ -1,181 +0,0 @@ -// 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. - -'use strict'; - -const common = require('../common'); - -if (!common.opensslCli) - common.skip('node compiled without OpenSSL CLI.'); - -if (!common.hasCrypto) - common.skip('missing crypto'); - -if (common.isWindows) - common.skip('test does not work on Windows'); // ...but it should! - -const net = require('net'); -const assert = require('assert'); -const fixtures = require('../common/fixtures'); -const tls = require('tls'); -const spawn = require('child_process').spawn; - -test1(); - -// simple/test-tls-securepair-client -function test1() { - test('agent.key', 'agent.crt', null, test2); -} - -// simple/test-tls-ext-key-usage -function test2() { - function check(pair) { - // "TLS Web Client Authentication" - assert.strictEqual(pair.cleartext.getPeerCertificate().ext_key_usage.length, - 1); - assert.strictEqual(pair.cleartext.getPeerCertificate().ext_key_usage[0], - '1.3.6.1.5.5.7.3.2'); - } - test('keys/agent4-key.pem', 'keys/agent4-cert.pem', check); -} - -function test(keyPath, certPath, check, next) { - const key = fixtures.readSync(keyPath).toString(); - const cert = fixtures.readSync(certPath).toString(); - - const server = spawn(common.opensslCli, ['s_server', - '-accept', common.PORT, - '-cert', fixtures.path(certPath), - '-key', fixtures.path(keyPath)]); - server.stdout.pipe(process.stdout); - server.stderr.pipe(process.stdout); - - - let state = 'WAIT-ACCEPT'; - - let serverStdoutBuffer = ''; - server.stdout.setEncoding('utf8'); - server.stdout.on('data', function(s) { - serverStdoutBuffer += s; - console.log(state); - switch (state) { - case 'WAIT-ACCEPT': - if (/ACCEPT/.test(serverStdoutBuffer)) { - // Give s_server half a second to start up. - setTimeout(startClient, 500); - state = 'WAIT-HELLO'; - } - break; - - case 'WAIT-HELLO': - if (/hello/.test(serverStdoutBuffer)) { - - // End the current SSL connection and exit. - // See s_server(1ssl). - server.stdin.write('Q'); - - state = 'WAIT-SERVER-CLOSE'; - } - break; - - default: - break; - } - }); - - - const timeout = setTimeout(function() { - server.kill(); - process.exit(1); - }, 5000); - - let gotWriteCallback = false; - let serverExitCode = -1; - - server.on('exit', function(code) { - serverExitCode = code; - clearTimeout(timeout); - if (next) next(); - }); - - - function startClient() { - const s = new net.Stream(); - - const sslcontext = tls.createSecureContext({ key, cert }); - sslcontext.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA'); - - const pair = tls.createSecurePair(sslcontext, false); - - assert.ok(pair.encrypted.writable); - assert.ok(pair.cleartext.writable); - - pair.encrypted.pipe(s); - s.pipe(pair.encrypted); - - s.connect(common.PORT); - - s.on('connect', function() { - console.log('client connected'); - setTimeout(function() { - pair.cleartext.write('hello\r\n', function() { - gotWriteCallback = true; - }); - }, 500); - }); - - pair.on('secure', function() { - console.log('client: connected+secure!'); - console.log('client pair.cleartext.getPeerCertificate(): %j', - pair.cleartext.getPeerCertificate()); - console.log('client pair.cleartext.getCipher(): %j', - pair.cleartext.getCipher()); - if (check) check(pair); - }); - - pair.cleartext.on('data', function(d) { - console.log('cleartext: %s', d.toString()); - }); - - s.on('close', function() { - console.log('client close'); - }); - - pair.encrypted.on('error', function(err) { - console.log(`encrypted error: ${err}`); - }); - - s.on('error', function(err) { - console.log(`socket error: ${err}`); - }); - - pair.on('error', function(err) { - console.log(`secure error: ${err}`); - }); - } - - - process.on('exit', function() { - assert.strictEqual(serverExitCode, 0); - assert.strictEqual(state, 'WAIT-SERVER-CLOSE'); - assert.ok(gotWriteCallback); - }); -} diff --git a/test/sequential/test-tls-securepair-client.js b/test/sequential/test-tls-securepair-client.js new file mode 100644 index 0000000000..eec65af8a1 --- /dev/null +++ b/test/sequential/test-tls-securepair-client.js @@ -0,0 +1,181 @@ +// 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. + +'use strict'; + +const common = require('../common'); + +if (!common.opensslCli) + common.skip('node compiled without OpenSSL CLI.'); + +if (!common.hasCrypto) + common.skip('missing crypto'); + +if (common.isWindows) + common.skip('test does not work on Windows'); // ...but it should! + +const net = require('net'); +const assert = require('assert'); +const fixtures = require('../common/fixtures'); +const tls = require('tls'); +const spawn = require('child_process').spawn; + +test1(); + +// simple/test-tls-securepair-client +function test1() { + test('agent.key', 'agent.crt', null, test2); +} + +// simple/test-tls-ext-key-usage +function test2() { + function check(pair) { + // "TLS Web Client Authentication" + assert.strictEqual(pair.cleartext.getPeerCertificate().ext_key_usage.length, + 1); + assert.strictEqual(pair.cleartext.getPeerCertificate().ext_key_usage[0], + '1.3.6.1.5.5.7.3.2'); + } + test('keys/agent4-key.pem', 'keys/agent4-cert.pem', check); +} + +function test(keyPath, certPath, check, next) { + const key = fixtures.readSync(keyPath).toString(); + const cert = fixtures.readSync(certPath).toString(); + + const server = spawn(common.opensslCli, ['s_server', + '-accept', common.PORT, + '-cert', fixtures.path(certPath), + '-key', fixtures.path(keyPath)]); + server.stdout.pipe(process.stdout); + server.stderr.pipe(process.stdout); + + + let state = 'WAIT-ACCEPT'; + + let serverStdoutBuffer = ''; + server.stdout.setEncoding('utf8'); + server.stdout.on('data', function(s) { + serverStdoutBuffer += s; + console.log(state); + switch (state) { + case 'WAIT-ACCEPT': + if (/ACCEPT/.test(serverStdoutBuffer)) { + // Give s_server half a second to start up. + setTimeout(startClient, 500); + state = 'WAIT-HELLO'; + } + break; + + case 'WAIT-HELLO': + if (/hello/.test(serverStdoutBuffer)) { + + // End the current SSL connection and exit. + // See s_server(1ssl). + server.stdin.write('Q'); + + state = 'WAIT-SERVER-CLOSE'; + } + break; + + default: + break; + } + }); + + + const timeout = setTimeout(function() { + server.kill(); + process.exit(1); + }, 5000); + + let gotWriteCallback = false; + let serverExitCode = -1; + + server.on('exit', function(code) { + serverExitCode = code; + clearTimeout(timeout); + if (next) next(); + }); + + + function startClient() { + const s = new net.Stream(); + + const sslcontext = tls.createSecureContext({ key, cert }); + sslcontext.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA'); + + const pair = tls.createSecurePair(sslcontext, false); + + assert.ok(pair.encrypted.writable); + assert.ok(pair.cleartext.writable); + + pair.encrypted.pipe(s); + s.pipe(pair.encrypted); + + s.connect(common.PORT); + + s.on('connect', function() { + console.log('client connected'); + setTimeout(function() { + pair.cleartext.write('hello\r\n', function() { + gotWriteCallback = true; + }); + }, 500); + }); + + pair.on('secure', function() { + console.log('client: connected+secure!'); + console.log('client pair.cleartext.getPeerCertificate(): %j', + pair.cleartext.getPeerCertificate()); + console.log('client pair.cleartext.getCipher(): %j', + pair.cleartext.getCipher()); + if (check) check(pair); + }); + + pair.cleartext.on('data', function(d) { + console.log('cleartext: %s', d.toString()); + }); + + s.on('close', function() { + console.log('client close'); + }); + + pair.encrypted.on('error', function(err) { + console.log(`encrypted error: ${err}`); + }); + + s.on('error', function(err) { + console.log(`socket error: ${err}`); + }); + + pair.on('error', function(err) { + console.log(`secure error: ${err}`); + }); + } + + + process.on('exit', function() { + assert.strictEqual(serverExitCode, 0); + assert.strictEqual(state, 'WAIT-SERVER-CLOSE'); + assert.ok(gotWriteCallback); + }); +} -- cgit v1.2.3