From c5576c85c92c464ff3aa53f680ce18d8b51f60ab Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 19 Apr 2019 17:27:39 +0300
Subject: Add plugin signature verification policies

---
 src/browser.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/browser.cpp')

diff --git a/src/browser.cpp b/src/browser.cpp
index db75fa1..e11a1da 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -38,7 +38,7 @@
 #include "adblock/adblocklist.h"
 #include "hostlist/hostlist.h"
 #include <spdlog/spdlog.h>
-#include "plugin/pluginloader.h"
+#include <pluginloader.h>
 
 Browser::Browser(int &argc, char *argv[], bool allowSecondary)
     : SingleApplication(argc, argv, allowSecondary, SingleApplication::User | SingleApplication::SecondaryNotification | SingleApplication::ExcludeAppVersion)
@@ -151,9 +151,14 @@ QPluginLoader *Browser::addPlugin(const QString &path)
     if(path.isEmpty())
         return nullptr;
 
-    auto *loader = new PluginLoader(path, this);
-    spdlog::info("Verifying plugin: {}", loader->verify() ? "passed" : "failed");
-    loader->load();
+    auto *loader = new PluginLoader(path, PluginLoader::SignatureMatchIfAvailable, this);
+    const bool loaded = loader->load();
+    spdlog::info("Loading plugin [{}]: {}", qUtf8Printable(path), loaded ? "passed" : "failed");
+
+    if(!loaded) {
+        delete loader;
+        return nullptr;
+    }
 
     auto *info = new PluginInfo(loader);
     m_plugins.append(info);
-- 
cgit v1.2.1