-
Notifications
You must be signed in to change notification settings - Fork 28.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tls: do not crash on STARTTLS when OCSP requested
`TLSSocket` should not have a hard dependency on `tls.Server`, since it may be running without it in cases like `STARTTLS`. Fix: #10704 PR-URL: #10706 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
- Loading branch information
Showing
2 changed files
with
60 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
'use strict'; | ||
|
||
// Test asynchronous SNI+OCSP on TLSSocket created with `server` set to | ||
// `net.Server` instead of `tls.Server` | ||
|
||
const common = require('../common'); | ||
|
||
if (!common.hasCrypto) { | ||
common.skip('missing crypto'); | ||
return; | ||
} | ||
|
||
const assert = require('assert'); | ||
const fs = require('fs'); | ||
const net = require('net'); | ||
const tls = require('tls'); | ||
|
||
const key = fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'); | ||
const cert = fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'); | ||
|
||
const server = net.createServer(common.mustCall((s) => { | ||
const tlsSocket = new tls.TLSSocket(s, { | ||
isServer: true, | ||
server: server, | ||
|
||
secureContext: tls.createSecureContext({ | ||
key: key, | ||
cert: cert | ||
}), | ||
|
||
SNICallback: common.mustCall((hostname, callback) => { | ||
assert.strictEqual(hostname, 'test.test'); | ||
|
||
callback(null, null); | ||
}) | ||
}); | ||
|
||
tlsSocket.on('secure', common.mustCall(() => { | ||
tlsSocket.end(); | ||
server.close(); | ||
})); | ||
})).listen(0, () => { | ||
const opts = { | ||
servername: 'test.test', | ||
port: server.address().port, | ||
rejectUnauthorized: false, | ||
requestOCSP: true | ||
}; | ||
|
||
tls.connect(opts, function() { | ||
this.end(); | ||
}); | ||
}); |