GitHub-Bitwarden
/
server
mirror of https://github.com/bitwarden/server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

helpers and banner

pull/288/head
Kyle Spearrin 8 years ago
parent
b048dbcb6b
commit
5049f94d9b
3 changed files with 54 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      util/Setup/CertBuilder.cs
  2. 35
      util/Setup/Helpers.cs
  3. 50
      util/Setup/Program.cs

11
util/Setup/CertBuilder.cs
Unescape View File

@ -23,8 +23,7 @@ namespace Bit.Setup @@ -23,8 +23,7 @@ namespace Bit.Setup
var selfSignedSsl = false;
if(!Ssl)
{
Console.Write("(!) Do you want to generate a self-signed SSL certificate? (y/n): ");
if(Console.ReadLine().ToLowerInvariant() == "y")
if(Helpers.ReadQuestion("Do you want to generate a self-signed SSL certificate?"))
{
Directory.CreateDirectory($"/bitwarden/ssl/self/{Domain}/");
Console.WriteLine("Generating self signed SSL certificate.");
@ -36,11 +35,10 @@ namespace Bit.Setup @@ -36,11 +35,10 @@ namespace Bit.Setup
}
else
{
Console.WriteLine("\n!!!!!!!!!! WARNING !!!!!!!!!!");
Console.WriteLine("You are not using an SSL certificate. Bitwarden requires HTTPS to operate. " +
var message = "You are not using an SSL certificate. Bitwarden requires HTTPS to operate. " +
"You must front your installation with a HTTPS proxy. The web vault (and other Bitwarden " +
"apps) will not work properly without HTTPS.");
Console.WriteLine("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
"apps) will not work properly without HTTPS.";
Helpers.ShowBanner("WARNING", message, ConsoleColor.Yellow);
}
}
@ -57,6 +55,7 @@ namespace Bit.Setup @@ -57,6 +55,7 @@ namespace Bit.Setup
Helpers.Exec("openssl pkcs12 -export -out /bitwarden/identity/identity.pfx -inkey identity.key " +
$"-in identity.crt -certfile identity.crt -passout pass:{IdentityCertPassword}");
Console.WriteLine();
return selfSignedSsl;
}
}

35
util/Setup/Helpers.cs
Unescape View File

@ -158,5 +158,40 @@ namespace Bit.Setup @@ -158,5 +158,40 @@ namespace Bit.Setup
process.WaitForExit();
return result;
}
public static string ReadInput(string prompt)
{
Console.ForegroundColor = ConsoleColor.Cyan;
Console.Write("(!) ");
Console.ResetColor();
Console.Write(prompt);
if(prompt.EndsWith("?"))
{
Console.Write(" (y/n)");
}
Console.Write(": ");
var input = Console.ReadLine();
Console.WriteLine();
return input;
}
public static bool ReadQuestion(string prompt)
{
var input = ReadInput(prompt).ToLowerInvariant().Trim();
return input == "y" || input == "yes";
}
public static void ShowBanner(string title, string message, ConsoleColor? color = null)
{
if(color != null)
{
Console.ForegroundColor = color.Value;
}
Console.WriteLine($"!!!!!!!!!! {title} !!!!!!!!!!");
Console.WriteLine(message);
Console.WriteLine("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
Console.WriteLine();
Console.ResetColor();
}
}
}

50
util/Setup/Program.cs
Unescape View File

