feat: added support for reading certificates from macOS system store #56599
+319
−7
Conversation
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
|
Review requested:
|
nodejs-github-bot
added
c++
timja
commented
Jan 14, 2025
timja
force-pushed
the
macos-system-ca-support
branch
from
8fd32ce to
f3c212c
Compare
addaleax
reviewed
Jan 14, 2025
| ReadSystemStoreCertificates(&combined_root_certs); | ||
| } | ||
|
|
||
| std::vector<Local<Value>> result(combined_root_certs.size()); |
There was a problem hiding this comment.
Would it be possible to use GitHub's suggestion feature please? I've tried a few options and not quite sure how to make it work.
| std::vector<X509*> system_root_certificates_X509; | ||
| for (int i = 0; i < count ; ++i) { | ||
| SecCertificateRef certRef = (SecCertificateRef) CFArrayGetValueAtIndex( | ||
| currAnchors, i); |
There was a problem hiding this comment.
This should use reinterpret_cast
There was a problem hiding this comment.
This fails to build with:
../../src/crypto/crypto_context.cc:447:33: error: reinterpret_cast from 'const void *' to 'SecCertificateRef' (aka '__SecCertificate *') casts away qualifiers
447 | SecCertificateRef certRef = reinterpret_cast<SecCertificateRef>(CFArrayGetValueAtIndex(
The linter hasn't asked me to change to it and it did in most of the other places.
src/crypto/crypto_context.cc
Outdated
Comment on lines
283
to
287
| char* issuer = reinterpret_cast<char *>(calloc(resultLen + 1, 1)); | ||
| BIO_read(bio, issuer, resultLen); | ||
| BIO_free_all(bio); | ||
|
|
||
| std::string str(issuer); |
There was a problem hiding this comment.
No need to doubly allocate the string, doing it like in stdStringFromCF should be fine
|
Would it be possible for someone to re-open the feature request please? #39657. It was closed due to being stale / no progress on it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #39657
Builds on #44532 but for macOS
TODO:
Happy to refactor heavily, I haven't used c++ before and I wrote it initially in objective c and ported it across.
This is heavily based upon chromium and some of OpenJDK along with a PR I have open with OpenJDK
Testing
I'm using https://github.com/timja/openjdk-intermediate-ca-reproducer as a reproducer:
Install the certificates, either by adding to keychain manually (see README) or using
/usr/bin/security(see what the test is doing in this PR.main.js
/Users/$USER/projects/node/out/Release/node --use-system-ca main.js