Skip to content

tls: copy the Buffer object before using #8055

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
thefourtheye wants to merge 2 commits into from
Closed

tls: copy the Buffer object before using #8055

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ea0855
tls: copy the Buffer object before using
thefourtheye Aug 10, 2016
2ee392b
fix review comments
thefourtheye Aug 11, 2016
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
Next Next commit
tls: copy the Buffer object before using 
`convertNPNProtocols` uses the `protocols` buffer object as it is, and
if it is modified outside of core, it might have an impact. This patch
makes a copy of the buffer object, before using it.
  • Loading branch information
@thefourtheye
thefourtheye committed Aug 10, 2016
commit 2ea085595a946bc91a8eed426d25773429b623f1
3 changes: 2 additions & 1 deletion lib/tls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ exports.convertNPNProtocols = function(protocols, out) {
}
// If it's already a Buffer - store it
if (protocols instanceof Buffer) {
out.NPNProtocols = protocols;
// copy new buffer not to be modified by user
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Aug 10, 2016

Choose a reason for hiding this comment

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

Style nit: can you at least capitalize the comment and preferably punctuate it too? (I know the other comments don't add punctuation but why settle for average?)

Copy link
Copy Markdown
Contributor Author

@thefourtheye thefourtheye Aug 11, 2016

Choose a reason for hiding this comment

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

Done!

out.NPNProtocols = Buffer.from(protocols);
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Aug 10, 2016

Choose a reason for hiding this comment

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

This is inefficient (in a minor way) if protocols was originally an array. In that case two buffers are created, here and in convertProtocols().

Copy link
Copy Markdown
Contributor Author

@thefourtheye thefourtheye Aug 11, 2016

Choose a reason for hiding this comment

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

Done!

}
};

Expand Down
18 changes: 18 additions & 0 deletions test/parallel/test-tls-basic-validations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,21 @@ assert.throws(() => tls.createServer({ticketKeys: new Buffer(0)}),

assert.throws(() => tls.createSecurePair({}),
/Error: First argument must be a tls module SecureContext/);

{
const buffer = Buffer.from('abcd');
const out = {};
tls.convertALPNProtocols(buffer, out);
out.ALPNProtocols.write('efgh');
assert(buffer.equals(Buffer.from('abcd')));
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
}

{
const buffer = Buffer.from('abcd');
const out = {};
tls.convertNPNProtocols(buffer, out);
out.NPNProtocols.write('efgh');
assert(buffer.equals(Buffer.from('abcd')));
assert(out.NPNProtocols.equals(Buffer.from('efgh')));
}