bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-10 21:33:41 +00:00
Code Issues Releases Wiki Activity

SRE-3494 cleanup (#6657)

Browse Source
This commit is contained in:
sneakernuts
2025-11-28 14:02:00 -07:00
committed by GitHub
parent 480c20a480
commit f151abee54
3 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Core/Context/CurrentContext.cs
View File

@@ -38,10 +38,6 @@ public class CurrentContext(
public virtual List<CurrentContextProvider> Providers { get; set; } public virtual List<CurrentContextProvider> Providers { get; set; }
public virtual Guid? InstallationId { get; set; } public virtual Guid? InstallationId { get; set; }
public virtual Guid? OrganizationId { get; set; } public virtual Guid? OrganizationId { get; set; }
public virtual bool CloudflareWorkerProxied { get; set; }
public virtual bool IsBot { get; set; }
public virtual bool MaybeBot { get; set; }
public virtual int? BotScore { get; set; }
public virtual string ClientId { get; set; } public virtual string ClientId { get; set; }
public virtual Version ClientVersion { get; set; } public virtual Version ClientVersion { get; set; }
public virtual bool ClientVersionIsPrerelease { get; set; } public virtual bool ClientVersionIsPrerelease { get; set; }
@@ -70,27 +66,6 @@ public class CurrentContext(
DeviceType = dType; DeviceType = dType;
} }
if (!BotScore.HasValue && httpContext.Request.Headers.TryGetValue("X-Cf-Bot-Score", out var cfBotScore) &&
int.TryParse(cfBotScore, out var parsedBotScore))
{
BotScore = parsedBotScore;
}
if (httpContext.Request.Headers.TryGetValue("X-Cf-Worked-Proxied", out var cfWorkedProxied))
{
CloudflareWorkerProxied = cfWorkedProxied == "1";
}
if (httpContext.Request.Headers.TryGetValue("X-Cf-Is-Bot", out var cfIsBot))
{
IsBot = cfIsBot == "1";
}
if (httpContext.Request.Headers.TryGetValue("X-Cf-Maybe-Bot", out var cfMaybeBot))
{
MaybeBot = cfMaybeBot == "1";
}
if (httpContext.Request.Headers.TryGetValue("Bitwarden-Client-Version", out var bitWardenClientVersion) && Version.TryParse(bitWardenClientVersion, out var cVersion)) if (httpContext.Request.Headers.TryGetValue("Bitwarden-Client-Version", out var bitWardenClientVersion) && Version.TryParse(bitWardenClientVersion, out var cVersion))
{ {
ClientVersion = cVersion; ClientVersion = cVersion;

3
src/Core/Context/ICurrentContext.cs
View File

@@ -31,9 +31,6 @@ public interface ICurrentContext
Guid? InstallationId { get; set; } Guid? InstallationId { get; set; }
Guid? OrganizationId { get; set; } Guid? OrganizationId { get; set; }
IdentityClientType IdentityClientType { get; set; } IdentityClientType IdentityClientType { get; set; }
bool IsBot { get; set; }
bool MaybeBot { get; set; }
int? BotScore { get; set; }
string ClientId { get; set; } string ClientId { get; set; }
Version ClientVersion { get; set; } Version ClientVersion { get; set; }
bool ClientVersionIsPrerelease { get; set; } bool ClientVersionIsPrerelease { get; set; }

24
test/Core.Test/Context/CurrentContextTests.cs
View File

@@ -107,30 +107,6 @@ public class CurrentContextTests
Assert.Equal(deviceType, sutProvider.Sut.DeviceType); Assert.Equal(deviceType, sutProvider.Sut.DeviceType);
} }
[Theory, BitAutoData]
public async Task BuildAsync_HttpContext_SetsCloudflareFlags(
SutProvider<CurrentContext> sutProvider)
{
var httpContext = new DefaultHttpContext();
var globalSettings = new Core.Settings.GlobalSettings();
sutProvider.Sut.BotScore = null;
// Arrange
var botScore = 85;
httpContext.Request.Headers["X-Cf-Bot-Score"] = botScore.ToString();
httpContext.Request.Headers["X-Cf-Worked-Proxied"] = "1";
httpContext.Request.Headers["X-Cf-Is-Bot"] = "1";
httpContext.Request.Headers["X-Cf-Maybe-Bot"] = "1";
// Act
await sutProvider.Sut.BuildAsync(httpContext, globalSettings);
// Assert
Assert.True(sutProvider.Sut.CloudflareWorkerProxied);
Assert.True(sutProvider.Sut.IsBot);
Assert.True(sutProvider.Sut.MaybeBot);
Assert.Equal(botScore, sutProvider.Sut.BotScore);
}
[Theory, BitAutoData] [Theory, BitAutoData]
public async Task BuildAsync_HttpContext_SetsClientVersion( public async Task BuildAsync_HttpContext_SetsClientVersion(
SutProvider<CurrentContext> sutProvider) SutProvider<CurrentContext> sutProvider)