From d3a2209f73e37f1b0082567799fba3d84d6a5ea2 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Thu, 13 Apr 2023 23:36:29 -0500 Subject: [PATCH] more updates for script plugin helper and corresponding VPNDetection update to properly send user gent --- Application/Plugin/Script/ScriptPluginHelper.cs | 10 ---------- Plugins/ScriptPlugins/VPNDetection.js | 12 +++++++----- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Application/Plugin/Script/ScriptPluginHelper.cs b/Application/Plugin/Script/ScriptPluginHelper.cs index 528c1f82..660a91d2 100644 --- a/Application/Plugin/Script/ScriptPluginHelper.cs +++ b/Application/Plugin/Script/ScriptPluginHelper.cs @@ -34,11 +34,6 @@ public class ScriptPluginHelper RequestUrl(new ScriptPluginWebRequest(url, Headers: headers), callback); } - public void GetUrl(string url, Dictionary headers, Delegate callback) - { - RequestUrl(new ScriptPluginWebRequest(url, Headers: headers), callback); - } - public void PostUrl(string url, string body, string bearerToken, Delegate callback) { var headers = new Dictionary { { "Authorization", $"Bearer {bearerToken}" } }; @@ -46,11 +41,6 @@ public class ScriptPluginHelper new ScriptPluginWebRequest(url, body, "POST", Headers: headers), callback); } - public void PostUrl(string url, string body, Dictionary headers, Delegate callback) - { - RequestUrl(new ScriptPluginWebRequest(url, body, "POST", Headers: headers), callback); - } - public void RequestUrl(ScriptPluginWebRequest request, Delegate callback) { Task.Run(() => diff --git a/Plugins/ScriptPlugins/VPNDetection.js b/Plugins/ScriptPlugins/VPNDetection.js index 2e1cc861..69b8b3d3 100644 --- a/Plugins/ScriptPlugins/VPNDetection.js +++ b/Plugins/ScriptPlugins/VPNDetection.js @@ -191,13 +191,15 @@ const plugin = { } const userAgent = `IW4MAdmin-${this.manager.getApplicationSettings().configuration().id}`; - const headers = { - 'User-Agent': userAgent - }; + const stringDict = System.Collections.Generic.Dictionary(System.String, System.String); + const headers = new stringDict(); + headers.add('User-Agent', userAgent); + const pluginScript = importNamespace('IW4MAdmin.Application.Plugin.Script'); + const request = new pluginScript.ScriptPluginWebRequest(`https://api.xdefcon.com/proxy/check/?ip=${origin.IPAddressString}`, + null, 'GET', 'application/json', headers); try { - this.pluginHelper.getUrl(`https://api.xdefcon.com/proxy/check/?ip=${origin.IPAddressString}`, headers, - (response) => this.onVpnResponse(response, origin)); + this.pluginHelper.requestUrl(request, (response) => this.onVpnResponse(response, origin)); } catch (ex) { this.logger.logWarning('There was a problem checking client IP ({IP}) for VPN - {message}',