From 4814cef245474a2324afe697121ccd42d6bdeefa Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Mon, 21 Mar 2022 18:13:00 -0400 Subject: [PATCH] Feature/self hosted development (#1921) * Add self-host option to migration runner * Add Self-host launch options * Add self-hosted settings override Let's a single secrets/env config file control both cloud and self-hosted settings by allowing overrides to cloud settings with self-hosted * Allow dev-signed licenses on dev self-hosted * Allow setting bitwarden cloud api url Useful for testing api integration between installations and cloud * Remove testing echoes * Remove run config property groups * Use `getopts` for options * Pass in full environment --- .vscode/launch.json | 347 ++++++++++++++++++ .vscode/tasks.json | 125 +++++++ .../src/Sso/Properties/launchSettings.json | 9 + bitwarden_license/src/Sso/Sso.csproj | 1 - bitwarden_license/src/Sso/Startup.cs | 2 +- dev/helpers/mssql/run_migrations.sh | 25 +- src/Admin/Properties/launchSettings.json | 9 + src/Admin/Startup.cs | 2 +- src/Api/Properties/launchSettings.json | 11 +- src/Api/Startup.cs | 2 +- src/Billing/Startup.cs | 6 +- src/Core/Core.csproj | 1 + .../Implementations/LicensingService.cs | 4 +- src/Core/Settings/GlobalSettings.cs | 5 + src/Core/licensing_dev.cer | Bin 0 -> 1303 bytes src/Events/Properties/launchSettings.json | 9 + src/Events/Startup.cs | 2 +- src/EventsProcessor/Startup.cs | 2 +- src/Icons/Startup.cs | 6 +- src/Identity/Properties/launchSettings.json | 11 +- src/Identity/Startup.cs | 2 +- src/Notifications/Startup.cs | 2 +- .../Utilities/ServiceCollectionExtensions.cs | 9 +- 23 files changed, 564 insertions(+), 28 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json create mode 100644 src/Core/licensing_dev.cer diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..2fb0e97e6e --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,347 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "compounds": [ + { + "name": "Min Server", + "configurations": [ + "Identity", + "API" + ], + "presentation": { + "hidden": false, + "group": "AA_compounds", + "order": 1 + }, + "stopAll": true + }, + { + "name": "Admin, API, Identity", + "configurations": [ + "Admin", + "API", + "Identity" + ], + "presentation": { + "hidden": false, + "group": "AA_compounds", + "order": 3 + }, + "stopAll": true + }, + { + "name": "Full Server", + "configurations": [ + "Admin", + "API", + "EventsProcessor", + "Identity", + "Sso", + "Icons", + ], + "presentation": { + "hidden": false, + "group": "AA_compounds", + "order": 4 + }, + "stopAll": true + }, + { + "name": "Self Host: Bit", + "configurations": [ + "Admin-SelfHost", + "API-SelfHost", + "EventsProcessor-SelfHost", + "Identity-SelfHost", + "Sso-SelfHost", + ], + "presentation": { + "hidden": false, + "group": "AA_compounds", + "order": 2 + }, + "stopAll": true + }, + { + "name": "Self Host: OSS", + "configurations": [ + "Admin-SelfHost", + "API-SelfHost", + "EventsProcessor-SelfHost", + "Identity-SelfHost", + ], + "presentation": { + "hidden": false, + "group": "AA_compounds", + "order": 99 + }, + "stopAll": true + } + ], + "configurations": [ + { + "name": "Identity", + "presentation": { + "hidden": false, + "group": "cloud", + "order": 10 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildIdentity", + "program": "${workspaceFolder}/src/Identity/bin/Debug/net5.0/Identity.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Identity", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "API", + "presentation": { + "hidden": false, + "group": "cloud", + "order": 10 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildAPI", + "program": "${workspaceFolder}/src/Api/bin/Debug/net5.0/Api.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Api", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "Admin", + "presentation": { + "hidden": false, + "group": "cloud", + "order": 20 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildAdmin", + "OS-COMMENT4": "If you have changed target frameworks, make sure to update the program path.", + "program": "${workspaceFolder}/src/Admin/bin/Debug/net5.0/Admin.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Admin", + "stopAtEntry": false, + "OS-COMMENT5": "Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "Sso", + "presentation": { + "hidden": false, + "group": "cloud", + "order": 50 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildSso", + "program": "${workspaceFolder}/bitwarden_license/src/Sso/bin/Debug/net5.0/Sso.dll", + "args": [], + "cwd": "${workspaceFolder}/bitwarden_license/src/Sso", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "EventsProcessor", + "presentation": { + "hidden": false, + "group": "cloud", + "order": 90 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildEventsProcessor", + "program": "${workspaceFolder}/src/EventsProcessor/bin/Debug/net5.0/EventsProcessor.dll", + "args": [], + "cwd": "${workspaceFolder}/src/EventsProcessor", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "Icons", + "presentation": { + "hidden": false, + "group": "cloud", + "order": 90 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildIcons", + "program": "${workspaceFolder}/src/Icons/bin/Debug/net5.0/Icons.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Icons", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "Identity-SelfHost", + "presentation": { + "hidden": true, + "group": "self-host", + "order": 999 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildIdentity", + "program": "${workspaceFolder}/src/Identity/bin/Debug/net5.0/Identity.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Identity", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://localhost:33657", + "developSelfHosted": "true" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "API-SelfHost", + "presentation": { + "hidden": true, + "group": "self-host", + "order": 999 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildAPI", + "program": "${workspaceFolder}/src/Api/bin/Debug/net5.0/Api.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Api", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://localhost:4001", + "developSelfHosted": "true" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "Admin-SelfHost", + "presentation": { + "hidden": true, + "group": "self-host", + "order": 999 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildAdmin", + "OS-COMMENT4": "If you have changed target frameworks, make sure to update the program path.", + "program": "${workspaceFolder}/src/Admin/bin/Debug/net5.0/Admin.dll", + "args": [], + "cwd": "${workspaceFolder}/src/Admin", + "stopAtEntry": false, + "OS-COMMENT5": "Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://localhost:62912", + "developSelfHosted": "true" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "Sso-SelfHost", + "presentation": { + "hidden": true, + "group": "self-host", + "order": 999 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildSso", + "program": "${workspaceFolder}/bitwarden_license/src/Sso/bin/Debug/net5.0/Sso.dll", + "args": [], + "cwd": "${workspaceFolder}/bitwarden_license/src/Sso", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://localhost:51822", + "developSelfHosted": "true" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": "EventsProcessor-SelfHost", + "presentation": { + "hidden": true, + "group": "self-host", + "order": 999 + }, + "requireExactSource": true, + "type": "coreclr", + "request": "launch", + "preLaunchTask": "buildEventsProcessor", + "program": "${workspaceFolder}/src/EventsProcessor/bin/Debug/net5.0/EventsProcessor.dll", + "args": [], + "cwd": "${workspaceFolder}/src/EventsProcessor", + "stopAtEntry": false, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://localhost:46274", + "developSelfHosted": "true" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ], +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000000..9837893855 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,125 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "buildIcons", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/Icons/Icons.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "buildPortal", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/bitwarden_license/src/Portal/Portal.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "buildSso", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/bitwarden_license/src/Sso/Sso.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "buildEventsProcessor", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/EventsProcessor/EventsProcessor.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "buildAdmin", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/Admin/Admin.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "buildIdentity", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/Identity/Identity.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "buildAPI", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/Api/Api.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile", + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "clean", + "type": "shell", + "command": "dotnet clean", + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "problemMatcher": "$msCompile" + }, + { + "label": "test", + "type": "shell", + "command": "dotnet test", + "group": { + "kind": "test", + "isDefault": true + }, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared", + "showReuseMessage": true, + "clear": false + }, + "problemMatcher": "$msCompile" + } + ] +} diff --git a/bitwarden_license/src/Sso/Properties/launchSettings.json b/bitwarden_license/src/Sso/Properties/launchSettings.json index 8367fbeb72..e9c6e1dd1c 100644 --- a/bitwarden_license/src/Sso/Properties/launchSettings.json +++ b/bitwarden_license/src/Sso/Properties/launchSettings.json @@ -22,6 +22,15 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } + }, + "Sso-SelfHost": { + "commandName": "Project", + "launchBrowser": false, + "applicationUrl": "http://localhost:51823", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "developSelfHosted": "true" + } } } } diff --git a/bitwarden_license/src/Sso/Sso.csproj b/bitwarden_license/src/Sso/Sso.csproj index 3c95f46325..db322b5b5b 100644 --- a/bitwarden_license/src/Sso/Sso.csproj +++ b/bitwarden_license/src/Sso/Sso.csproj @@ -4,7 +4,6 @@ bitwarden-Sso - diff --git a/bitwarden_license/src/Sso/Startup.cs b/bitwarden_license/src/Sso/Startup.cs index 2b45504543..0156ed6d1f 100644 --- a/bitwarden_license/src/Sso/Startup.cs +++ b/bitwarden_license/src/Sso/Startup.cs @@ -34,7 +34,7 @@ namespace Bit.Sso services.AddOptions(); // Settings - var globalSettings = services.AddGlobalSettingsServices(Configuration); + var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment); // Stripe Billing StripeConfiguration.ApiKey = globalSettings.Stripe.ApiKey; diff --git a/dev/helpers/mssql/run_migrations.sh b/dev/helpers/mssql/run_migrations.sh index 97cd4b69a4..4024b16958 100755 --- a/dev/helpers/mssql/run_migrations.sh +++ b/dev/helpers/mssql/run_migrations.sh @@ -12,6 +12,20 @@ DATABASE="vault_dev" USER="SA" PASSWD=$MSSQL_PASSWORD +while getopts "rs" arg; do + case $arg in + r) + echo "Rerunning the last migration" + RERUN=1 + ;; + s) + echo "Running for self-host environment" + LAST_MIGRATION_FILE="/mnt/data/last_self_host_migration" + DATABASE="vault_dev_self_host" + ;; + esac +done + if [ ! -f "$LAST_MIGRATION_FILE" ]; then echo "$LAST_MIGRATION_FILE not found!" echo "This will run all migrations which might cause unexpected behaviour if the database is not empty." @@ -30,17 +44,6 @@ fi [ -z "$LAST_MIGRATION" ] PERFORM_MIGRATION=$? -while getopts "r" arg; do - case $arg in - r) - RERUN=1 - ;; - esac -done - -if [ -n "$RERUN" ]; then - echo "Rerunning the last migration" -fi # Create database if it does not already exist QUERY="IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = '$DATABASE') diff --git a/src/Admin/Properties/launchSettings.json b/src/Admin/Properties/launchSettings.json index 4e1b92a719..579b1e11a0 100644 --- a/src/Admin/Properties/launchSettings.json +++ b/src/Admin/Properties/launchSettings.json @@ -22,6 +22,15 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "applicationUrl": "http://localhost:62911/" + }, + "Admin-SelfHost": { + "commandName": "Project", + "launchBrowser": false, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "developSelfHosted": "true" + }, + "applicationUrl": "http://localhost:62912/" } } } diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs index 8ba71017b8..61a354251e 100644 --- a/src/Admin/Startup.cs +++ b/src/Admin/Startup.cs @@ -38,7 +38,7 @@ namespace Bit.Admin services.AddOptions(); // Settings - var globalSettings = services.AddGlobalSettingsServices(Configuration); + var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment); services.Configure(Configuration.GetSection("AdminSettings")); // Data Protection diff --git a/src/Api/Properties/launchSettings.json b/src/Api/Properties/launchSettings.json index ccbec652d6..5cf88eb93d 100644 --- a/src/Api/Properties/launchSettings.json +++ b/src/Api/Properties/launchSettings.json @@ -22,6 +22,15 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } + }, + "Api-SelfHost": { + "commandName": "Project", + "launchBrowser": false, + "applicationUrl": "http://localhost:4000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "developSelfHosted": "true" + } } } -} \ No newline at end of file +} diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index 57e0c1acd3..db84ec3367 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -43,7 +43,7 @@ namespace Bit.Api services.AddOptions(); // Settings - var globalSettings = services.AddGlobalSettingsServices(Configuration); + var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment); if (!globalSettings.SelfHosted) { services.Configure(Configuration.GetSection("IpRateLimitOptions")); diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs index 28f17ef8cb..7ad1070e6d 100644 --- a/src/Billing/Startup.cs +++ b/src/Billing/Startup.cs @@ -18,13 +18,15 @@ namespace Bit.Billing { public class Startup { - public Startup(IConfiguration configuration) + public Startup(IWebHostEnvironment env, IConfiguration configuration) { CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US"); Configuration = configuration; + Environment = env; } public IConfiguration Configuration { get; } + public IWebHostEnvironment Environment { get; set; } public void ConfigureServices(IServiceCollection services) { @@ -32,7 +34,7 @@ namespace Bit.Billing services.AddOptions(); // Settings - var globalSettings = services.AddGlobalSettingsServices(Configuration); + var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment); services.Configure(Configuration.GetSection("BillingSettings")); // Stripe Billing diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index bafa7703e5..449749fa1b 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -15,6 +15,7 @@ + diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs index 4190c5373e..6eb17e22cc 100644 --- a/src/Core/Services/Implementations/LicensingService.cs +++ b/src/Core/Services/Implementations/LicensingService.cs @@ -45,12 +45,12 @@ namespace Bit.Core.Services _logger = logger; _globalSettings = globalSettings; - var certThumbprint = environment.IsDevelopment() && !_globalSettings.SelfHosted ? + var certThumbprint = environment.IsDevelopment() ? "207E64A231E8AA32AAF68A61037C075EBEBD553F" : "‎B34876439FCDA2846505B2EFBBA6C4A951313EBE"; if (_globalSettings.SelfHosted) { - _certificate = CoreHelpers.GetEmbeddedCertificateAsync("licensing.cer", null) + _certificate = CoreHelpers.GetEmbeddedCertificateAsync(environment.IsDevelopment() ? "licensing_dev.cer" : "licensing.cer", null) .GetAwaiter().GetResult(); } else if (CoreHelpers.SettingHasValue(_globalSettings.Storage?.ConnectionString) && diff --git a/src/Core/Settings/GlobalSettings.cs b/src/Core/Settings/GlobalSettings.cs index 5259c75643..1f6c242038 100644 --- a/src/Core/Settings/GlobalSettings.cs +++ b/src/Core/Settings/GlobalSettings.cs @@ -424,6 +424,7 @@ namespace Bit.Core.Settings public class InstallationSettings { private string _identityUri; + private string _apiUri; public Guid Id { get; set; } public string Key { get; set; } @@ -432,6 +433,10 @@ namespace Bit.Core.Settings get => string.IsNullOrWhiteSpace(_identityUri) ? "https://identity.bitwarden.com" : _identityUri; set => _identityUri = value; } + public string ApiUri + { + get => string.IsNullOrWhiteSpace(_apiUri) ? "https://api.biwarden.com" : _apiUri; + } } public class AmazonSettings diff --git a/src/Core/licensing_dev.cer b/src/Core/licensing_dev.cer new file mode 100644 index 0000000000000000000000000000000000000000..0dbb09c3c6e070d788dc84985ef36f955b9758bf GIT binary patch literal 1303 zcmXqLVih)MV*0&+nTe5!iId^=m%=$KUe0VX;AP{~YV&CO&dbQi&B|b)U?^uG!^RxS z!ptL@lvz@qSd@~Qr{I&BoSIjhs^F4ZW*{fdYiMp@VPI)!YGh(;5+%-S0^%A$xkQ-I z#H565Eh8%fa}yIk1JHR~OifIT46pCa*%`=O{^I=xv(xwgeHGQX`$6A@(Pa0xyScqn zbzbf&5#tcZ;5cU)wlsYp%svmnWXbokO1e zRtuSDAmv?UDYu|9RB+kxu*E4I$9~S#4&CLnew)b?t?eogD<=Fi3u25eF!$Q?h4Iv8 zyMUfn-FB^m3xd>{4k-V!+sKtS!E(vWjGY(moe0>v_UOjg{NqO7&y=3Ep0zu$YEt9( z!py_RE7JUrcXEEY_vWF$f!y@x*Lf|!^h-9`ED>qvC`)PIGAm+h$#35257uncm)`c! zT#!dtJ-%JN>&R2Z9*-B|@2XGcYcreQiTG3Y;Mcm?3zzfvpDq1RdTq@fxkhc)HSPCB zf{y(z{NliP)ytsE>wJu0`1Mx@WA;ppE@krkY8$+s<+bI>hgT)zw)@E^XYZ}Z}xCo?P-emz0h&Pz0(s;hi%$% zO1ks8)Aw^v8lw}srw5*BF~6o-r(#{(rl_*{n%K@afAnX?e^=S%%j(U<%*epFIKaTq zKo*!1W%*ddSVWHgEZB7A?d|6of)^h=**3e6$I0`UfjmfBnMJ}ttO2_M9*_cI7FGjh zM#lfhX%3jwfoYDBAvnvg>o`M^+u63=CT?us9E9%ud1Q4!C9yr+IH!ElmE>z|^6R%b zh@Zc*%wpn0_5I>YXNdCKTl;cP->@Z9W$Mf+yV4ie_&XlaV0JZA(&@19s(X|4J1X2@ zwZf0@n{HX=Y4EOCd!m}1{f^k2$nKaRfo(poJ@)2j?G9h_G+7$yn7KOLR)v=dP7B*E5biFSv&3;EiZ1T^ehge@8G5ddf+4PGOj5S$!g*fy@ znHDY4@zt9mo@lCjQ{P|XMxEaGV=~L1&JbCyQ?tAOsY->B+`Ej2qQ^fPtiSEO;yu?lMd|tzo^%MwycV6!?rdK9X??PdvZ-2$#0UEu#2cX;ZH7xVi#PE~L6I=}Uf=(pcIKX?lS4NaE1=r~%}e7JNpsjOj&@{PWa zCfzRQbFPW=-Tib%M(q1N5k1RqXYN{WRzEl4&7{Djxte=6trgFekT7pn2|mMTQWRhM zYx{cXK+DIaCDM#yEVpJ&Rn%8(?Yz|b%{aR{f|WH#ZnJ}a#P`j!@6}d5ecU?rUVH35 i(); diff --git a/src/Icons/Startup.cs b/src/Icons/Startup.cs index 5e5bb27820..b8209f63f9 100644 --- a/src/Icons/Startup.cs +++ b/src/Icons/Startup.cs @@ -16,13 +16,15 @@ namespace Bit.Icons { public class Startup { - public Startup(IConfiguration configuration) + public Startup(IWebHostEnvironment env, IConfiguration configuration) { CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US"); Configuration = configuration; + Environment = env; } public IConfiguration Configuration { get; } + public IWebHostEnvironment Environment { get; } public void ConfigureServices(IServiceCollection services) { @@ -30,7 +32,7 @@ namespace Bit.Icons services.AddOptions(); // Settings - var globalSettings = services.AddGlobalSettingsServices(Configuration); + var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment); var iconsSettings = new IconsSettings(); ConfigurationBinder.Bind(Configuration.GetSection("IconsSettings"), iconsSettings); services.AddSingleton(s => iconsSettings); diff --git a/src/Identity/Properties/launchSettings.json b/src/Identity/Properties/launchSettings.json index 02a586ab61..7ee9b9ed5c 100644 --- a/src/Identity/Properties/launchSettings.json +++ b/src/Identity/Properties/launchSettings.json @@ -15,6 +15,15 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, + "Identity-SelfHost": { + "commandName": "Project", + "launchBrowser": false, + "applicationUrl": "http://localhost:33657", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "developSelfHosted": "true" + } + }, "Identity": { "commandName": "Project", "launchBrowser": false, @@ -24,4 +33,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs index a38b33fa01..35c6db2503 100644 --- a/src/Identity/Startup.cs +++ b/src/Identity/Startup.cs @@ -38,7 +38,7 @@ namespace Bit.Identity services.AddOptions(); // Settings - var globalSettings = services.AddGlobalSettingsServices(Configuration); + var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment); if (!globalSettings.SelfHosted) { services.Configure(Configuration.GetSection("IpRateLimitOptions")); diff --git a/src/Notifications/Startup.cs b/src/Notifications/Startup.cs index 4ca7b728ec..9a5a17d1d9 100644 --- a/src/Notifications/Startup.cs +++ b/src/Notifications/Startup.cs @@ -32,7 +32,7 @@ namespace Bit.Notifications services.AddOptions(); // Settings - var globalSettings = services.AddGlobalSettingsServices(Configuration); + var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment); // Identity services.AddIdentityAuthenticationServices(globalSettings, Environment, config => diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs index a6a2bb3be2..5109f7a727 100644 --- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs +++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs @@ -462,10 +462,17 @@ namespace Bit.SharedWeb.Utilities } public static GlobalSettings AddGlobalSettingsServices(this IServiceCollection services, - IConfiguration configuration) + IConfiguration configuration, IWebHostEnvironment environment) { var globalSettings = new GlobalSettings(); ConfigurationBinder.Bind(configuration.GetSection("GlobalSettings"), globalSettings); + + if (environment.IsDevelopment() && configuration.GetValue("developSelfHosted")) + { + // Override settings with selfHostedOverride settings + ConfigurationBinder.Bind(configuration.GetSection("Dev:SelfHostOverride:GlobalSettings"), globalSettings); + } + services.AddSingleton(s => globalSettings); services.AddSingleton(s => globalSettings); return globalSettings;