nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-15 18:18:12 -05:00
Code

read connection string from env file for migration

Browse Source
This commit is contained in:
Kyle Spearrin 2018-10-31 23:32:22 -04:00
parent 5136b191f1
commit bb1860d861
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/Setup/EnvironmentFileBuilder.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data.SqlClient;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -68,7 +69,19 @@ namespace Bit.Setup
private void Init() private void Init()
{ {
var dbPassword = Helpers.SecureRandomString(32); var dbPassword = Helpers.SecureRandomString(32);
var dbConnectionString = Helpers.MakeSqlConnectionString("mssql", "vault", "sa", dbPassword); var dbConnectionString = new SqlConnectionStringBuilder
{
DataSource = "tcp:mssql,1433",
InitialCatalog = "vault",
UserID = "sa",
Password = dbPassword,
MultipleActiveResultSets = false,
Encrypt = true,
ConnectTimeout = 30,
TrustServerCertificate = true,
PersistSecurityInfo = false
}.ConnectionString;
_globalOverrideValues = new Dictionary<string, string> _globalOverrideValues = new Dictionary<string, string>
{ {
["globalSettings__baseServiceUri__vault"] = _context.Config.Url, ["globalSettings__baseServiceUri__vault"] = _context.Config.Url,

18
util/Setup/Helpers.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Data.SqlClient;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -94,23 +93,6 @@ namespace Bit.Setup
return characters; return characters;
} }
public static string MakeSqlConnectionString(string server, string database, string username, string password)
{
var builder = new SqlConnectionStringBuilder
{
DataSource = $"tcp:{server},1433",
InitialCatalog = database,
UserID = username,
Password = password,
MultipleActiveResultSets = false,
Encrypt = true,
ConnectTimeout = 30,
TrustServerCertificate = true,
PersistSecurityInfo = false
};
return builder.ConnectionString;
}
public static string GetValueFromEnvFile(string envFile, string key) public static string GetValueFromEnvFile(string envFile, string key)
{ {
if(!File.Exists($"/bitwarden/env/{envFile}.override.env")) if(!File.Exists($"/bitwarden/env/{envFile}.override.env"))

11
util/Setup/Program.cs
View File

@ -146,11 +146,12 @@ namespace Bit.Setup
{ {
Console.WriteLine("Migrating database."); Console.WriteLine("Migrating database.");
var dbPass = Helpers.GetValueFromEnvFile("mssql", "SA_PASSWORD"); var vaultConnectionString = Helpers.GetValueFromEnvFile("global",
var masterConnectionString = Helpers.MakeSqlConnectionString( "globalSettings__sqlServer__connectionString");
"mssql", "master", "sa", dbPass ?? string.Empty); var masterConnectionString = new SqlConnectionStringBuilder(vaultConnectionString)
var vaultConnectionString = Helpers.MakeSqlConnectionString( {
"mssql", "vault", "sa", dbPass ?? string.Empty); InitialCatalog = "master"
}.ConnectionString;
using(var connection = new SqlConnection(masterConnectionString)) using(var connection = new SqlConnection(masterConnectionString))
{ {