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.

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

pass servername to tls.connect #543

Closed
wants to merge 6 commits into from
Closed

pass servername to tls.connect #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1d1aba
pass servername to tls.connect
chaporgin Jan 16, 2023
12a79ea
Update connection.js
chaporgin Jan 18, 2023
63c4405
fixing tests
chaporgin Feb 15, 2023
0e9b102
fixing tests
chaporgin Feb 15, 2023
a58d2ea
check tests
chaporgin Feb 20, 2023
7c8c686
host is always an array
chaporgin Feb 20, 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
38 changes: 27 additions & 11 deletions cjs/src/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,25 +256,41 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
socket.destroy()
}

function firstAddrIsIP(address) {
if (net.isIP) {
return net.isIP(address) !== 0
}
if (address.length === 0) {
return false
}
// fallback to our own implementation.
const firstLetter = address.charAt(0)
return firstLetter === ':' || !isNaN(firstLetter)
}

async function secure() {
write(SSLRequest)
const canSSL = await new Promise(r => socket.once('data', x => r(x[0] === 83))) // S

if (!canSSL && ssl === 'prefer')
return connected()

socket.removeAllListeners()
socket = tls.connect({
const sslOptions = {
socket,
...(ssl === 'require' || ssl === 'allow' || ssl === 'prefer'
? { rejectUnauthorized: false }
: ssl === 'verify-full'
? {}
: typeof ssl === 'object'
? ssl
: {}
)
})
}

if (typeof ssl === 'object') {
Object.assign(sslOptions, ssl)
} else if (['require', 'allow', 'prefer'].includes(ssl)) {
sslOptions.rejectUnauthorized = false
}

if (!options.servername && !firstAddrIsIP(host[0])) {
sslOptions.servername = host[0]
}

socket.removeAllListeners()
socket = tls.connect(sslOptions)
socket.on('secureConnect', connected)
socket.on('error', error)
socket.on('close', closed)
Expand Down
38 changes: 27 additions & 11 deletions deno/src/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,25 +260,41 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
socket.destroy()
}

function firstAddrIsIP(address) {
if (net.isIP) {
return net.isIP(address) !== 0
}
if (address.length === 0) {
return false
}
// fallback to our own implementation.
const firstLetter = address.charAt(0)
return firstLetter === ':' || !isNaN(firstLetter)
}

async function secure() {
write(SSLRequest)
const canSSL = await new Promise(r => socket.once('data', x => r(x[0] === 83))) // S

if (!canSSL && ssl === 'prefer')
return connected()

socket.removeAllListeners()
socket = tls.connect({
const sslOptions = {
socket,
...(ssl === 'require' || ssl === 'allow' || ssl === 'prefer'
? { rejectUnauthorized: false }
: ssl === 'verify-full'
? {}
: typeof ssl === 'object'
? ssl
: {}
)
})
}

if (typeof ssl === 'object') {
Object.assign(sslOptions, ssl)
} else if (['require', 'allow', 'prefer'].includes(ssl)) {
sslOptions.rejectUnauthorized = false
}

if (!options.servername && !firstAddrIsIP(host[0])) {
sslOptions.servername = host[0]
}

socket.removeAllListeners()
socket = tls.connect(sslOptions)
socket.on('secureConnect', connected)
socket.on('error', error)
socket.on('close', closed)
Expand Down
38 changes: 27 additions & 11 deletions src/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,25 +256,41 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
socket.destroy()
}

function firstAddrIsIP(address) {
if (net.isIP) {
return net.isIP(address) !== 0
}
if (address.length === 0) {
return false
}
// fallback to our own implementation.
const firstLetter = address.charAt(0)
return firstLetter === ':' || !isNaN(firstLetter)
}

async function secure() {
write(SSLRequest)
const canSSL = await new Promise(r => socket.once('data', x => r(x[0] === 83))) // S

if (!canSSL && ssl === 'prefer')
return connected()

socket.removeAllListeners()
socket = tls.connect({
const sslOptions = {
socket,
...(ssl === 'require' || ssl === 'allow' || ssl === 'prefer'
? { rejectUnauthorized: false }
: ssl === 'verify-full'
? {}
: typeof ssl === 'object'
? ssl
: {}
)
})
}

if (typeof ssl === 'object') {
Object.assign(sslOptions, ssl)
} else if (['require', 'allow', 'prefer'].includes(ssl)) {
sslOptions.rejectUnauthorized = false
}

if (!options.servername && !firstAddrIsIP(host[0])) {
sslOptions.servername = host[0]
}

socket.removeAllListeners()
socket = tls.connect(sslOptions)
socket.on('secureConnect', connected)
socket.on('error', error)
socket.on('close', closed)
Expand Down