Skip to content

Commit a221d7c

Browse files
committed
Handle bad message ordering - make it catchable. Fixes 3174
1 parent 50c06f9 commit a221d7c

File tree

3 files changed

+173
-37
lines changed

3 files changed

+173
-37
lines changed

packages/pg/lib/client.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,11 @@ class Client extends EventEmitter {
381381
this.activeQuery.handleCommandComplete(msg, this.connection)
382382
}
383383

384-
_handleParseComplete(msg) {
384+
_handleParseComplete() {
385+
if (this.activeQuery == null) {
386+
this.emit('error', new Error('Received parseComplete when not in parsing state'))
387+
return
388+
}
385389
// if a prepared statement has a name and properly parses
386390
// we track that its already been executed so we don't parse
387391
// it again on the same client

packages/pg/script/create-test-tables.js

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,26 @@ var people = [
3131
{ name: 'Zanzabar', age: 260 },
3232
]
3333

34-
var con = new pg.Client({
35-
user: args.user,
36-
password: args.password,
37-
host: args.host,
38-
port: args.port,
39-
database: args.database,
40-
})
41-
42-
con.connect((err) => {
43-
if (err) {
44-
throw err
45-
}
46-
47-
con.query(
48-
'DROP TABLE IF EXISTS person;' + ' CREATE TABLE person (id serial, name varchar(10), age integer)',
49-
(err) => {
50-
if (err) {
51-
throw err
52-
}
53-
54-
console.log('Created table person')
55-
console.log('Filling it with people')
56-
57-
con.query(
58-
'INSERT INTO person (name, age) VALUES' +
59-
people.map((person) => ` ('${person.name}', ${person.age})`).join(','),
60-
(err, result) => {
61-
if (err) {
62-
throw err
63-
}
64-
65-
console.log(`Inserted ${result.rowCount} people`)
66-
con.end()
67-
}
68-
)
69-
}
34+
async function run() {
35+
var con = new pg.Client({
36+
user: args.user,
37+
password: args.password,
38+
host: args.host,
39+
port: args.port,
40+
database: args.database,
41+
})
42+
console.log('creating test dataset')
43+
await con.connect()
44+
await con.query('DROP TABLE IF EXISTS person')
45+
await con.query('CREATE TABLE person (id serial, name varchar(10), age integer)')
46+
await con.query(
47+
'INSERT INTO person (name, age) VALUES' + people.map((person) => ` ('${person.name}', ${person.age})`).join(',')
7048
)
49+
await con.end()
50+
console.log('created test dataset')
51+
}
52+
53+
run().catch((e) => {
54+
console.log('setup failed', e)
55+
process.exit(255)
7156
})
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
const net = require('net')
2+
const buffers = require('../../test-buffers')
3+
const helper = require('../test-helper')
4+
const assert = require('assert')
5+
const cli = require('../../cli')
6+
7+
const suite = new helper.Suite()
8+
9+
const options = {
10+
host: 'localhost',
11+
port: Math.floor(Math.random() * 2000) + 2000,
12+
connectionTimeoutMillis: 2000,
13+
user: 'not',
14+
database: 'existing',
15+
}
16+
17+
const startMockServer = (port, timeout, callback) => {
18+
const sockets = new Set()
19+
20+
const server = net.createServer((socket) => {
21+
sockets.add(socket)
22+
socket.once('end', () => sockets.delete(socket))
23+
24+
socket.on('data', (data) => {
25+
// deny request for SSL
26+
if (data.length === 8) {
27+
socket.write(Buffer.from('N', 'utf8'))
28+
return
29+
// consider all authentication requests as good
30+
}
31+
// the initial message coming in has a 0 message type for authentication negotiation
32+
if (!data[0]) {
33+
socket.write(buffers.authenticationOk())
34+
// send ReadyForQuery `timeout` ms after authentication
35+
socket.write(buffers.readyForQuery())
36+
return
37+
// respond with our canned response
38+
}
39+
const code = data.toString('utf8', 0, 1)
40+
switch (code) {
41+
// parse
42+
case 'P':
43+
socket.write(buffers.parseComplete())
44+
socket.write(buffers.bindComplete())
45+
socket.write(buffers.rowDescription())
46+
socket.write(buffers.dataRow())
47+
socket.write(buffers.commandComplete('FOO BAR'))
48+
socket.write(buffers.readyForQuery())
49+
// this message is invalid, but sometimes sent out of order when using proxies or pg-bouncer
50+
setImmediate(() => {
51+
socket.write(buffers.parseComplete())
52+
})
53+
break
54+
case 'Q':
55+
socket.write(buffers.rowDescription())
56+
socket.write(buffers.dataRow())
57+
socket.write(buffers.commandComplete('FOO BAR'))
58+
socket.write(buffers.readyForQuery())
59+
// this message is invalid, but sometimes sent out of order when using proxies or pg-bouncer
60+
setImmediate(() => {
61+
socket.write(buffers.parseComplete())
62+
})
63+
default:
64+
// console.log('got code', code)
65+
}
66+
})
67+
})
68+
69+
const closeServer = () => {
70+
for (const socket of sockets) {
71+
socket.destroy()
72+
}
73+
return new Promise((resolve) => {
74+
server.close(resolve)
75+
})
76+
}
77+
78+
server.listen(port, options.host, () => callback(closeServer))
79+
}
80+
81+
const delay = (ms) =>
82+
new Promise((resolve) => {
83+
setTimeout(resolve, ms)
84+
})
85+
86+
suite.testAsync('Out of order parseComplete on simple query is catchable', async () => {
87+
const closeServer = await new Promise((resolve, reject) => {
88+
return startMockServer(options.port, 0, (closeServer) => resolve(closeServer))
89+
})
90+
const client = new helper.Client(options)
91+
await client.connect()
92+
93+
let errorHit = false
94+
client.on('error', () => {
95+
errorHit = true
96+
})
97+
98+
await client.query('SELECT NOW')
99+
await delay(50)
100+
await client.query('SELECT NOW')
101+
await delay(50)
102+
await client.query('SELECT NOW')
103+
await delay(50)
104+
await client.end()
105+
assert(cli.native || errorHit)
106+
107+
await closeServer()
108+
})
109+
110+
suite.testAsync('Out of order parseComplete on extended query is catchable', async () => {
111+
const closeServer = await new Promise((resolve, reject) => {
112+
return startMockServer(options.port, 0, (closeServer) => resolve(closeServer))
113+
})
114+
const client = new helper.Client(options)
115+
await client.connect()
116+
117+
let errorHit = false
118+
client.on('error', () => {
119+
errorHit = true
120+
})
121+
122+
await client.query('SELECT $1', ['foo'])
123+
// await client.end()
124+
await delay(100)
125+
assert(cli.native || errorHit)
126+
127+
await closeServer()
128+
})
129+
130+
suite.testAsync('Out of order parseComplete on pool is catchable', async () => {
131+
const closeServer = await new Promise((resolve, reject) => {
132+
return startMockServer(options.port, 0, (closeServer) => resolve(closeServer))
133+
})
134+
const pool = new helper.pg.Pool(options)
135+
136+
let errorHit = false
137+
pool.on('error', () => {
138+
errorHit = true
139+
})
140+
141+
await pool.query('SELECT $1', ['foo'])
142+
await delay(100)
143+
assert(cli.native || errorHit)
144+
145+
await pool.end()
146+
await closeServer()
147+
})

0 commit comments

Comments
 (0)