-
Notifications
You must be signed in to change notification settings - Fork 30k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
src: add cve reverts and associated tests
Signed-off-by: Michael Dawson <[email protected]> Co-authored-by: Akshay K <[email protected]> Backport-PR-URL: nodejs-private/node-private#303 PR-URL: nodejs-private/node-private#300 Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Rich Trott <[email protected]>
- Loading branch information
1 parent
1f7fdff
commit df3141f
Showing
6 changed files
with
515 additions
and
3 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
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,50 @@ | ||
| // Flags: --security-revert=CVE-2021-44531 | ||
| 'use strict'; | ||
| const common = require('../common'); | ||
|
|
||
| if (!common.hasCrypto) | ||
| common.skip('missing crypto'); | ||
|
|
||
| const assert = require('assert'); | ||
| const util = require('util'); | ||
|
|
||
| const tls = require('tls'); | ||
|
|
||
| const tests = [ | ||
| // Likewise for "URI:" Subject Alternative Names. | ||
| // See also https://github.com/nodejs/node/issues/8108. | ||
| { | ||
| host: '8.8.8.8', | ||
| cert: { subject: { CN: '8.8.8.8' }, subjectaltname: 'URI:http://8.8.8.8/' }, | ||
| error: 'IP: 8.8.8.8 is not in the cert\'s list: ' | ||
| }, | ||
| // Empty Subject w/URI name | ||
| { | ||
| host: 'a.b.a.com', cert: { | ||
| subjectaltname: 'URI:http://a.b.a.com/', | ||
| } | ||
| }, | ||
| // URI names | ||
| { | ||
| host: 'a.b.a.com', cert: { | ||
| subjectaltname: 'URI:http://a.b.a.com/', | ||
| subject: {} | ||
| } | ||
| }, | ||
| { | ||
| host: 'a.b.a.com', cert: { | ||
| subjectaltname: 'URI:http://*.b.a.com/', | ||
| subject: {} | ||
| }, | ||
| error: 'Host: a.b.a.com. is not in the cert\'s altnames: ' + | ||
| 'URI:http://*.b.a.com/' | ||
| }, | ||
| ]; | ||
|
|
||
| tests.forEach(function(test, i) { | ||
| const err = tls.checkServerIdentity(test.host, test.cert); | ||
| assert.strictEqual(err && err.reason, | ||
| test.error, | ||
| `Test# ${i} failed: ${util.inspect(test)} \n` + | ||
| `${test.error} != ${(err && err.reason)}`); | ||
| }); |
54 changes: 54 additions & 0 deletions
54
test/parallel/test-tls-0-dns-altname-revert-CVE-2021-44532.js
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,54 @@ | ||
| // Copyright Joyent, Inc. and other Node contributors. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a | ||
| // copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to permit | ||
| // persons to whom the Software is furnished to do so, subject to the | ||
| // following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included | ||
| // in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN | ||
| // NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE | ||
| // USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // Flags: --security-revert=CVE-2021-44532 | ||
| 'use strict'; | ||
| const common = require('../common'); | ||
| if (!common.hasCrypto) | ||
| common.skip('missing crypto'); | ||
|
|
||
| // Check getPeerCertificate can properly handle '\0' for fix CVE-2009-2408. | ||
|
|
||
| const assert = require('assert'); | ||
| const tls = require('tls'); | ||
| const fixtures = require('../common/fixtures'); | ||
|
|
||
| const server = tls.createServer({ | ||
| key: fixtures.readSync(['0-dns', '0-dns-key.pem']), | ||
| cert: fixtures.readSync(['0-dns', '0-dns-cert.pem']) | ||
| }, common.mustCall((c) => { | ||
| c.once('data', common.mustCall(() => { | ||
| c.destroy(); | ||
| server.close(); | ||
| })); | ||
| })).listen(0, common.mustCall(() => { | ||
| const c = tls.connect(server.address().port, { | ||
| rejectUnauthorized: false | ||
| }, common.mustCall(() => { | ||
| const cert = c.getPeerCertificate(); | ||
| assert.strictEqual(cert.subjectaltname, | ||
| 'DNS:good.example.org\0.evil.example.com, ' + | ||
| 'DNS:just-another.example.com, ' + | ||
| 'IP Address:8.8.8.8, ' + | ||
| 'IP Address:8.8.4.4, ' + | ||
| 'DNS:last.example.com'); | ||
| c.write('ok'); | ||
| })); | ||
| })); |
Oops, something went wrong.