michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Removed WAN DDNS

Browse Source 
It's odd that JF still had code lying around for generating a self signed cert. Currently, it does not do this so this code has been removed.

JF also appears to have functions in place to modify provided certs? Warrants deeper investigation. JF should not be attempting modifications of any certs under any circumstance.
This commit is contained in:
sparky8251 2019-09-19 15:56:54 -04:00
parent 208c8b2b9d
commit 14f563d7c2
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -1198,25 +1198,11 @@ namespace Emby.Server.Implementations
private CertificateInfo GetCertificateInfo(bool generateCertificate) private CertificateInfo GetCertificateInfo(bool generateCertificate)
{ {
if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePath)) // Custom cert
{
// Custom cert
return new CertificateInfo
{
Path = ServerConfigurationManager.Configuration.CertificatePath,
Password = ServerConfigurationManager.Configuration.CertificatePassword
};
}
// Generate self-signed cert
var certHost = GetHostnameFromExternalDns(ServerConfigurationManager.Configuration.WanDdns);
var certPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.ProgramDataPath, "ssl", "cert_" + (certHost + "2").GetMD5().ToString("N", CultureInfo.InvariantCulture) + ".pfx");
const string Password = "embycert";
return new CertificateInfo return new CertificateInfo
{ {
Path = certPath, Path = ServerConfigurationManager.Configuration.CertificatePath,
Password = Password Password = ServerConfigurationManager.Configuration.CertificatePassword
}; };
} }

1
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -162,7 +162,6 @@ namespace MediaBrowser.Model.Configuration
public bool SkipDeserializationForBasicTypes { get; set; } public bool SkipDeserializationForBasicTypes { get; set; }
public string ServerName { get; set; } public string ServerName { get; set; }
public string WanDdns { get; set; }
public string BaseUrl { get; set; } public string BaseUrl { get; set; }
public string UICulture { get; set; } public string UICulture { get; set; }