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

Revert "SSL Fix by default, Now use TLS (1.2, 1.1, 1) by default" (#339)

Browse Source
This commit is contained in:
flightlevel
2016-05-14 22:42:16 +10:00
parent 28199ab4be
commit 0746616b43
4 changed files with 175 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/CurlSharp/SSLFix.cs
View File

@@ -1,28 +1,13 @@
using System.Collections.ObjectModel; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CurlSharp namespace CurlSharp
{ {
/// <summary>
/// Our SSL FIX for CURL contain authorized Ciphers for SSL Communications
/// </summary>
public class SSLFix public class SSLFix
{ {
// Our CiphersList public const string CipherList = "rsa_aes_128_sha,ecdhe_rsa_aes_256_sha,ecdhe_ecdsa_aes_128_sha";
private static readonly ReadOnlyCollection<string> Ciphers = new ReadOnlyCollection<string>( new[] {
// Default supported ciphers by Jackett
"rsa_aes_128_sha",
"ecdhe_rsa_aes_256_sha",
"ecdhe_ecdsa_aes_128_sha"
});
/// <summary>
/// List of ciphers supported by Jackett
/// </summary>
/// <returns>Formatted string of ciphers</returns>
public static string CiphersList()
{
// Comma-Separated list of ciphers
return string.Join(",", Ciphers);
}
} }
} }

4
src/Jackett/CurlHelper.cs
View File

@@ -127,11 +127,11 @@ namespace Jackett
} }
} }
if (Startup.DoSSLFix.GetValueOrDefault(true)) if (Startup.DoSSLFix == true)
{ {
// http://stackoverflow.com/questions/31107851/how-to-fix-curl-35-cannot-communicate-securely-with-peer-no-common-encryptio // http://stackoverflow.com/questions/31107851/how-to-fix-curl-35-cannot-communicate-securely-with-peer-no-common-encryptio
// https://git.fedorahosted.org/cgit/mod_nss.git/plain/docs/mod_nss.html // https://git.fedorahosted.org/cgit/mod_nss.git/plain/docs/mod_nss.html
easy.SslCipherList = SSLFix.CiphersList(); easy.SslCipherList = SSLFix.CipherList;
easy.FreshConnect = true; easy.FreshConnect = true;
easy.ForbidReuse = true; easy.ForbidReuse = true;
} }

7
src/Jackett/Utils/Clients/HttpWebClient.cs
View File

@@ -69,13 +69,6 @@ namespace Jackett.Utils.Clients
proxyServer = new WebProxy(Startup.ProxyConnection, false); proxyServer = new WebProxy(Startup.ProxyConnection, false);
useProxy = true; useProxy = true;
} }
// SecurityProtocolType values below not available in Mono < 4.3
const int SecurityProtocolTypeTls11 = 768;
const int SecurityProtocolTypeTls12 = 3072;
// Specify to use TLS 1.2 as default connection
ServicePointManager.SecurityProtocol |= (SecurityProtocolType)(SecurityProtocolTypeTls12 | SecurityProtocolTypeTls11);
var client = new HttpClient(new HttpClientHandler var client = new HttpClient(new HttpClientHandler
{ {
CookieContainer = cookies, CookieContainer = cookies,

4
src/Jackett/Utils/Clients/UnixSafeCurlWebClient.cs
View File

@@ -85,11 +85,11 @@ namespace Jackett.Utils.Clients
var tempFile = Path.GetTempFileName(); var tempFile = Path.GetTempFileName();
args.AppendFormat("--output \"{0}\" ", tempFile); args.AppendFormat("--output \"{0}\" ", tempFile);
if (Startup.DoSSLFix.GetValueOrDefault(true)) if (Startup.DoSSLFix == true)
{ {
// http://stackoverflow.com/questions/31107851/how-to-fix-curl-35-cannot-communicate-securely-with-peer-no-common-encryptio // http://stackoverflow.com/questions/31107851/how-to-fix-curl-35-cannot-communicate-securely-with-peer-no-common-encryptio
// https://git.fedorahosted.org/cgit/mod_nss.git/plain/docs/mod_nss.html // https://git.fedorahosted.org/cgit/mod_nss.git/plain/docs/mod_nss.html
args.Append("--cipher " + SSLFix.CiphersList()); args.Append("--cipher " + SSLFix.CipherList);
} }
if (Startup.IgnoreSslErrors == true) if (Startup.IgnoreSslErrors == true)
{ {