Skip to content

http: refactor to use validateHeaderName #46143

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

Merged
nodejs-github-bot merged 4 commits into from
Jan 17, 2023
Merged

http: refactor to use validateHeaderName #46143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8ab874
http: refactor to use `validateHeaderName`
deokjinkim Jan 9, 2023
a23f8f6
add `label` parameter to validateHeaderName
deokjinkim Jan 9, 2023
b1681f7
use `||` instead of default parameter
deokjinkim Jan 10, 2023
2546701
describe default value of label as string
deokjinkim Jan 11, 2023
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
http: refactor to use validateHeaderName 
Remove duplicate implementation by using validateHeaderName.
  • Loading branch information
@deokjinkim
deokjinkim committed Jan 9, 2023
commit d8ab8742a8eb0945d242db0b4bc78f5ecfd52f25
4 changes: 1 addition & 3 deletions lib/_http_outgoing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,9 +933,7 @@ OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {
field = key;
value = headers[key];
}
if (typeof field !== 'string' || !field || !checkIsHttpToken(field)) {
throw new ERR_INVALID_HTTP_TOKEN('Trailer name', field);
}
validateHeaderName(field);
Copy link
Contributor

@mscdex mscdex Jan 9, 2023

Choose a reason for hiding this comment

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

This function uses 'header name' instead of 'trailer name' in the error message which is probably not as helpful.

Copy link
Contributor

@ShogunPanda ShogunPanda Jan 9, 2023

Choose a reason for hiding this comment

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

I agree. Unless you make the error message customizable we cannot make this change.

Copy link
Contributor Author

@deokjinkim deokjinkim Jan 9, 2023

Choose a reason for hiding this comment

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

I understand your concern. So added label parameter to validateHeaderName. PTAL.


// Check if the field must be sent several times
const isArrayValue = ArrayIsArray(value);
Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-http-outgoing-proto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ assert.throws(() => {
}, {
code: 'ERR_INVALID_HTTP_TOKEN',
name: 'TypeError',
message: 'Trailer name must be a valid HTTP token ["あ"]'
});

assert.throws(() => {
Expand Down