Updated Remote module

Author: rasikhq

VCMP-LUA/Core.cpp

@@ -62,9 +62,6 @@ extern "C" EXPORT unsigned int VcmpPluginInit(PluginFuncs * pluginFuncs, PluginC
 	Lua.open_libraries();
 	Lua.set_exception_handler(&my_exception_handler);
 
-	RegisterClasses(&Lua);
-	RegisterVCMPCallbacks();
-
 	bool experimental_mode = false;
 
 	// Load Configuration
@@ -91,7 +88,16 @@ extern "C" EXPORT unsigned int VcmpPluginInit(PluginFuncs * pluginFuncs, PluginC
 		}
 		else spdlog::warn("No configuration settings supplied, using defaults");
 	}
-	
+
+	if (experimental_mode) {
+		Lua["__experimental__"] = true;
+		spdlog::warn("Experimental features may be really unstable, be very careful when using them.");
+		Lua["__reload_scripts"] = &reload_scripts;
+	}
+
+	RegisterClasses(&Lua);
+	RegisterVCMPCallbacks();
+
 	// Load Scripts
 	{
 		std::list<CSimpleIniA::Entry> scripts;
@@ -108,12 +114,6 @@ extern "C" EXPORT unsigned int VcmpPluginInit(PluginFuncs * pluginFuncs, PluginC
 		else spdlog::error("No Lua scripts specified to load");
 	}
 
-	if (experimental_mode) {
-		Lua["__experimental__"] = true;
-		spdlog::warn("Experimental features may be really unstable, be very careful when using them.");
-		Lua["__reload_scripts"] = &reload_scripts;
-	}
-
 	return 1;
 }
 

VCMP-LUA/vcmpWrap/Modules/CPR/Remote.cpp

@@ -3,17 +3,29 @@
 extern sol::state Lua;
 
 std::vector<RemoteRequest> Remote::s_Container = {};
+std::string Remote::certificates = "";
+
+bool Remote::setSSLCerts(const std::string& bundle)
+{
+	certificates.assign(bundle);
+	return true;
+}
 
 /*** Lua ***/
 sol::table Remote::fetchHTTP(const std::string& url, sol::table params, sol::table auth)
 {
 	cpr::Parameters cprParams = GetParameters(params);
 	cpr::Authentication cprAuth = GetAuthentication(auth);
 
+	cpr::ssl::CaInfo Certs(certificates.c_str());
+	cpr::SslOptions opts;
+	opts.SetOption(Certs);
+
 	cpr::Response r = cpr::Get(
 		cpr::Url(url),
 		cprParams,
-		cprAuth
+		cprAuth,
+		opts
 	);
 
 	sol::table resultTable = Lua.create_table();
@@ -27,9 +39,13 @@ sol::table Remote::fetchHTTP(const std::string& url, sol::table params, sol::tab
 
 void Remote::fetchHTTPAsync(sol::function handler, const std::string& url, sol::table params, sol::table auth)
 {
+	cpr::ssl::CaInfo Certs(certificates.c_str());
+	cpr::SslOptions opts;
+	opts.SetOption(Certs);
+
 	cpr::Parameters cprParams = GetParameters(params);
 	cpr::Authentication cprAuth = GetAuthentication(auth);
-	s_Container.emplace_back(handler, RemoteRequestType::GET, url, cprParams, cpr::Header{}, cpr::Body(""), cpr::Payload{}, cprAuth);
+	s_Container.emplace_back(handler, RemoteRequestType::GET, url, cprParams, cpr::Header{}, cpr::Body(""), cpr::Payload{}, cprAuth, opts);
 }
 
 sol::table Remote::postHTTP(const std::string& url, sol::table data)
@@ -65,12 +81,17 @@ sol::table Remote::postHTTP(const std::string& url, sol::table data)
 		}
 	}
 
+	cpr::ssl::CaInfo Certs(certificates.c_str());
+	cpr::SslOptions opts;
+	opts.SetOption(Certs);
+
 	cpr::Response r = cpr::Post(
 		cpr::Url(url),
 		cprHeader,
 		cprBody,
 		cprParams,
-		cprPayload
+		cprPayload,
+		opts
 	);
 
 	sol::table resultTable = Lua.create_table();
@@ -115,7 +136,11 @@ void Remote::postHTTPAsync(sol::function handler, const std::string& url, sol::t
 		}
 	}
 
-	s_Container.emplace_back(handler, RemoteRequestType::POST, url, cprParams, cprHeader, cprBody, cprPayload, cpr::Authentication("", ""));
+	cpr::ssl::CaInfo Certs(certificates.c_str());
+	cpr::SslOptions opts;
+	opts.SetOption(Certs);
+
+	s_Container.emplace_back(handler, RemoteRequestType::POST, url, cprParams, cprHeader, cprBody, cprPayload, cpr::Authentication("", ""), opts);
 }
 
 /*** Internal ***/
@@ -125,6 +150,7 @@ void Remote::Init(sol::state* Lua)
 
 	sol::usertype<Remote> userdata = Lua->new_usertype<Remote>("Remote");
 
+	userdata["setSSLCerts"] = &Remote::setSSLCerts;
 	userdata["fetch"] = sol::overload(&Remote::fetchHTTP, &Remote::fetchHTTPAsync);
 	userdata["post"] = sol::overload(&Remote::postHTTP, &Remote::postHTTPAsync);
 }

VCMP-LUA/vcmpWrap/Modules/CPR/Remote.h

@@ -18,22 +18,25 @@ struct RemoteRequest
 				cpr::Header cprHeader, 
 				cpr::Body cprBody, 
 				cpr::Payload cprPayload, 
-				cpr::Authentication cprAuth
+				cpr::Authentication cprAuth,
+				cpr::SslOptions opts
 	)
 		: handler(luaHandler)
 	{
 		if (requestType == RemoteRequestType::GET)
 			future = cpr::GetAsync(cpr::Url(url),
 				cprParams,
-				cprAuth
+				cprAuth,
+				opts
 			);
 		else if (requestType == RemoteRequestType::POST)
 			future = cpr::PostAsync(cpr::Url(url),
 				cprParams,
 				cprHeader,
 				cprBody,
 				cprPayload,
-				cprAuth
+				cprAuth,
+				opts
 			);
 	}
 
@@ -54,6 +57,10 @@ class Remote
 	static cpr::Authentication GetAuthentication(sol::table& auth);
 
 	/*** Lua ***/
+	static std::string certificates;
+
+	static bool setSSLCerts(const std::string& bundle);
+
 	static sol::table fetchHTTP(const std::string& url, sol::table params, sol::table auth);
 	static void fetchHTTPAsync(sol::function handler, const std::string& url, sol::table params, sol::table auth);