mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move it into dialog

Browse source
This commit is contained in:
joshaber 2017-04-03 15:05:24 -04:00
parent 4bbbcd093b
commit 6e89cb9d7c
7 changed files with 56 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/api/atom_api_app.cc
View file

@ -7,7 +7,6 @@
#include <string>
#include <vector>
#include "atom/browser/api/atom_api_certificate_trust.h"
#include "atom/browser/api/atom_api_menu.h"
#include "atom/browser/api/atom_api_session.h"
#include "atom/browser/api/atom_api_web_contents.h"
@ -811,16 +810,6 @@ void App::OnCertificateManagerModelCreated(
}
#endif
#if defined(OS_MACOSX)
void App::ShowCertificateTrust(atom::NativeWindow* parent_window,
const scoped_refptr<net::X509Certificate>& cert,
std::string message,
const ShowTrustCallback& callback,
mate::Arguments* args) {
ShowCertificateTrustUI(parent_window, cert, message, callback);
}
#endif
#if defined(OS_WIN)
v8::Local<v8::Value> App::GetJumpListSettings() {
JumpList jump_list(Browser::Get()->GetAppUserModelID());
@ -960,7 +949,6 @@ void App::BuildPrototype(
base::Bind(&Browser::GetCurrentActivityType, browser))
.SetMethod("setAboutPanelOptions",
base::Bind(&Browser::SetAboutPanelOptions, browser))
.SetMethod("showCertificateTrust", &App::ShowCertificateTrust)
#endif
#if defined(OS_WIN)
.SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))

10
atom/browser/api/atom_api_app.h
View file

@ -8,7 +8,6 @@
#include <string>
#include <vector>
#include "atom/browser/api/atom_api_certificate_trust.h"
#include "atom/browser/api/event_emitter.h"
#include "atom/browser/atom_browser_client.h"
#include "atom/browser/browser.h"
@ -153,15 +152,6 @@ class App : public AtomBrowserClient::Delegate,
std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
#endif
#if defined(OS_MACOSX)
void ShowCertificateTrust(atom::NativeWindow* parent_window,
const scoped_refptr<net::X509Certificate>& cert,
std::string message,
const ShowTrustCallback& callback,
mate::Arguments* args);
#endif
// Tracks tasks requesting file icons.
base::CancelableTaskTracker cancelable_task_tracker_;

34
atom/browser/api/atom_api_certificate_trust.h
View file

@ -1,34 +0,0 @@
// Copyright (c) 2017 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#ifndef ATOM_BROWSER_API_ATOM_API_CERTIFICATE_TRUST_H_
#define ATOM_BROWSER_API_ATOM_API_CERTIFICATE_TRUST_H_
#include <string>
#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
namespace net {
class X509Certificate;
} // namespace net
namespace atom {
class NativeWindow;
namespace api {
typedef base::Callback<void(bool result)> ShowTrustCallback;
void ShowCertificateTrustUI(atom::NativeWindow* parent_window,
const scoped_refptr<net::X509Certificate>& cert,
std::string message,
const ShowTrustCallback& callback);
} // namespace api
} // namespace atom
#endif // ATOM_BROWSER_API_ATOM_API_CERTIFICATE_TRUST_H_

124
atom/browser/api/atom_api_certificate_trust_mac.mm
View file

@ -1,124 +0,0 @@
// 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 "atom/browser/api/atom_api_certificate_trust.h"
#import <Cocoa/Cocoa.h>
#import <CoreServices/CoreServices.h>
#import <SecurityInterface/SFCertificateTrustPanel.h>
#include "atom/browser/native_window.h"
#include "base/files/file_util.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/strings/sys_string_conversions.h"
#include "net/cert/x509_certificate.h"
#include "net/cert/cert_database.h"
@interface TrustDelegate : NSObject {
@private
atom::api::ShowTrustCallback callback_;
SFCertificateTrustPanel* panel_;
scoped_refptr<net::X509Certificate> cert_;
SecTrustRef trust_;
CFArrayRef cert_chain_;
SecPolicyRef sec_policy_;
}
- (id)initWithCallback:(const atom::api::ShowTrustCallback&)callback
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)initWithCallback:(const atom::api::ShowTrustCallback&)callback
panel:(SFCertificateTrustPanel*)panel
cert:(const scoped_refptr<net::X509Certificate>&)cert
trust:(SecTrustRef)trust
certChain:(CFArrayRef)certChain
secPolicy:(SecPolicyRef)secPolicy {
if ((self = [super init])) {
callback_ = callback;
panel_ = panel;
cert_ = cert;
trust_ = trust;
cert_chain_ = certChain;
sec_policy_ = secPolicy;
}
return self;
}
- (void)panelDidEnd:(NSWindow *)sheet
returnCode:(int)returnCode
contextInfo:(void*)contextInfo {
if (returnCode == NSFileHandlingPanelOKButton) {
auto cert_db = net::CertDatabase::GetInstance();
// This forces Chromium to reload the certificate since it might be trusted
// now.
cert_db->NotifyObserversCertDBChanged(cert_.get());
}
callback_.Run(returnCode);
[self autorelease];
}
@end
namespace atom {
namespace api {
void ShowCertificateTrustUI(atom::NativeWindow* parent_window,
const scoped_refptr<net::X509Certificate>& cert,
std::string message,
const ShowTrustCallback& callback) {
auto sec_policy = SecPolicyCreateBasicX509();
auto cert_chain = cert->CreateOSCertChainForCert();
SecTrustRef trust = nullptr;
SecTrustCreateWithCertificates(cert_chain, sec_policy, &trust);
NSWindow* window = parent_window ?
parent_window->GetNativeWindow() :
nil;
auto msg = base::SysUTF8ToNSString(message);
SFCertificateTrustPanel *panel = [[SFCertificateTrustPanel alloc] init];
auto delegate = [[TrustDelegate alloc] initWithCallback:callback
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];
}
} // namespace api
} // namespace atom

15
atom/browser/api/atom_api_dialog.cc
View file

@ -8,11 +8,13 @@
#include "atom/browser/api/atom_api_window.h"
#include "atom/browser/native_window.h"
#include "atom/browser/ui/certificate_trust.h"
#include "atom/browser/ui/file_dialog.h"
#include "atom/browser/ui/message_box.h"
#include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/image_converter.h"
#include "atom/common/native_mate_converters/net_converter.h"
#include "native_mate/dictionary.h"
#include "atom/common/node_includes.h"
@ -119,6 +121,16 @@ void ShowSaveDialog(const file_dialog::DialogSettings& settings,
}
}
// #if defined(OS_MACOSX)
void ShowCertificateTrust(atom::NativeWindow* parent_window,
const scoped_refptr<net::X509Certificate>& cert,
std::string message,
const certificate_trust::ShowTrustCallback& callback,
mate::Arguments* args) {
certificate_trust::ShowCertificateTrust(parent_window, cert, message, callback);
}
// #endif
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
v8::Local<v8::Context> context, void* priv) {
mate::Dictionary dict(context->GetIsolate(), exports);
@ -126,6 +138,9 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
dict.SetMethod("showOpenDialog", &ShowOpenDialog);
dict.SetMethod("showSaveDialog", &ShowSaveDialog);
// #if defined(OS_MACOSX)
dict.SetMethod("showCertificateTrustDialog", &ShowCertificateTrust);
// #endif
}
} // namespace