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

Merge branch 'master' into dotnetcore

Browse Source
This commit is contained in:
flightlevel
2018-06-02 17:45:27 +10:00
parent f09c5722be 3df0218347
commit e4c729a588
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Jackett.Common/Definitions/shareisland.yml
View File

@@ -6,9 +6,6 @@
type: private type: private
encoding: UTF-8 encoding: UTF-8
links: links:
- http://www.shareisland.org/
legacylinks:
- https://shareisland.org/
- http://shareisland.org/ - http://shareisland.org/
caps: caps:

15
src/Jackett.Common/Indexers/BaseIndexer.cs
View File

@@ -185,7 +185,7 @@ namespace Jackett.Common.Indexers
if (runningLegacyOwin) if (runningLegacyOwin)
{ {
//Still running legacy Owin and using the DPAPI, we don't want to migrate //Still running legacy Owin and using the DPAPI, we don't want to migrate
logger.Debug("Running Owin, no need to migrate from DPAPI"); logger.Debug(ID + " - Running Owin, no need to migrate from DPAPI");
return false; return false;
} }
@@ -210,7 +210,7 @@ namespace Jackett.Common.Indexers
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.Info("Attempt to source password from json failed: " + ex.ToString()); logger.Warn($"Attempt to source password from json failed - {ID} : " + ex.ToString());
return false; return false;
} }
@@ -224,7 +224,12 @@ namespace Jackett.Common.Indexers
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.Info("Password could not be unprotected using Microsoft.AspNetCore.DataProtection, trying legacy: " + ex.ToString()); if (ex.Message != "The provided payload cannot be decrypted because it was not protected with this protection provider.")
{
logger.Info($"Password could not be unprotected using Microsoft.AspNetCore.DataProtection - {ID} : " + ex.ToString());
}
logger.Info($"Attempting legacy Unprotect - {ID} : ");
try try
{ {
@@ -235,11 +240,13 @@ namespace Jackett.Common.Indexers
SaveConfig(); SaveConfig();
IsConfigured = true; IsConfigured = true;
logger.Info($"Password successfully migrated for {ID}");
return true; return true;
} }
catch (Exception exception) catch (Exception exception)
{ {
logger.Info("Password could not be unprotected using legacy DPAPI: " + exception.ToString()); logger.Info($"Password could not be unprotected using legacy DPAPI - {ID} : " + exception.ToString());
} }
} }
} }

6
src/Jackett.Common/Jackett.Common.csproj
View File

@@ -114,17 +114,17 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.9.2" /> <PackageReference Include="AngleSharp" Version="0.9.9.2" />
<PackageReference Include="Autofac" Version="4.6.2" /> <PackageReference Include="Autofac" Version="4.8.1" />
<PackageReference Include="AutoMapper" Version="6.2.2" /> <PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="BencodeNET" Version="2.2.24" /> <PackageReference Include="BencodeNET" Version="2.2.24" />
<PackageReference Include="CloudFlareUtilities" Version="1.2.0" /> <PackageReference Include="CloudFlareUtilities" Version="1.2.0" />
<PackageReference Include="CommandLineParser" Version="2.2.1" /> <PackageReference Include="CommandLineParser" Version="2.2.1" />
<PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" /> <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" /> <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" /> <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="MimeMapping" Version="1.0.1.12" /> <PackageReference Include="MimeMapping" Version="1.0.1.12" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NLog" Version="4.5.5" /> <PackageReference Include="NLog" Version="4.5.6" />
<PackageReference Include="YamlDotNet" Version="4.3.2-pre0473" /> <PackageReference Include="YamlDotNet" Version="4.3.2-pre0473" />
</ItemGroup> </ItemGroup>

2
src/Jackett.Test/Jackett.Test.csproj
View File

@@ -15,7 +15,7 @@
<EmbeddedResource Include="Util\Invalid-RSS.xml" /> <EmbeddedResource Include="Util\Invalid-RSS.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="4.6.2" /> <PackageReference Include="Autofac" Version="4.8.1" />
<PackageReference Include="FluentAssertions" Version="5.2.0" /> <PackageReference Include="FluentAssertions" Version="5.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" /> <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />