Skip to content

test: move client renegotiation tests to parallel #25757

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

test: move client renegotiation tests to parallel #25757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions test/pummel/test-https-ci-reneg-attack.js → .../test-https-client-renegotiation-limit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ const LIMITS = [0, 1, 2, 3, 5, 10, 16];
function test(next) {
const options = {
cert: fixtures.readSync('test_cert.pem'),
key: fixtures.readSync('test_key.pem')
key: fixtures.readSync('test_key.pem'),
};

const server = https.createServer(options, function(req, res) {
const server = https.createServer(options, (req, res) => {
const conn = req.connection;
conn.on('error', function(err) {
conn.on('error', (err) => {
console.error(`Caught exception: ${err}`);
assert(/TLS session renegotiation attack/.test(err));
conn.destroy();
});
res.end('ok');
});

server.listen(0, function() {
server.listen(0, () => {
const agent = https.Agent({
keepAlive: true,
});
Expand All @@ -71,22 +71,22 @@ function test(next) {

const options = {
rejectUnauthorized: false,
agent
agent,
};

const { port } = server.address();

https.get(`https://localhost:${port}/`, options, (res) => {
client = res.socket;

client.on('close', function(hadErr) {
client.on('close', (hadErr) => {
assert.strictEqual(hadErr, false);
assert.strictEqual(renegs, tls.CLIENT_RENEG_LIMIT + 1);
server.close();
process.nextTick(next);
});

client.on('error', function(err) {
client.on('error', (err) => {
console.log('CLIENT ERR', err);
throw err;
});
Expand Down
16 changes: 8 additions & 8 deletions test/pummel/test-tls-ci-reneg-attack.js → ...el/test-tls-client-renegotiation-limit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,40 +47,40 @@ const LIMITS = [0, 1, 2, 3, 5, 10, 16];
function test(next) {
const options = {
cert: fixtures.readSync('test_cert.pem'),
key: fixtures.readSync('test_key.pem')
key: fixtures.readSync('test_key.pem'),
};

const server = tls.createServer(options, function(conn) {
conn.on('error', function(err) {
const server = tls.createServer(options, (conn) => {
conn.on('error', (err) => {
console.error(`Caught exception: ${err}`);
assert(/TLS session renegotiation attack/.test(err));
conn.destroy();
});
conn.pipe(conn);
});

server.listen(0, function() {
server.listen(0, () => {
const options = {
host: server.address().host,
port: server.address().port,
rejectUnauthorized: false
rejectUnauthorized: false,
};
const client = tls.connect(options, spam);

let renegs = 0;

client.on('close', function() {
client.on('close', () => {
assert.strictEqual(renegs, tls.CLIENT_RENEG_LIMIT + 1);
server.close();
process.nextTick(next);
});

client.on('error', function(err) {
client.on('error', (err) => {
console.log('CLIENT ERR', err);
throw err;
});

client.on('close', function(hadErr) {
client.on('close', (hadErr) => {
assert.strictEqual(hadErr, false);
});

Expand Down