nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

Changing CF-Connecting-IP -> X-Connecting-IP. Also renaming CloudFlareConnectingIp. (#3236)

Browse Source
This commit is contained in:
Alexey Zilber 2023-08-29 21:25:47 +08:00 committed by GitHub
parent 626f7977d1
commit 776e454b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/InfoController.cs
View File

@ -21,7 +21,7 @@ public class InfoController : Controller
[HttpGet("~/ip")] [HttpGet("~/ip")]
public JsonResult Ip() public JsonResult Ip()
{ {
var headerSet = new HashSet<string> { "x-forwarded-for", "cf-connecting-ip", "client-ip" }; var headerSet = new HashSet<string> { "x-forwarded-for", "x-connecting-ip", "cf-connecting-ip", "client-ip", "true-client-ip" };
var headers = HttpContext.Request?.Headers var headers = HttpContext.Request?.Headers
.Where(h => headerSet.Contains(h.Key.ToLower())) .Where(h => headerSet.Contains(h.Key.ToLower()))
.ToDictionary(h => h.Key); .ToDictionary(h => h.Key);

2
src/Api/appsettings.json
View File

@ -79,7 +79,7 @@
"IpRateLimitOptions": { "IpRateLimitOptions": {
"EnableEndpointRateLimiting": true, "EnableEndpointRateLimiting": true,
"StackBlockedRequests": false, "StackBlockedRequests": false,
"RealIpHeader": "CF-Connecting-IP", "RealIpHeader": "X-Connecting-IP",
"ClientIdHeader": "X-ClientId", "ClientIdHeader": "X-ClientId",
"HttpStatusCode": 429, "HttpStatusCode": 429,
"IpWhitelist": [], "IpWhitelist": [],

6
src/Core/Utilities/CoreHelpers.cs
View File

@ -29,7 +29,7 @@ public static class CoreHelpers
private static readonly DateTime _epoc = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); private static readonly DateTime _epoc = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
private static readonly DateTime _max = new DateTime(9999, 1, 1, 0, 0, 0, DateTimeKind.Utc); private static readonly DateTime _max = new DateTime(9999, 1, 1, 0, 0, 0, DateTimeKind.Utc);
private static readonly Random _random = new Random(); private static readonly Random _random = new Random();
private static readonly string CloudFlareConnectingIp = "CF-Connecting-IP"; private static readonly string RealConnectingIp = "X-Connecting-IP";
/// <summary> /// <summary>
/// Generate sequential Guid for Sql Server. /// Generate sequential Guid for Sql Server.
@ -557,9 +557,9 @@ public static class CoreHelpers
return null; return null;
} }
if (!globalSettings.SelfHosted && httpContext.Request.Headers.ContainsKey(CloudFlareConnectingIp)) if (!globalSettings.SelfHosted && httpContext.Request.Headers.ContainsKey(RealConnectingIp))
{ {
return httpContext.Request.Headers[CloudFlareConnectingIp].ToString(); return httpContext.Request.Headers[RealConnectingIp].ToString();
} }
return httpContext.Connection?.RemoteIpAddress?.ToString(); return httpContext.Connection?.RemoteIpAddress?.ToString();

2
src/Identity/appsettings.json
View File

@ -69,7 +69,7 @@
"IpRateLimitOptions": { "IpRateLimitOptions": {
"EnableEndpointRateLimiting": true, "EnableEndpointRateLimiting": true,
"StackBlockedRequests": false, "StackBlockedRequests": false,
"RealIpHeader": "CF-Connecting-IP", "RealIpHeader": "X-Connecting-IP",
"ClientIdHeader": "X-ClientId", "ClientIdHeader": "X-ClientId",
"HttpStatusCode": 429, "HttpStatusCode": 429,
"IpWhitelist": [], "IpWhitelist": [],