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.

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

fix: more informative error message to tell that the server doesn't match http/1.1 protocol #2055

Merged
merged 4 commits into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,10 @@ class Parser {
/* istanbul ignore else: difficult to make a test case for */
if (ptr) {
const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0)
message = Buffer.from(llhttp.memory.buffer, ptr, len).toString()
message =
'Response does not match the HTTP/1.1 protocol (' +
Buffer.from(llhttp.memory.buffer, ptr, len).toString() +
')'
}
throw new HTTPParserError(message, constants.ERROR[ret], data.slice(offset))
}
Expand Down
32 changes: 32 additions & 0 deletions test/http2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use strict'

const { test } = require('tap')
const { Client, errors } = require('..')
const { createSecureServer } = require('http2')
const pem = require('https-pem')

test('throw http2 not supported error', (t) => {
t.plan(1)

const server = createSecureServer({ key: pem.key, cert: pem.cert }, (req, res) => {
res.stream.respond({ 'content-type': 'text/plain' })
res.stream.end('hello')
}).on('unknownProtocol', (socket) => {
// continue sending data in http2 to our http1.1 client to trigger error
socket.write('PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n')
})
t.teardown(server.close.bind(server))

server.listen(0, () => {
const client = new Client(`https://localhost:${server.address().port}`, {
tls: {
rejectUnauthorized: false
}
})
t.teardown(client.close.bind(client))

client.request({ path: '/', method: 'GET' }, (err, data) => {
t.type(err, errors.HTTPParserError)
})
})
})
7 changes: 3 additions & 4 deletions test/parser-issues.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const net = require('net')
const { test } = require('tap')
const { Client } = require('..')
const { Client, errors } = require('..')

test('https://github.com/mcollina/undici/issues/268', (t) => {
t.plan(2)
Expand Down Expand Up @@ -40,7 +40,7 @@ test('https://github.com/mcollina/undici/issues/268', (t) => {
})

test('parser fail', (t) => {
t.plan(3)
t.plan(2)

const server = net.createServer(socket => {
socket.write('HTT/1.1 200 OK\r\n')
Expand All @@ -56,8 +56,7 @@ test('parser fail', (t) => {
path: '/'
}, (err, data) => {
t.ok(err)
t.equal(err.code, 'HPE_INVALID_CONSTANT')
t.equal(err.message, 'Expected HTTP/')
t.type(err, errors.HTTPParserError)
})
})
})
Expand Down