Merge commit '2a10da8a6273767c3e5afe14fb4122575b6f6391' into develop

airdcpp-web · Dec 5, 2020 · fe39bbd · fe39bbd
2 parents 811fc55 + 2a10da8
commit fe39bbd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/airdcpp-webapi/api/TransferApi.cpp b/airdcpp-webapi/api/TransferApi.cpp
@@ -25,7 +25,6 @@
 #include <airdcpp/Download.h>
 #include <airdcpp/Upload.h>
 
-#include <airdcpp/AirUtil.h>
 #include <airdcpp/DownloadManager.h>
 #include <airdcpp/ConnectionManager.h>
 #include <airdcpp/QueueManager.h>

diff --git a/airdcpp-webapi/api/common/MessageUtils.cpp b/airdcpp-webapi/api/common/MessageUtils.cpp
@@ -25,7 +25,6 @@
 #include <web-server/Session.h>
 
 #include <airdcpp/ActionHook.h>
-#include <airdcpp/AirUtil.h>
 #include <airdcpp/Magnet.h>
 #include <airdcpp/MessageCache.h>
 #include <airdcpp/ShareManager.h>

diff --git a/airdcpp-webapi/web-server/ApiSettingItem.h b/airdcpp-webapi/web-server/ApiSettingItem.h
@@ -19,6 +19,8 @@
 #ifndef DCPLUSPLUS_DCPP_APISETTINGITEM_H
 #define DCPLUSPLUS_DCPP_APISETTINGITEM_H
 
+#include "stdinc.h"
+
 #include <airdcpp/GetSet.h>
 #include <airdcpp/SettingItem.h>
 #include <airdcpp/ResourceManager.h>

diff --git a/airdcpp-webapi/web-server/ExtensionManager.cpp b/airdcpp-webapi/web-server/ExtensionManager.cpp
@@ -462,6 +462,16 @@ namespace webserver {
 			return;
 		}
 
+		// Check blocked extensions
+		{
+			RLock l(cs);
+			auto i = blockedExtensions.find(extensionName);
+			if (i != blockedExtensions.end()) {
+				failInstallation(aInstallId, STRING(WEB_EXTENSION_INSTALL_BLOCKED), i->second);
+				return;
+			}
+		}
+
 		// Updating an existing extension?
 		auto extension = getExtension(extensionName);
 		if (extension) {

diff --git a/airdcpp-webapi/web-server/NpmRepository.cpp b/airdcpp-webapi/web-server/NpmRepository.cpp
@@ -26,6 +26,7 @@
 #include <airdcpp/ResourceManager.h>
 #include <airdcpp/ScopedFunctor.h>
 #include <airdcpp/Thread.h>
+#include <airdcpp/Util.h>
 
 
 namespace webserver {