macOS: Add certificate trust API #9099

joshaber · 2017-04-03T19:06:59Z

Continuing from #9068

Add the dialog.showCertificateTrustDialog API to show the OS-provided UI to let the user decide to accept and trust a self-signed or untrusted certificate:

This is only the macOS-side of things. I think we can get @shiftkey to do the Windows side.

I'm opening this early because I have no idea what I'm doing and I'd welcome any feedback or advice anyone would like to provide.

kevinsawicki · 2017-04-03T19:17:46Z

atom/browser/ui/certificate_trust.h

+
+void ShowCertificateTrust(atom::NativeWindow* parent_window,
+                          const scoped_refptr<net::X509Certificate>& cert,
+                          std::string message,


Could this be const std::string& to match the other params?

kevinsawicki · 2017-04-03T19:18:16Z

atom/common/native_mate_converters/net_converter.cc

@@ -68,11 +69,72 @@ v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
            val->GetIntermediateCertificates().front(),
            issuer_intermediates);
    dict.Set("issuerCert", issuer_cert);
+
+    std::vector<std::string> intermediates_encoded;
+    for (size_t i = 0; i < intermediates.size(); i++) {


I think this could be for (auto& native_cert : intermediates)

kevinsawicki · 2017-04-03T19:24:30Z

atom/browser/api/atom_api_app.h

@@ -19,6 +19,7 @@
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "native_mate/handle.h"
 #include "net/base/completion_callback.h"
+#include "net/cert/x509_certificate.h"


kevinsawicki · 2017-04-03T19:28:01Z

atom/common/native_mate_converters/net_converter.cc

+    for (size_t i = 0; i < intermediates.size(); i++) {
+      auto native_cert = intermediates[i];
+      std::string encoded;
+      net::X509Certificate::GetPEMEncoded(native_cert, &encoded);


This method does return a bool, wonder if we should only push encoded to the vector when it returns true?

I'm a little torn on that. On the one hand, I like being careful. On the other hand, we don't have any way of signaling that "yooooo we couldn't encode this one." And if we encode some nonsense, that has the funny upside of failing when we FromV8 the certificate. On the other hand, it's hard to know exactly what shape of nonsense we'll get if this fails.

What do you think?

What do you think?

Hmm, yeah, looks like we don't use the return value on the root certificate so makes sense not to use it here either, can revisit separately.

Would it make sense for intermediates to be an array of objects though that is the full cert information instead of just the encoded part?

I think it could just reuse what dict.Set("issuerCert", issuer_cert); does.

Yeah I'm into it 👍

kevinsawicki · 2017-04-03T21:38:19Z

atom/browser/ui/certificate_trust_mac.mm

+      nil;
+  auto msg = base::SysUTF8ToNSString(message);
+
+  SFCertificateTrustPanel *panel = [[SFCertificateTrustPanel alloc] init];


Super minor: SFCertificateTrustPanel* panel

kevinsawicki · 2017-04-03T21:42:15Z

atom/browser/api/atom_api_dialog.cc

@@ -119,13 +121,27 @@ void ShowSaveDialog(const file_dialog::DialogSettings& settings,
  }
 }

+#if defined(OS_MACOSX)
+void ShowCertificateTrust(atom::NativeWindow* parent_window,


I think you can delete this method and just use the following below:

dict.SetMethod("showCertificateTrustDialog", &certificate_trust::ShowCertificateTrust);

kevinsawicki · 2017-04-03T21:47:32Z

docs/api/dialog.md

@@ -175,6 +175,17 @@ it is usually used to report errors in early stage of startup.  If called
 before the app `ready`event on Linux, the message will be emitted to stderr,
 and no GUI dialog will appear.

+### `dialog.showCertificateTrustDialog(browserWindow, certificate, message, callback)` _macOS_


If/when this gets support on other platforms there might be some additional options needed so it might be better to start this off as:

dialog.showCertificateTrustDialog(browserWindow, options, callback)

You can leave the C++ signature as-is, and just pluck the options in JS like showMessageBox does.

kevinsawicki · 2017-04-03T21:49:17Z

filenames.gypi

@@ -279,6 +279,8 @@
      'atom/browser/ui/accelerator_util_views.cc',
      'atom/browser/ui/atom_menu_model.cc',
      'atom/browser/ui/atom_menu_model.h',
+      'atom/browser/ui/certificate_trust_mac.mm',
+      'atom/browser/ui/certificate_trust.h',


Super minor: I think the order here should be swapped, looks like . sorts before _ in other places in this list like file_dialog.h.

kevinsawicki · 2017-04-03T21:49:59Z

atom/browser/ui/certificate_trust_mac.mm

+  return self;
+}
+
+- (void)panelDidEnd:(NSWindow *)sheet


🔥 the space between NSWindow and *

kevinsawicki · 2017-04-03T21:50:13Z

atom/browser/ui/certificate_trust_mac.mm

+      certChain:(CFArrayRef)certChain
+      secPolicy:(SecPolicyRef)secPolicy;
+
+- (void)panelDidEnd:(NSWindow *)sheet


🔥 the space between NSWindow and *

joshaber · 2017-04-04T01:56:15Z

🏓

deepak1556 · 2017-04-04T04:04:15Z

atom/common/native_mate_converters/net_converter.cc

@@ -73,6 +73,54 @@ v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
  return dict.GetHandle();
 }

