Skip to content

Support bracketed IPv6 hosts in connection strings #1233

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

Open
Nitjsefnie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support bracketed IPv6 hosts in connection strings #1233

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions cf/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,8 @@ function parseOptions(a, b) {
}

return {
host : Array.isArray(host) ? host : host.split(',').map(x => x.split(':')[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(x.split(':')[1] || port)),
host : Array.isArray(host) ? host : host.split(',').map(x => parseHost(x)[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(parseHost(x)[1] || port)),
path : o.path || host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port,
database : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
user : user,
Expand Down Expand Up @@ -501,6 +501,13 @@ function parseOptions(a, b) {
}
}

function parseHost(x) {
const bracketed = /^\[([^\]]+)\](?::(.*))?$/.exec(x)
return bracketed
? [bracketed[1], bracketed[2]]
: x.indexOf(':') !== x.lastIndexOf(':') ? [x] : x.split(':')
}

function tsa(o, url, env) {
const x = o.target_session_attrs || url.searchParams.get('target_session_attrs') || env.PGTARGETSESSIONATTRS
if (!x || ['read-write', 'read-only', 'primary', 'standby', 'prefer-standby'].includes(x))
Expand Down
11 changes: 9 additions & 2 deletions cjs/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,8 @@ function parseOptions(a, b) {
}

return {
host : Array.isArray(host) ? host : host.split(',').map(x => x.split(':')[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(x.split(':')[1] || port)),
host : Array.isArray(host) ? host : host.split(',').map(x => parseHost(x)[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(parseHost(x)[1] || port)),
path : o.path || host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port,
database : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
user : user,
Expand Down Expand Up @@ -500,6 +500,13 @@ function parseOptions(a, b) {
}
}

function parseHost(x) {
const bracketed = /^\[([^\]]+)\](?::(.*))?$/.exec(x)
return bracketed
? [bracketed[1], bracketed[2]]
: x.indexOf(':') !== x.lastIndexOf(':') ? [x] : x.split(':')
}

function tsa(o, url, env) {
const x = o.target_session_attrs || url.searchParams.get('target_session_attrs') || env.PGTARGETSESSIONATTRS
if (!x || ['read-write', 'read-only', 'primary', 'standby', 'prefer-standby'].includes(x))
Expand Down
35 changes: 35 additions & 0 deletions cjs/tests/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,6 +1901,41 @@ t('Multiple hosts', {
return [[id1, id2, id1].join(','), result.join(',')]
})

t('Bracketed IPv6 host with port', async() => {
const sql = postgres('postgres://[::1]:5432')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1"],[5432]]', actual]
})

t('Bracketed IPv6 host uses the default port', async() => {
const sql = postgres('postgres://[2001:db8::1]')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["2001:db8::1"],[5432]]', actual]
})

t('Multiple bracketed IPv6 hosts keep their ports', async() => {
const sql = postgres('postgres://[::1]:5432,[2001:db8::2]:5433')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1","2001:db8::2"],[5432,5433]]', actual]
})

t('Bare IPv6 host option uses the default port', async() => {
const sql = postgres({ host: '::1' })
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1"],[5432]]', actual]
})

t('Multiple hostname ports still parse', async() => {
const sql = postgres('postgres://h1:1,h2:2')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["h1","h2"],[1,2]]', actual]
})

t('Escaping supports schemas and tables', async() => {
await sql`create schema a`
await sql`create table a.b (c int)`
Expand Down
11 changes: 9 additions & 2 deletions deno/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,8 @@ function parseOptions(a, b) {
}

return {
host : Array.isArray(host) ? host : host.split(',').map(x => x.split(':')[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(x.split(':')[1] || port)),
host : Array.isArray(host) ? host : host.split(',').map(x => parseHost(x)[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(parseHost(x)[1] || port)),
path : o.path || host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port,
database : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
user : user,
Expand Down Expand Up @@ -501,6 +501,13 @@ function parseOptions(a, b) {
}
}

function parseHost(x) {
const bracketed = /^\[([^\]]+)\](?::(.*))?$/.exec(x)
return bracketed
? [bracketed[1], bracketed[2]]
: x.indexOf(':') !== x.lastIndexOf(':') ? [x] : x.split(':')
}

function tsa(o, url, env) {
const x = o.target_session_attrs || url.searchParams.get('target_session_attrs') || env.PGTARGETSESSIONATTRS
if (!x || ['read-write', 'read-only', 'primary', 'standby', 'prefer-standby'].includes(x))
Expand Down
35 changes: 35 additions & 0 deletions deno/tests/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,41 @@ t('Multiple hosts', {
return [[id1, id2, id1].join(','), result.join(',')]
})

t('Bracketed IPv6 host with port', async() => {
const sql = postgres('postgres://[::1]:5432')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1"],[5432]]', actual]
})

t('Bracketed IPv6 host uses the default port', async() => {
const sql = postgres('postgres://[2001:db8::1]')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["2001:db8::1"],[5432]]', actual]
})

t('Multiple bracketed IPv6 hosts keep their ports', async() => {
const sql = postgres('postgres://[::1]:5432,[2001:db8::2]:5433')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1","2001:db8::2"],[5432,5433]]', actual]
})

t('Bare IPv6 host option uses the default port', async() => {
const sql = postgres({ host: '::1' })
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1"],[5432]]', actual]
})

t('Multiple hostname ports still parse', async() => {
const sql = postgres('postgres://h1:1,h2:2')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["h1","h2"],[1,2]]', actual]
})

t('Escaping supports schemas and tables', async() => {
await sql`create schema a`
await sql`create table a.b (c int)`
Expand Down
11 changes: 9 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,8 @@ function parseOptions(a, b) {
}

return {
host : Array.isArray(host) ? host : host.split(',').map(x => x.split(':')[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(x.split(':')[1] || port)),
host : Array.isArray(host) ? host : host.split(',').map(x => parseHost(x)[0]),
port : Array.isArray(port) ? port : host.split(',').map(x => parseInt(parseHost(x)[1] || port)),
path : o.path || host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port,
database : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
user : user,
Expand Down Expand Up @@ -500,6 +500,13 @@ function parseOptions(a, b) {
}
}

function parseHost(x) {
const bracketed = /^\[([^\]]+)\](?::(.*))?$/.exec(x)
return bracketed
? [bracketed[1], bracketed[2]]
: x.indexOf(':') !== x.lastIndexOf(':') ? [x] : x.split(':')
}

function tsa(o, url, env) {
const x = o.target_session_attrs || url.searchParams.get('target_session_attrs') || env.PGTARGETSESSIONATTRS
if (!x || ['read-write', 'read-only', 'primary', 'standby', 'prefer-standby'].includes(x))
Expand Down
35 changes: 35 additions & 0 deletions tests/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1982,6 +1982,41 @@ t('Multiple hosts', {
return [[id1, id2, id1].join(','), result.join(',')]
})

t('Bracketed IPv6 host with port', async() => {
const sql = postgres('postgres://[::1]:5432')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1"],[5432]]', actual]
})

t('Bracketed IPv6 host uses the default port', async() => {
const sql = postgres('postgres://[2001:db8::1]')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["2001:db8::1"],[5432]]', actual]
})

t('Multiple bracketed IPv6 hosts keep their ports', async() => {
const sql = postgres('postgres://[::1]:5432,[2001:db8::2]:5433')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1","2001:db8::2"],[5432,5433]]', actual]
})

t('Bare IPv6 host option uses the default port', async() => {
const sql = postgres({ host: '::1' })
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["::1"],[5432]]', actual]
})

t('Multiple hostname ports still parse', async() => {
const sql = postgres('postgres://h1:1,h2:2')
const actual = JSON.stringify([sql.options.host, sql.options.port])
await sql.end()
return ['[["h1","h2"],[1,2]]', actual]
})

t('Escaping supports schemas and tables', async() => {
await sql`create schema a`
await sql`create table a.b (c int)`
Expand Down