From 8d381dc524e3b790f636abe945acb5e040fca4ed Mon Sep 17 00:00:00 2001 From: Rui Tome Date: Tue, 8 Nov 2022 11:15:07 +0000 Subject: [PATCH] [EC-584] Add TryParse to ClientVersion due to QA builds having an appended git hash --- src/Api/Controllers/OrganizationExportController.cs | 2 +- src/Core/Context/CurrentContext.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Api/Controllers/OrganizationExportController.cs b/src/Api/Controllers/OrganizationExportController.cs index 9c075b18f1..84fc17801d 100644 --- a/src/Api/Controllers/OrganizationExportController.cs +++ b/src/Api/Controllers/OrganizationExportController.cs @@ -42,7 +42,7 @@ public class OrganizationExportController : Controller (IEnumerable orgCiphers, Dictionary> collectionCiphersGroupDict) = await _cipherService.GetOrganizationCiphers(userId, organizationId); // Backward compatibility with versions before 2022.11.0 that use ListResponseModel - if (_currentContext.ClientVersion < new Version("2022.11.0")) + if (_currentContext.ClientVersion != null && _currentContext.ClientVersion < new Version("2022.11.0")) { var organizationExportListResponseModel = new OrganizationExportListResponseModel { diff --git a/src/Core/Context/CurrentContext.cs b/src/Core/Context/CurrentContext.cs index 8c4d40579b..6e9fa29712 100644 --- a/src/Core/Context/CurrentContext.cs +++ b/src/Core/Context/CurrentContext.cs @@ -82,9 +82,9 @@ public class CurrentContext : ICurrentContext MaybeBot = httpContext.Request.Headers["X-Cf-Maybe-Bot"] == "1"; } - if (httpContext.Request.Headers.ContainsKey("Bitwarden-Client-Version")) + if (httpContext.Request.Headers.ContainsKey("Bitwarden-Client-Version") && Version.TryParse(httpContext.Request.Headers["Bitwarden-Client-Version"], out var cVersion)) { - ClientVersion = new Version(httpContext.Request.Headers["Bitwarden-Client-Version"]); + ClientVersion = cVersion; } }