From d07a68e3cce0e0331b9c314d5e66f01066180b68 Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Wed, 8 Sep 2021 13:09:54 -0700 Subject: [PATCH] Add configuration support for QA cloud environment (#1572) * Adding a QA environment specific configuration * separating the bitwarden environment and stripe environment checks * adding a logging statement for the PayPal webhook key check * adding more logging * switched logging type * Changing the log level on the PayPal webhook. Removing the debugging log from the Stripe Controller --- .../src/Portal/appsettings.QA.json | 23 +++++++++ bitwarden_license/src/Sso/appsettings.QA.json | 32 ++++++++++++ src/Admin/appsettings.QA.json | 40 +++++++++++++++ src/Api/Startup.cs | 2 +- src/Api/appsettings.QA.json | 43 ++++++++++++++++ src/Billing/Controllers/PayPalController.cs | 2 + src/Billing/appsettings.QA.json | 49 +++++++++++++++++++ .../Implementations/AppleIapService.cs | 4 +- src/Events/appsettings.QA.json | 37 ++++++++++++++ src/EventsProcessor/appsettings.QA.json | 19 +++++++ src/Icons/appsettings.QA.json | 19 +++++++ src/Identity/appsettings.QA.json | 40 +++++++++++++++ src/Notifications/appsettings.QA.json | 37 ++++++++++++++ 13 files changed, 344 insertions(+), 3 deletions(-) create mode 100644 bitwarden_license/src/Portal/appsettings.QA.json create mode 100644 bitwarden_license/src/Sso/appsettings.QA.json create mode 100644 src/Admin/appsettings.QA.json create mode 100644 src/Api/appsettings.QA.json create mode 100644 src/Billing/appsettings.QA.json create mode 100644 src/Events/appsettings.QA.json create mode 100644 src/EventsProcessor/appsettings.QA.json create mode 100644 src/Icons/appsettings.QA.json create mode 100644 src/Identity/appsettings.QA.json create mode 100644 src/Notifications/appsettings.QA.json diff --git a/bitwarden_license/src/Portal/appsettings.QA.json b/bitwarden_license/src/Portal/appsettings.QA.json new file mode 100644 index 0000000000..c4636bbb61 --- /dev/null +++ b/bitwarden_license/src/Portal/appsettings.QA.json @@ -0,0 +1,23 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + }, + "braintree": { + "production": false + } + } +} diff --git a/bitwarden_license/src/Sso/appsettings.QA.json b/bitwarden_license/src/Sso/appsettings.QA.json new file mode 100644 index 0000000000..0de6d168d5 --- /dev/null +++ b/bitwarden_license/src/Sso/appsettings.QA.json @@ -0,0 +1,32 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + }, + "braintree": { + "production": false + }, + "sso": { + "saml": { + "NameIdFormat": "Unspecified", + "WantAssertionsSigned": true, + "OutboundSigningAlgorithm": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256", + "SigningBehavior": "IfIdpWantAuthnRequestsSigned", + "ValidateCertificates": false + } + } + } +} diff --git a/src/Admin/appsettings.QA.json b/src/Admin/appsettings.QA.json new file mode 100644 index 0000000000..2280cdf297 --- /dev/null +++ b/src/Admin/appsettings.QA.json @@ -0,0 +1,40 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + }, + "braintree": { + "production": false + } + }, + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +} diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index 101df5c6c2..6e1b293c93 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -136,7 +136,7 @@ namespace Bit.Api config.Conventions.Add(new PublicApiControllersModelConvention()); }).AddNewtonsoftJson(options => { - if (Environment.IsProduction() && Configuration["swaggerGen"] != "true") + if ((Environment.IsProduction() || Environment.IsEnvironment("QA")) && Configuration["swaggerGen"] != "true") { options.SerializerSettings.ContractResolver = new DefaultContractResolver(); } diff --git a/src/Api/appsettings.QA.json b/src/Api/appsettings.QA.json new file mode 100644 index 0000000000..2b92358c76 --- /dev/null +++ b/src/Api/appsettings.QA.json @@ -0,0 +1,43 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + }, + "braintree": { + "production": false + }, + "bitPay": { + "production": false + } + }, + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +} diff --git a/src/Billing/Controllers/PayPalController.cs b/src/Billing/Controllers/PayPalController.cs index 6225a34890..b21a071e8b 100644 --- a/src/Billing/Controllers/PayPalController.cs +++ b/src/Billing/Controllers/PayPalController.cs @@ -48,6 +48,7 @@ namespace Bit.Billing.Controllers [HttpPost("ipn")] public async Task PostIpn() { + _logger.LogDebug("PayPal webhook has been hit."); if (HttpContext?.Request?.Query == null) { return new BadRequestResult(); @@ -57,6 +58,7 @@ namespace Bit.Billing.Controllers HttpContext.Request.Query["key"].ToString() : null; if (key != _billingSettings.PayPal.WebhookKey) { + _logger.LogWarning("PayPal webhook key is incorrect or does not exist."); return new BadRequestResult(); } diff --git a/src/Billing/appsettings.QA.json b/src/Billing/appsettings.QA.json new file mode 100644 index 0000000000..c7a45e45f7 --- /dev/null +++ b/src/Billing/appsettings.QA.json @@ -0,0 +1,49 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + }, + "braintree": { + "production": false + }, + "bitPay": { + "production": false + } + }, + "billingSettings": { + "payPal": { + "production": false, + "businessId": "AD3LAUZSNVPJY" + } + }, + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +} diff --git a/src/Core/Services/Implementations/AppleIapService.cs b/src/Core/Services/Implementations/AppleIapService.cs index 23a3dc0c34..0d0e35631c 100644 --- a/src/Core/Services/Implementations/AppleIapService.cs +++ b/src/Core/Services/Implementations/AppleIapService.cs @@ -43,8 +43,8 @@ namespace Bit.Core.Services return null; } var validEnvironment = _globalSettings.AppleIap.AppInReview || - (!_hostingEnvironment.IsProduction() && receiptStatus.Environment == "Sandbox") || - (_hostingEnvironment.IsProduction() && receiptStatus.Environment != "Sandbox"); + (!(_hostingEnvironment.IsProduction() || _hostingEnvironment.IsEnvironment("QA")) && receiptStatus.Environment == "Sandbox") || + ((_hostingEnvironment.IsProduction() || _hostingEnvironment.IsEnvironment("QA")) && receiptStatus.Environment != "Sandbox"); var validProductBundle = receiptStatus.Receipt.BundleId == "com.bitwarden.desktop" || receiptStatus.Receipt.BundleId == "com.8bit.bitwarden"; var validProduct = receiptStatus.LatestReceiptInfo.LastOrDefault()?.ProductId == "premium_annually"; diff --git a/src/Events/appsettings.QA.json b/src/Events/appsettings.QA.json new file mode 100644 index 0000000000..14163180b2 --- /dev/null +++ b/src/Events/appsettings.QA.json @@ -0,0 +1,37 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + } + }, + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +} diff --git a/src/EventsProcessor/appsettings.QA.json b/src/EventsProcessor/appsettings.QA.json new file mode 100644 index 0000000000..1cce4a9ed3 --- /dev/null +++ b/src/EventsProcessor/appsettings.QA.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +} diff --git a/src/Icons/appsettings.QA.json b/src/Icons/appsettings.QA.json new file mode 100644 index 0000000000..437045a7fb --- /dev/null +++ b/src/Icons/appsettings.QA.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +} diff --git a/src/Identity/appsettings.QA.json b/src/Identity/appsettings.QA.json new file mode 100644 index 0000000000..923f30a2a6 --- /dev/null +++ b/src/Identity/appsettings.QA.json @@ -0,0 +1,40 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + }, + "braintree": { + "production": false + } + }, + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +} diff --git a/src/Notifications/appsettings.QA.json b/src/Notifications/appsettings.QA.json new file mode 100644 index 0000000000..14163180b2 --- /dev/null +++ b/src/Notifications/appsettings.QA.json @@ -0,0 +1,37 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://vault.qa.bitwarden.pw", + "api": "https://api.qa.bitwarden.pw", + "identity": "https://identity.qa.bitwarden.pw", + "admin": "https://admin.qa.bitwarden.pw", + "notifications": "https://notifications.qa.bitwarden.pw", + "sso": "https://sso.qa.bitwarden.pw", + "portal": "http://portal.qa.bitwarden.pw", + "internalNotifications": "https://notifications.qa.bitwarden.pw", + "internalAdmin": "https://admin.qa.bitwarden.pw", + "internalIdentity": "https://identity.qa.bitwarden.pw", + "internalApi": "https://api.qa.bitwarden.pw", + "internalVault": "https://vault.qa.bitwarden.pw", + "internalSso": "https://sso.qa.bitwarden.pw", + "internalPortal": "https://portal.qa.bitwarden.pw" + } + }, + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + }, + "Console": { + "IncludeScopes": true, + "LogLevel": { + "Default": "Warning", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + } +}