INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-07 21:58:06 -05:00
Code Issues Releases Wiki Activity

fix remote plugin loading

Browse Source
This commit is contained in:
RaidMax 2024-06-29 11:14:09 -05:00
parent eec0a21005
commit 63e1f31c21
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Application/API/Master/IMasterApi.cs
View File

@ -65,6 +65,6 @@ public interface IMasterApi
Task<SharedLibraryCore.Localization.Layout> GetLocalization(string languageTag); Task<SharedLibraryCore.Localization.Layout> GetLocalization(string languageTag);
[Get("/plugin_subscriptions")] [Get("/plugin_subscriptions")]
Task<IEnumerable<PluginSubscriptionContent>> GetPluginSubscription([Query("instance_id")] Guid instanceId, Task<IEnumerable<PluginSubscriptionContent>> GetPluginSubscription([Query] string instance_id,
[Query("subscription_id")] string subscription_id); [Query] string subscription_id);
} }

2
Application/Misc/RemoteAssemblyHandler.cs
View File

@ -55,7 +55,7 @@ namespace IW4MAdmin.Application.Misc
var decryptedContent = new byte[encryptedContent.Length]; var decryptedContent = new byte[encryptedContent.Length];
var keyGen = new Rfc2898DeriveBytes(Encoding.UTF8.GetBytes(_appconfig.SubscriptionId), Encoding.UTF8.GetBytes(_appconfig.Id), IterationCount, HashAlgorithmName.SHA512); 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 try
{ {

4
Application/Plugin/PluginImporter.cs
View File

@ -167,7 +167,7 @@ namespace IW4MAdmin.Application.Plugin
try try
{ {
_pluginSubscription ??= _masterApi _pluginSubscription ??= _masterApi
.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result; .GetPluginSubscription(_appConfig.Id, _appConfig.SubscriptionId).Result;
return _remoteAssemblyHandler.DecryptAssemblies(_pluginSubscription return _remoteAssemblyHandler.DecryptAssemblies(_pluginSubscription
.Where(sub => sub.Type == PluginType.Binary).Select(sub => sub.Content).ToArray()); .Where(sub => sub.Type == PluginType.Binary).Select(sub => sub.Content).ToArray());
@ -185,7 +185,7 @@ namespace IW4MAdmin.Application.Plugin
try try
{ {
_pluginSubscription ??= _masterApi _pluginSubscription ??= _masterApi
.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result; .GetPluginSubscription(_appConfig.Id, _appConfig.SubscriptionId).Result;
return _remoteAssemblyHandler.DecryptScripts(_pluginSubscription return _remoteAssemblyHandler.DecryptScripts(_pluginSubscription
.Where(sub => sub.Type == PluginType.Script).Select(sub => sub.Content).ToArray()); .Where(sub => sub.Type == PluginType.Script).Select(sub => sub.Content).ToArray());