Plant the ability to verify code signing signatures when trying to load kifaces

Off by default and intended for use in released builds only

CMakeLists.txt

@@ -159,6 +159,11 @@ option( KICAD_USE_3DCONNEXION
     "Build KiCad with support for 3Dconnexion devices (Currently only for Mac/MSW)"
     OFF )
 
+cmake_dependent_option( KICAD_WIN32_VERIFY_CODESIGN
+    "When enabled, verifies the code signing signature of certain DLLs loaded during runtime."
+    OFF "WIN32"
+    OFF )
+
 if( KICAD_USE_3DCONNEXION )
     if( WIN32 )
         add_definitions( -DKICAD_USE_3DCONNEXION )
@@ -190,6 +195,10 @@ if( KICAD_GAL_PROFILE )
     add_definitions( -DKICAD_GAL_PROFILE )
 endif()
 
+if( KICAD_WIN32_VERIFY_CODESIGN )
+    add_definitions( -DKICAD_WIN32_VERIFY_CODESIGN )
+endif()
+
 # Ensure DEBUG is defined for all platforms in Debug builds
 # change to add_compile_definitions() after minimum required CMake version is 3.12
 set_property( DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DEBUG> )

common/kiway.cpp

@@ -34,6 +34,7 @@
 #include <core/arraydim.h>
 #include <id.h>
 #include <kiplatform/app.h>
+#include <kiplatform/environment.h>
 #include <settings/settings_manager.h>
 #include <tool/action_manager.h>
 #include <logging.h>
@@ -231,6 +232,15 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
             }
         }
 
+#ifdef KICAD_WIN32_VERIFY_CODESIGN
+        bool codeSignOk = KIPLATFORM::ENV::VerifyFileSignature( dname );
+        if( !codeSignOk )
+        {
+            msg.Printf( _( "Failed to verify kiface library '%s' signature." ), dname );
+            THROW_IO_ERROR( msg );
+        }
+#endif
+
         wxDynamicLibrary dso;
 
         void*   addr = nullptr;

libs/kiplatform/CMakeLists.txt

@@ -30,6 +30,7 @@ elseif( WIN32 )
     set( PLATFORM_LIBS
         "Shlwapi"
         "winhttp"
+        "wintrust"
         )
 elseif( UNIX )
     set( PLATFORM_SRCS

libs/kiplatform/gtk/environment.cpp

@@ -107,3 +107,9 @@ bool KIPLATFORM::ENV::GetSystemProxyConfig( const wxString& aURL, PROXY_CONFIG&
 {
     return false;
 }
+
+
+bool KIPLATFORM::ENV::VerifyFileSignature( const wxString& aPath )
+{
+    return true;
+}

libs/kiplatform/include/kiplatform/environment.h

@@ -88,5 +88,13 @@ namespace KIPLATFORM
          * @return True if successful fetched proxy info
          */
         bool GetSystemProxyConfig( const wxString& aURL, PROXY_CONFIG& aCfg );
+
+        /**
+         * Validates the code signing signature of a given file
+         * This is most likely only ever going to be applicable to Windows
+         *
+         * @return True if file signature passes
+         */
+        bool VerifyFileSignature( const wxString& aPath );
     }
 }

libs/kiplatform/msw/environment.cpp

@@ -31,6 +31,10 @@
 #include <shlwapi.h>
 #include <winhttp.h>
 
+#include <Softpub.h>
+#include <wincrypt.h>
+#include <wintrust.h>
+
 
 void KIPLATFORM::ENV::Init()
 {
@@ -258,3 +262,38 @@ bool KIPLATFORM::ENV::GetSystemProxyConfig( const wxString& aURL, PROXY_CONFIG&
 
     return success;
 }
+
+
+bool KIPLATFORM::ENV::VerifyFileSignature( const wxString& aPath )
+{
+    WINTRUST_FILE_INFO fileData;
+    memset( &fileData, 0, sizeof( fileData ) );
+    fileData.cbStruct = sizeof( WINTRUST_FILE_INFO );
+    fileData.pcwszFilePath = aPath.wc_str();
+
+    // verifies entire certificate chain
+    GUID policy = WINTRUST_ACTION_GENERIC_VERIFY_V2;
+
+    WINTRUST_DATA trustData;
+    memset( &trustData, 0, sizeof( trustData ) );
+
+    trustData.cbStruct = sizeof( trustData );
+    trustData.dwUIChoice = WTD_UI_NONE;
+    // revocation checking incurs latency penalities due to need for online queries
+    trustData.fdwRevocationChecks = WTD_REVOKE_NONE;
+    trustData.dwUnionChoice = WTD_CHOICE_FILE;
+    trustData.dwStateAction = WTD_STATEACTION_VERIFY;
+    trustData.pFile = &fileData;
+
+
+    bool verified = false;
+    LONG status = WinVerifyTrust( NULL, &policy, &trustData );
+
+    verified = ( status == ERROR_SUCCESS );
+
+    // Cleanup/release (yes its weird looking)
+    trustData.dwStateAction = WTD_STATEACTION_CLOSE;
+    WinVerifyTrust( NULL, &policy, &trustData );
+
+    return verified;
+}

libs/kiplatform/osx/environment.mm

@@ -99,4 +99,10 @@ wxString KIPLATFORM::ENV::GetUserCachePath()
 bool KIPLATFORM::ENV::GetSystemProxyConfig( const wxString& aURL, PROXY_CONFIG& aCfg )
 {
     return false;
+}
+
+
+bool KIPLATFORM::ENV::VerifyFileSignature( const wxString& aPath )
+{
+    return true;
 }