e86d1cba75
* chore: bump chromium in DEPS to 104.0.5096.0 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 * chore: update patch indices * chore: fix lint * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext * chore: fix lint * build: run electron/script/gen-libc++-filenames.js fixes gn check * chore: bump chromium in DEPS to 104.0.5098.0 * chore: disable flaking tests * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 * chore: fixup patch indices * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 * chore: bump chromium in DEPS to 104.0.5100.0 * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 * chore: update patch indices * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5103.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5104.0 * chore: update patches * fix: add patch for DCHECK in fullscreen test * build: fix nan build * build: make the nan spec runner work on macOS * chore: bump chromium in DEPS to 104.0.5106.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5108.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 105.0.5113.0 * chore: bump chromium in DEPS to 105.0.5115.0 * chore: bump chromium in DEPS to 105.0.5117.0 * chore: update patches * chore: update libcpp patch * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 * 3669226: Remove printing PostTask usage of IO thread Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: bump chromium in DEPS to 105.0.5119.0 * chore: missing includes in desktop_notification_controller * chore: update patches * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * 3646014: [API] Deprecate LegacyOOMErrorCallback Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014 * chore: bump chromium in DEPS to 105.0.5121.0 * chore: update patches * 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085 * chore: bump chromium in DEPS to 105.0.5123.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5125.0 * chore: update patches * 3630082: [sandbox] Also enable the sandbox outside of Chromium builds Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082 * chore: bump chromium in DEPS to 105.0.5127.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5129.0 * chore: update patches * 3703741: Remove WebContents::GetMainFrame. https://chromium-review.googlesource.com/c/chromium/src/+/3703741 * chore: update patches * fixup! 3703741: Remove WebContents::GetMainFrame. * fix lint * more lint * chore: document breaking change * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * use the v8 allocator for node serdes * chore: update patches * remove faulty non-v8-sandbox-compatible code * make NodeArrayBufferAllocator use the v8 allocator under the hood * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * fix build on windows * 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events https://chromium-review.googlesource.com/c/chromium/src/+/3691954 * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Update patches/chromium/notification_provenance.patch Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * remove chore_expose_v8_initialization_isolate_callbacks.patch * add link to nodejs/nan#941 * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: update patches * disable nan buffer-test * disable sandboxed pointers for now * force sandboxed pointers off * improve node allocation patch * restore accidentally dropped node crypto test patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
123 lines
3.8 KiB
Text
123 lines
3.8 KiB
Text
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/certificate_trust.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
#import <SecurityInterface/SFCertificateTrustPanel.h>
|
|
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "net/cert/cert_database.h"
|
|
#include "net/cert/x509_util_apple.h"
|
|
#include "shell/browser/native_window.h"
|
|
|
|
@interface TrustDelegate : NSObject {
|
|
@private
|
|
std::unique_ptr<gin_helper::Promise<void>> promise_;
|
|
SFCertificateTrustPanel* panel_;
|
|
scoped_refptr<net::X509Certificate> cert_;
|
|
SecTrustRef trust_;
|
|
CFArrayRef cert_chain_;
|
|
SecPolicyRef sec_policy_;
|
|
}
|
|
|
|
- (id)initWithPromise:(gin_helper::Promise<void>)promise
|
|
panel:(SFCertificateTrustPanel*)panel
|
|
cert:(const scoped_refptr<net::X509Certificate>&)cert
|
|
trust:(SecTrustRef)trust
|
|
certChain:(CFArrayRef)certChain
|
|
secPolicy:(SecPolicyRef)secPolicy;
|
|
|
|
- (void)panelDidEnd:(NSWindow*)sheet
|
|
returnCode:(int)returnCode
|
|
contextInfo:(void*)contextInfo;
|
|
|
|
@end
|
|
|
|
@implementation TrustDelegate
|
|
|
|
- (void)dealloc {
|
|
[panel_ release];
|
|
CFRelease(trust_);
|
|
CFRelease(cert_chain_);
|
|
CFRelease(sec_policy_);
|
|
|
|
[super dealloc];
|
|
}
|
|
|
|
- (id)initWithPromise:(gin_helper::Promise<void>)promise
|
|
panel:(SFCertificateTrustPanel*)panel
|
|
cert:(const scoped_refptr<net::X509Certificate>&)cert
|
|
trust:(SecTrustRef)trust
|
|
certChain:(CFArrayRef)certChain
|
|
secPolicy:(SecPolicyRef)secPolicy {
|
|
if ((self = [super init])) {
|
|
promise_ = std::make_unique<gin_helper::Promise<void>>(std::move(promise));
|
|
panel_ = panel;
|
|
cert_ = cert;
|
|
trust_ = trust;
|
|
cert_chain_ = certChain;
|
|
sec_policy_ = secPolicy;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)panelDidEnd:(NSWindow*)sheet
|
|
returnCode:(int)returnCode
|
|
contextInfo:(void*)contextInfo {
|
|
auto* cert_db = net::CertDatabase::GetInstance();
|
|
// This forces Chromium to reload the certificate since it might be trusted
|
|
// now.
|
|
cert_db->NotifyObserversCertDBChanged();
|
|
|
|
promise_->Resolve();
|
|
[self autorelease];
|
|
}
|
|
|
|
@end
|
|
|
|
namespace certificate_trust {
|
|
|
|
v8::Local<v8::Promise> ShowCertificateTrust(
|
|
electron::NativeWindow* parent_window,
|
|
const scoped_refptr<net::X509Certificate>& cert,
|
|
const std::string& message) {
|
|
v8::Isolate* isolate = electron::JavascriptEnvironment::GetIsolate();
|
|
gin_helper::Promise<void> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
auto* sec_policy = SecPolicyCreateBasicX509();
|
|
auto cert_chain =
|
|
net::x509_util::CreateSecCertificateArrayForX509Certificate(cert.get());
|
|
SecTrustRef trust = nullptr;
|
|
SecTrustCreateWithCertificates(cert_chain, sec_policy, &trust);
|
|
|
|
NSWindow* window = parent_window
|
|
? parent_window->GetNativeWindow().GetNativeNSWindow()
|
|
: nil;
|
|
auto msg = base::SysUTF8ToNSString(message);
|
|
|
|
auto panel = [[SFCertificateTrustPanel alloc] init];
|
|
auto delegate = [[TrustDelegate alloc] initWithPromise:std::move(promise)
|
|
panel:panel
|
|
cert:cert
|
|
trust:trust
|
|
certChain:cert_chain
|
|
secPolicy:sec_policy];
|
|
[panel beginSheetForWindow:window
|
|
modalDelegate:delegate
|
|
didEndSelector:@selector(panelDidEnd:returnCode:contextInfo:)
|
|
contextInfo:nil
|
|
trust:trust
|
|
message:msg];
|
|
|
|
return handle;
|
|
}
|
|
|
|
} // namespace certificate_trust
|