Skip to content

Commit

Permalink
fix: close tls socket on encryption failure (#2724)
Browse files Browse the repository at this point in the history
When we can't read the incoming certificate, ensure the underlying
socket is destroyed.
  • Loading branch information
achingbrain authored Sep 25, 2024
1 parent fa83ee1 commit 9800384
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions packages/connection-encrypter-tls/src/tls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ export class TLS implements ConnectionEncrypter {
})
}

return new Promise((resolve, reject) => {
return new Promise<SecuredConnection<Stream>>((resolve, reject) => {
options?.signal?.addEventListener('abort', () => {
socket.destroy(new HandshakeTimeoutError())
const err = new HandshakeTimeoutError()
socket.destroy(err)
reject(err)
})

const verifyRemote = (): void => {
Expand All @@ -109,10 +111,14 @@ export class TLS implements ConnectionEncrypter {
socket.on('error', (err: Error) => {
reject(err)
})
socket.once('secure', (evt) => {
socket.once('secure', () => {
this.log('verifying remote certificate')
verifyRemote()
})
})
.catch(err => {
socket.destroy(err)
throw err
})
}
}

0 comments on commit 9800384

Please sign in to comment.