Add TLS disable check helper

Implement as exemplified TODO for Mac Use latest headers
tryphotino · Feb 11, 2023 · acf88eb · acf88eb
1 parent 24be1c5
commit acf88eb
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 7 deletions.
diff --git a/Photino.Native/Exports.cpp b/Photino.Native/Exports.cpp
@@ -220,6 +220,11 @@ extern "C"
 		instance->WaitForExit();
 	}
 
+	EXPORTED void Photino_DisableTLSCheck(Photino* instance)
+	{
+		instance->DisableTLSCheck();
+	}
+
 
 
 	//Callbacks

diff --git a/Photino.Native/Photino.Linux.cpp b/Photino.Native/Photino.Linux.cpp
@@ -547,6 +547,12 @@ void Photino::WaitForExit()
 	gtk_main();
 }
 
+void Photino::DisableTLSCheck()
+{
+  auto web_context = webkit_web_context_get_default();
+  auto data_manager = webkit_web_context_get_website_data_manager(web_context);
+  webkit_website_data_manager_set_tls_errors_policy(data_manager, WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+}
 
 
 

diff --git a/Photino.Native/Photino.Mac.mm b/Photino.Native/Photino.Mac.mm
@@ -519,6 +519,12 @@ void EnsureInvoke(dispatch_block_t block)
     [NSApp run];
 }
 
+void Photino::DisableTLSCheck()
+{
+    // TODO
+    // See https://stackoverflow.com/questions/27100540/allow-unverified-ssl-certificates-in-wkwebview
+}
+
 //Callbacks
 void Photino::GetAllMonitors(GetAllMonitorsCallback callback)
 {

diff --git a/Photino.Native/Photino.Native.vcxproj b/Photino.Native/Photino.Native.vcxproj
@@ -263,14 +263,14 @@ COPY .\$(OutDir)WebView2Loader.dll ..\Photino.Test\bin\ARM64\Debug\net6.0\</Comm
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\packages\Microsoft.Web.WebView2.1.0.664.37\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\packages\Microsoft.Web.WebView2.1.0.664.37\build\native\Microsoft.Web.WebView2.targets')" />
     <Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.201120.3\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.201120.3\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\Microsoft.Web.WebView2.1.0.1462.37\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.1462.37\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1462.37\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1462.37\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>
diff --git a/Photino.Native/Photino.Native.vcxproj.filters b/Photino.Native/Photino.Native.vcxproj.filters
@@ -70,4 +70,7 @@
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
 </Project>
diff --git a/Photino.Native/Photino.Windows.cpp b/Photino.Native/Photino.Windows.cpp
@@ -42,6 +42,12 @@ struct ShowMessageParams
 };
 
 
+static bool AlwaysValidateServerCertificate(ICoreWebView2Certificate* certificate)
+{
+	return true;
+}
+
+
 void Photino::Register(HINSTANCE hInstance)
 {
 	InitDarkModeSupport();
@@ -670,7 +676,34 @@ void Photino::WaitForExit()
 	}
 }
 
-
+void Photino::DisableTLSCheck()
+{
+	// Only from webview 14 upwards - see:
+	// https://github.com/MicrosoftEdge/WebView2Samples/blob/1710d535e895ed9c24196c5482e990e10d7285c7/SampleApps/WebView2APISample/SettingsComponent.cpp#L1445
+	EventRegistrationToken m_ServerCertificateErrorToken = {};
+	auto webview14 = _webviewWindow.try_query<ICoreWebView2_14>();
+	if (webview14) {
+		webview14->add_ServerCertificateErrorDetected(
+			Callback<ICoreWebView2ServerCertificateErrorDetectedEventHandler>([this](ICoreWebView2* sender, ICoreWebView2ServerCertificateErrorDetectedEventArgs* args) {
+				COREWEBVIEW2_WEB_ERROR_STATUS errorStatus;
+				if (SUCCEEDED(args->get_ErrorStatus(&errorStatus))) {
+					wil::com_ptr<ICoreWebView2Certificate> certificate = nullptr;
+					if (SUCCEEDED(args->get_ServerCertificate(&certificate))) {
+						if (errorStatus == COREWEBVIEW2_WEB_ERROR_STATUS_CERTIFICATE_IS_INVALID && AlwaysValidateServerCertificate(certificate.get()))
+						{
+							args->put_Action(COREWEBVIEW2_SERVER_CERTIFICATE_ERROR_ACTION_ALWAYS_ALLOW);
+						}
+						else
+						{
+							args->put_Action(COREWEBVIEW2_SERVER_CERTIFICATE_ERROR_ACTION_CANCEL);
+						}
+					}
+				}
+				return S_OK;
+			}
+		).Get(), &m_ServerCertificateErrorToken);
+	}
+}
 
 
 

diff --git a/Photino.Native/Photino.h b/Photino.Native/Photino.h
@@ -218,6 +218,8 @@ class Photino
 	void ShowNotification(AutoString title, AutoString message);
 	void WaitForExit();
 
+	void DisableTLSCheck();
+
 	//Callbacks
 	void AddCustomSchemeName(AutoString scheme) { _customSchemeNames.push_back((AutoString)scheme); };
 	void GetAllMonitors(GetAllMonitorsCallback callback);

diff --git a/Photino.Native/packages.config b/Photino.Native/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.1462.37" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.1518.46" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.230202.1" targetFramework="native" />
 </packages>