Skip to content
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

Jump to bottom

test: simplify test-tls-set-secure-context #43878

Merged
merged 1 commit into from
Jul 24, 2022
Merged

test: simplify test-tls-set-secure-context #43878

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
70 changes: 28 additions & 42 deletions test/parallel/test-tls-set-secure-context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ if (!common.hasCrypto)
// secure context is changed.

const assert = require('assert');
const events = require('events');
const https = require('https');
const timers = require('timers/promises');
const fixtures = require('../common/fixtures');
const credentialOptions = [
{
Expand Down Expand Up @@ -43,10 +45,10 @@ server.listen(0, common.mustCall(() => {
const { port } = server.address();
const firstRequest = makeRequest(port, 1);

async function makeRemainingRequests() {
(async function makeRemainingRequests() {
// Wait until the first request is guaranteed to have been handled.
if (!firstResponse) {
return setImmediate(makeRemainingRequests);
while (!firstResponse) {
await timers.setImmediate();
}

assert.strictEqual(await makeRequest(port, 2), 'success');
Expand All @@ -56,54 +58,38 @@ server.listen(0, common.mustCall(() => {
const errorMessageRegex = common.hasOpenSSL3 ?
/^Error: self-signed certificate$/ :
/^Error: self signed certificate$/;
await assert.rejects(async () => {
await makeRequest(port, 3);
}, errorMessageRegex);
await assert.rejects(makeRequest(port, 3), errorMessageRegex);

server.setSecureContext(credentialOptions[0]);
assert.strictEqual(await makeRequest(port, 4), 'success');

server.setSecureContext(credentialOptions[1]);
firstResponse.end('fun!');
await assert.rejects(async () => {
await makeRequest(port, 5);
}, errorMessageRegex);
await assert.rejects(makeRequest(port, 5), errorMessageRegex);

assert.strictEqual(await firstRequest, 'multi-request-success-fun!');
server.close();
}

makeRemainingRequests();
})().then(common.mustCall());
}));

function makeRequest(port, id) {
return new Promise((resolve, reject) => {
const options = {
rejectUnauthorized: true,
ca: credentialOptions[0].ca,
servername: 'agent1',
headers: { id },
agent: new https.Agent()
};

let errored = false;
https.get(`https://localhost:${port}`, options, (res) => {
let response = '';

res.setEncoding('utf8');

res.on('data', (chunk) => {
response += chunk;
});

res.on('end', common.mustCall(() => {
resolve(response);
}));
}).on('error', (err) => {
errored = true;
reject(err);
}).on('finish', () => {
assert.strictEqual(errored, false);
});
});
async function makeRequest(port, id) {
const options = {
rejectUnauthorized: true,
ca: credentialOptions[0].ca,
servername: 'agent1',
headers: { id },
agent: new https.Agent()
};

const req = https.get(`https://localhost:${port}`, options);

let errored = false;
req.on('error', () => errored = true);
req.on('finish', () => assert.strictEqual(errored, false));

const [res] = await events.once(req, 'response');
res.setEncoding('utf8');
let response = '';
for await (const chunk of res) response += chunk;
return response;
Comment on lines +92 to +94
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let response = '';
for await (const chunk of res) response += chunk;
return response;
const response = await res.toArray();
return response.join('')

}