shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement AspNetCore.DataProtection to replace DPAPI

Browse Source
This commit is contained in:
flightlevel
2018-05-30 21:43:58 +10:00
parent 10c5c99385
commit e73ae99e38
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Jackett.Server/Program.cs
View File

@@ -12,6 +12,7 @@ using Microsoft.Extensions.Configuration;
using NLog;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
@@ -34,13 +35,13 @@ namespace Jackett.Server
});
var runtimeDictionary = new Dictionary<string, string>();
RuntimeSettings r = new RuntimeSettings();
RuntimeSettings runtimeSettings = new RuntimeSettings();
ConsoleOptions consoleOptions = new ConsoleOptions();
optionsResult.WithParsed(options =>
{
r = options.ToRunTimeSettings();
runtimeSettings = options.ToRunTimeSettings();
consoleOptions = options;
runtimeDictionary = GetValues(r);
runtimeDictionary = GetValues(runtimeSettings);
});
var builder = new ConfigurationBuilder();
@@ -50,8 +51,8 @@ namespace Jackett.Server
//hack TODO: Get the configuration without any DI
var containerBuilder = new ContainerBuilder();
Initialisation.SetupLogging(r, containerBuilder);
containerBuilder.RegisterModule(new JackettModule(r));
Initialisation.SetupLogging(runtimeSettings, containerBuilder);
containerBuilder.RegisterModule(new JackettModule(runtimeSettings));
containerBuilder.RegisterType<ServerService>().As<IServerService>();
containerBuilder.RegisterType<SecuityService>().As<ISecuityService>();
containerBuilder.RegisterType<ProtectionService>().As<IProtectionService>();
@@ -63,6 +64,11 @@ namespace Jackett.Server
IServerService serverService = tempContainer.Resolve<IServerService>();
Int32.TryParse(serverConfig.Port.ToString(), out Int32 configPort);
DirectoryInfo dataProtectionFolder = new DirectoryInfo(Path.Combine(runtimeSettings.DataFolder, "DataProtection"));
if (!dataProtectionFolder.Exists)
{
dataProtectionFolder.Create();
}
// Override port
if (consoleOptions.Port != 0)