+bool CertFromData(const std::string& data,


Can be moved to an anonymous namespace.

It's meaningless on macOS, at least.

joshaber · 2017-04-04T13:34:47Z

🍍

kevinsawicki · 2017-04-04T15:37:45Z

lib/browser/api/dialog.js

+    }
+
+    let {certificate, message} = options
+    if (certificate == null || typeof options !== 'object') {


Should this be typeof certificate !== 'object' instead?

Ha, good catch 👍

joshaber · 2017-04-04T15:53:58Z

⛏

kevinsawicki · 2017-04-04T18:17:18Z

Thanks @joshaber, great work on this 👍

joshaber added 17 commits Mar 30, 2017

Show a certificate trust panel

64369cd

Expose the certificate trust panel as part of app

653b2d1

Compile these lovely files

7b044ff

Link against the Security frameworks

edf61d4

Dummy out the certificate FromV8 converter

deae70d

Errrrybody's a scoped_refptr now

16cc793

Maybe this is a valid conversion?

141a5ad

Slightly better conversion

302ca86

Encode all the intermediates

69defc5

Decode all the intermediates

bde2a59

Notify that the cert changed

4f3d355

Rename to make VS happy

ee7389b

Do the callback & release dance

1ed443e

Handle the callback and cleanup properly

4bbbcd0

Move it into dialog

6e89cb9

Remove old unnecssary change on app

4ffaf2c

Fix indentation

bcecba2

kevinsawicki reviewed Apr 3, 2017

View changes

joshaber added 2 commits Apr 3, 2017

Expose through the actual JS API too

0b7ffd0

Conditionalize

11f5c94

kevinsawicki reviewed Apr 3, 2017

View changes

joshaber added 6 commits Apr 3, 2017

Const ref that message

06643e5

Use better iteration

b0ef7dd

Flesh out some docs

da1b0aa

Remove stale includes

b8ff466

Linebreak to keep the linter happy

74c0cbd

Get rid of intermediates and rehydrate from issuerCert

370cf81

joshaber changed the title ~~[WIP] macOS: Add certificate trust API~~ macOS: Add certificate trust API Apr 3, 2017

kevinsawicki reviewed Apr 3, 2017

View changes

atom/browser/ui/certificate_trust_mac.mm Outdated

return self;

}

- (void)panelDidEnd:(NSWindow *)sheet

This comment has been minimized.

Sign in to view

kevinsawicki Apr 3, 2017
Contributor

🔥 the space between NSWindow and *

kevinsawicki reviewed Apr 3, 2017

View changes

atom/browser/ui/certificate_trust_mac.mm Outdated

certChain:(CFArrayRef)certChain

secPolicy:(SecPolicyRef)secPolicy;

- (void)panelDidEnd:(NSWindow *)sheet

This comment has been minimized.

Sign in to view

kevinsawicki Apr 3, 2017
Contributor

🔥 the space between NSWindow and *

kevinsawicki self-assigned this Apr 3, 2017

joshaber added 5 commits Apr 4, 2017

Fix file sorting

398132c

Fix some style things

b3e865a

Remove the intermediate function

2badfbe

Use an options object for most of the params

e2bda3c

Appease our linty overlords

8d46523

deepak1556 reviewed Apr 4, 2017

View changes

joshaber added 3 commits Apr 4, 2017

Put CertFromData in an anon namespace

0cab8a3

Don't pass the result through

146e1ed

It's meaningless on macOS, at least.

As you wish linter

736d6af

deepak1556 approved these changes Apr 4, 2017

View changes

kevinsawicki reviewed Apr 4, 2017

View changes

Fix c&p error

2749ded

kevinsawicki added 2 commits Apr 4, 2017

Make browser window optional

2e32525

Add specs for showCertificateTrustDialog option errors

2bd47eb

kevinsawicki deleted the certificate-trust branch Apr 4, 2017

shiftkey mentioned this pull request Apr 21, 2017

certificate trust API for Windows #9242

Merged

6 of 6 tasks complete

dpgraham mentioned this pull request Jan 18, 2018

Add ability to trust SSL Certificates appium/appium-desktop#390

Closed

electron / electron

macOS: Add certificate trust API #9099

macOS: Add certificate trust API #9099

joshaber commented Apr 3, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

joshaber commented Apr 4, 2017

This comment has been minimized.

joshaber commented Apr 4, 2017

This comment has been minimized.

This comment has been minimized.

joshaber commented Apr 4, 2017

kevinsawicki commented Apr 4, 2017

electron / electron

macOS: Add certificate trust API #9099

macOS: Add certificate trust API #9099

Conversation

joshaber commented Apr 3, 2017

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

joshaber Apr 3, 2017 Author Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

joshaber Apr 3, 2017 Author Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

This comment has been minimized.

kevinsawicki Apr 3, 2017 Contributor

joshaber commented Apr 4, 2017

This comment has been minimized.

deepak1556 Apr 4, 2017 Member

joshaber commented Apr 4, 2017

This comment has been minimized.

kevinsawicki Apr 4, 2017 Contributor

This comment has been minimized.

joshaber Apr 4, 2017 Author Contributor

joshaber commented Apr 4, 2017

kevinsawicki commented Apr 4, 2017

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

joshaber Apr 3, 2017
Author Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

joshaber Apr 3, 2017
Author Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

kevinsawicki Apr 3, 2017
Contributor

deepak1556 Apr 4, 2017
Member

kevinsawicki Apr 4, 2017
Contributor

joshaber Apr 4, 2017
Author Contributor