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

Fix SQL Connection String (#1584)

Browse Source 
* Update SQL connection string storage method

* Revert Docker Compose template

* Revert Docker Compose Builder version back to 3
This commit is contained in:
Vince Grassia 2021-09-16 10:54:46 -04:00 committed by GitHub
parent c22e48c1b4
commit ff8d736e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/Setup/EnvironmentFileBuilder.cs
View File

@ -75,7 +75,7 @@ namespace Bit.Setup
_globalOverrideValues = new Dictionary<string, string>
{
["globalSettings__baseServiceUri__vault"] = _context.Config.Url,
["globalSettings__sqlServer__connectionString"] = $"'{dbConnectionString}'",
["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString.Replace("\"", "\\\"")}\"",
["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword,
["globalSettings__internalIdentityKey"] = _context.Stub ? "RANDOM_IDENTITY_KEY" :
Helpers.SecureRandomString(64, alpha: true, numeric: true),
@ -142,7 +142,7 @@ namespace Bit.Setup
}
else
{
_values.Add(lineParts[0], value);
_values.Add(lineParts[0], value.Replace("\\\"", "\""));
}
}
}

2
util/Setup/Helpers.cs
View File

@ -105,7 +105,7 @@ namespace Bit.Setup
{
if (line.StartsWith($"{key}="))
{
return line.Split(new char[] { '=' }, 2)[1].Trim('"');
return line.Split(new char[] { '=' }, 2)[1].Trim('"').Replace("\\\"", "\"");
}
}