diff --git a/Application/API/Master/IMasterApi.cs b/Application/API/Master/IMasterApi.cs index 5c628fc6..b32d73f1 100644 --- a/Application/API/Master/IMasterApi.cs +++ b/Application/API/Master/IMasterApi.cs @@ -65,6 +65,6 @@ public interface IMasterApi Task GetLocalization(string languageTag); [Get("/plugin_subscriptions")] - Task> GetPluginSubscription([Query("instance_id")] Guid instanceId, - [Query("subscription_id")] string subscription_id); + Task> GetPluginSubscription([Query] string instance_id, + [Query] string subscription_id); } diff --git a/Application/Misc/RemoteAssemblyHandler.cs b/Application/Misc/RemoteAssemblyHandler.cs index 6b7671b1..afe2ec93 100644 --- a/Application/Misc/RemoteAssemblyHandler.cs +++ b/Application/Misc/RemoteAssemblyHandler.cs @@ -55,7 +55,7 @@ namespace IW4MAdmin.Application.Misc var decryptedContent = new byte[encryptedContent.Length]; var keyGen = new Rfc2898DeriveBytes(Encoding.UTF8.GetBytes(_appconfig.SubscriptionId), Encoding.UTF8.GetBytes(_appconfig.Id), IterationCount, HashAlgorithmName.SHA512); - var encryption = new AesGcm(keyGen.GetBytes(KeyLength)); + var encryption = new AesGcm(keyGen.GetBytes(KeyLength),TagLength); try { diff --git a/Application/Plugin/PluginImporter.cs b/Application/Plugin/PluginImporter.cs index b3292096..df3a54f6 100644 --- a/Application/Plugin/PluginImporter.cs +++ b/Application/Plugin/PluginImporter.cs @@ -167,7 +167,7 @@ namespace IW4MAdmin.Application.Plugin try { _pluginSubscription ??= _masterApi - .GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result; + .GetPluginSubscription(_appConfig.Id, _appConfig.SubscriptionId).Result; return _remoteAssemblyHandler.DecryptAssemblies(_pluginSubscription .Where(sub => sub.Type == PluginType.Binary).Select(sub => sub.Content).ToArray()); @@ -185,7 +185,7 @@ namespace IW4MAdmin.Application.Plugin try { _pluginSubscription ??= _masterApi - .GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result; + .GetPluginSubscription(_appConfig.Id, _appConfig.SubscriptionId).Result; return _remoteAssemblyHandler.DecryptScripts(_pluginSubscription .Where(sub => sub.Type == PluginType.Script).Select(sub => sub.Content).ToArray());