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.
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
feat: promisify dialog.showCertificateTrustDialog() #17181
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,6 @@ | |
|
||
#include <wincrypt.h> | ||
|
||
#include "base/callback.h" | ||
#include "net/cert/cert_database.h" | ||
#include "net/cert/x509_util_win.h" | ||
|
||
|
@@ -57,14 +56,16 @@ CERT_CHAIN_PARA GetCertificateChainParameters() { | |
return params; | ||
} | ||
|
||
void ShowCertificateTrust(atom::NativeWindow* parent_window, | ||
const scoped_refptr<net::X509Certificate>& cert, | ||
const std::string& message, | ||
const ShowTrustCallback& callback) { | ||
PCCERT_CHAIN_CONTEXT chain_context; | ||
v8::Local<v8::Promise> ShowCertificateTrust( | ||
atom::NativeWindow* parent_window, | ||
const scoped_refptr<net::X509Certificate>& cert, | ||
const std::string& message) { | ||
v8::Isolate* isolate = v8::Isolate::GetCurrent(); | ||
atom::util::Promise promise(isolate); | ||
v8::Local<v8::Promise> handle = promise.GetHandle(); | ||
|
||
PCCERT_CHAIN_CONTEXT chain_context; | ||
auto cert_context = net::x509_util::CreateCertContextWithChain(cert.get()); | ||
|
||
auto params = GetCertificateChainParameters(); | ||
|
||
if (CertGetCertificateChain(NULL, cert_context.get(), NULL, NULL, ¶ms, | ||
|
@@ -79,7 +80,8 @@ void ShowCertificateTrust(atom::NativeWindow* parent_window, | |
CertFreeCertificateChain(chain_context); | ||
} | ||
|
||
callback.Run(); | ||
promise.Resolve(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this method is synchronous / blocking on windows? Might be worth documenting / possibly making async somehow 🤔 |
||
return handle; | ||
} | ||
|
||
} // namespace certificate_trust |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no need keeping
promise_
in astd::unique_ptr
. It is only needed when the stored promise may be empty, but in this class since the promise is guaranteed to be always available, it can just be stored as normal value.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just realized there is no constructor in objective-c classes so
std::unique_ptr
is the only way to go. This PR should be ready to go!