nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-14 09:38:16 -05:00
Code

contains checks for nginx conf config.yml build

Browse Source
This commit is contained in:
Kyle Spearrin 2018-08-30 22:30:31 -04:00
parent 5a44ce4f0e
commit c87ce222eb
2 changed files with 9 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
util/Setup/Context.cs
View File

@ -41,6 +41,7 @@ namespace Bit.Setup
var composeFile = "/bitwarden/docker/docker-compose.yml"; var composeFile = "/bitwarden/docker/docker-compose.yml";
if(File.Exists(composeFile)) if(File.Exists(composeFile))
{ {
Console.WriteLine("1");
var fileLines = File.ReadAllLines(composeFile); var fileLines = File.ReadAllLines(composeFile);
foreach(var line in fileLines) foreach(var line in fileLines)
{ {
@ -79,54 +80,13 @@ namespace Bit.Setup
var nginxFile = "/bitwarden/nginx/default.conf"; var nginxFile = "/bitwarden/nginx/default.conf";
if(File.Exists(nginxFile)) if(File.Exists(nginxFile))
{ {
var selfSigned = false; Console.WriteLine("2");
var diffieHellman = false; var confContent = File.ReadAllText(nginxFile);
var trusted = false; var selfSigned = confContent.Contains("/etc/ssl/self/");
var fileLines = File.ReadAllLines(nginxFile); Config.Ssl = confContent.Contains("ssl http2;");
foreach(var line in fileLines) Config.SslManagedLetsEncrypt = !selfSigned && confContent.Contains("/etc/letsencrypt/live/");
{ var diffieHellman = confContent.Contains("/dhparam.pem;");
if(!line.StartsWith("# Parameter:")) var trusted = confContent.Contains("ssl_trusted_certificate ");
{
continue;
}
var paramParts = line.Split("=");
if(paramParts.Length < 2)
{
continue;
}
if(paramParts[0] == "# Parameter:Ssl" && bool.TryParse(paramParts[1], out var ssl))
{
Config.Ssl = ssl;
continue;
}
if(paramParts[0] == "# Parameter:LetsEncrypt" && bool.TryParse(paramParts[1], out var le))
{
Config.SslManagedLetsEncrypt = le;
continue;
}
if(paramParts[0] == "# Parameter:SelfSignedSsl" && bool.TryParse(paramParts[1], out var self))
{
selfSigned = self;
return;
}
if(paramParts[0] == "# Parameter:DiffieHellman" && bool.TryParse(paramParts[1], out var dh))
{
diffieHellman = dh;
return;
}
if(paramParts[0] == "# Parameter:Trusted" && bool.TryParse(paramParts[1], out var trust))
{
trusted = trust;
return;
}
}
if(Config.SslManagedLetsEncrypt) if(Config.SslManagedLetsEncrypt)
{ {
Config.Ssl = true; Config.Ssl = true;

1
util/Setup/Program.cs
View File

@ -254,6 +254,7 @@ namespace Bit.Setup
dockerComposeBuilder.BuildForUpdater(); dockerComposeBuilder.BuildForUpdater();
_context.SaveConfiguration(); _context.SaveConfiguration();
Console.WriteLine(string.Empty);
} }
private static void ParseParameters() private static void ParseParameters()