1
0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00

[EC-584] Add string.Split to only get 'ClientVersion' number when the input value includes the git hash

This commit is contained in:
Rui Tome
2022-11-08 11:33:57 +00:00
parent 8d381dc524
commit 9ebad69c6a

View File

@ -82,9 +82,14 @@ public class CurrentContext : ICurrentContext
MaybeBot = httpContext.Request.Headers["X-Cf-Maybe-Bot"] == "1";
}
if (httpContext.Request.Headers.ContainsKey("Bitwarden-Client-Version") && Version.TryParse(httpContext.Request.Headers["Bitwarden-Client-Version"], out var cVersion))
if (httpContext.Request.Headers.ContainsKey("Bitwarden-Client-Version"))
{
ClientVersion = cVersion;
// The string.Split method is being used for cases where QA builds include the git hash e.g. '2022.10.2 - 5f8c1c1'
var clientVersionHeader = httpContext.Request.Headers["Bitwarden-Client-Version"].ToString().Split(' ')[0];
if (Version.TryParse(clientVersionHeader, out var cVersion))
{
ClientVersion = cVersion;
}
}
}