@ -73,12 +73,12 @@ namespace Bit.Setup @@ -73,12 +73,12 @@ namespace Bit.Setup
var ssl = letsEncrypt;
if(!letsEncrypt)
{
ssl = ReadQuestion("Do you have a SSL certificate to use?");
ssl = Helpers.ReadQuestion("Do you have a SSL certificate to use?");
if(ssl)
{
Directory.CreateDirectory($"/bitwarden/ssl/{domain}/");
Console.WriteLine("*** Make sure 'certificate.crt' and 'private.key' are provided in the " +
"appropriate directory (see docs for info). ***\n");
Helpers.ShowBanner("NOTE", "Make sure 'certificate.crt' and 'private.key' are provided in the " +
"appropriate directory (see docs for info).");
}
}
@ -91,14 +91,14 @@ namespace Bit.Setup @@ -91,14 +91,14 @@ namespace Bit.Setup
var sslDiffieHellman = letsEncrypt;
if(ssl && !selfSignedSsl && !letsEncrypt)
{
sslDiffieHellman = ReadQuestion(
sslDiffieHellman = Helpers.ReadQuestion(
"Use Diffie Hellman ephemeral parameters for SSL (requires dhparam.pem)?");
sslTrusted = ReadQuestion("Is this a trusted SSL certificate (requires ca.crt)?");
sslTrusted = Helpers.ReadQuestion("Is this a trusted SSL certificate (requires ca.crt)?");
}
var url = $"https://{domain}";
int httpPort = default(int), httpsPort = default(int);
if(ReadQuestion("Do you want to use the default ports for HTTP (80) and HTTPS (443)?"))
if(Helpers.ReadQuestion("Do you want to use the default ports for HTTP (80) and HTTPS (443)?"))
{
httpPort = 80;
if(ssl)
@ -109,7 +109,7 @@ namespace Bit.Setup @@ -109,7 +109,7 @@ namespace Bit.Setup
else if(ssl)
{
httpsPort = 443;
if(int.TryParse(ReadInput("HTTPS port").ToLowerInvariant().Trim(), out httpsPort) && httpsPort != 443)
if(int.TryParse(Helpers.ReadInput("HTTPS port").Trim(), out httpsPort) && httpsPort != 443)
{
url += (":" + httpsPort);
}
@ -121,21 +121,21 @@ namespace Bit.Setup @@ -121,21 +121,21 @@ namespace Bit.Setup
else
{
httpPort = 80;
if(!int.TryParse(ReadInput("HTTP port").ToLowerInvariant().Trim(), out httpPort) && httpPort != 80)
if(!int.TryParse(Helpers.ReadInput("HTTP port").Trim(), out httpPort) && httpPort != 80)
{
Console.WriteLine("Using default port.");
}
}
if(ReadQuestion("Is your installation behind a reverse proxy?"))
if(Helpers.ReadQuestion("Is your installation behind a reverse proxy?"))
{
if(ReadQuestion("Do you use the default HTTPS port (443) on your reverse proxy?"))
if(Helpers.ReadQuestion("Do you use the default HTTPS port (443) on your reverse proxy?"))
{
url = $"https://{domain}";
}
else
{
if(int.TryParse(ReadInput("Proxy HTTPS port").ToLowerInvariant().Trim(), out var httpsReversePort)
if(int.TryParse(Helpers.ReadInput("Proxy HTTPS port").Trim(), out var httpsReversePort)
&& httpsReversePort != 443)
{
url += (":" + httpsReversePort);
@ -153,7 +153,7 @@ namespace Bit.Setup @@ -153,7 +153,7 @@ namespace Bit.Setup
return;
}
var push = ReadQuestion("Do you want to use push notifications?");
var push = Helpers.ReadQuestion("Do you want to use push notifications?");
var nginxBuilder = new NginxConfigBuilder(domain, url, ssl, selfSignedSsl, letsEncrypt,
sslTrusted, sslDiffieHellman);
@ -270,7 +270,7 @@ namespace Bit.Setup @@ -270,7 +270,7 @@ namespace Bit.Setup
private static bool ValidateInstallation()
{
var installationId = ReadInput("Enter your installation id (get it at https://bitwarden.com/host)");
var installationId = Helpers.ReadInput("Enter your installation id (get at https://bitwarden.com/host)");
if(!Guid.TryParse(installationId.Trim(), out var installationidGuid))
{
Console.WriteLine("Invalid installation id.");
@ -278,7 +278,7 @@ namespace Bit.Setup @@ -278,7 +278,7 @@ namespace Bit.Setup
}
_installationId = installationidGuid;
_installationKey = ReadInput("Enter your installation key");
_installationKey = Helpers.ReadInput("Enter your installation key");
try
{
@ -358,27 +358,5 @@ namespace Bit.Setup @@ -358,27 +358,5 @@ namespace Bit.Setup
return dict;
}
private static string ReadInput(string prompt)
{
Console.ForegroundColor = ConsoleColor.Cyan;
Console.Write("(!) ");
Console.ResetColor();
Console.Write(prompt);
if(prompt.EndsWith("?"))
{
Console.Write(" (y/n)");
}
Console.Write(": ");
var input = Console.ReadLine();
Console.WriteLine();
return input;
}
private static bool ReadQuestion(string prompt)
{
var input = ReadInput(prompt).ToLowerInvariant().Trim();
return input == "y" || input == "yes";
}
}
}

Write Preview
Loading…
Cancel
Save