Merge pull request #22 from NeedleInAJayStack/feature/forwardedHeader

Adds hostname extraction for ‘forwarded’ header

Sources/Gatekeeper/Request+Hostname.swift

@@ -2,6 +2,6 @@ import Vapor
 
 extension Request {
     var hostname: String? {
-        headers.first(name: .xForwardedFor) ?? remoteAddress?.hostname
+        headers.forwarded.first?.for ?? headers.first(name: .xForwardedFor) ?? remoteAddress?.hostname
     }
 }

Tests/GatekeeperTests/GatekeeperTests.swift

@@ -37,6 +37,27 @@ class GatekeeperTests: XCTestCase {
         })
     }
 
+    func testGateKeeperForwardedSupported() throws {
+        let app = Application(.testing)
+        defer { app.shutdown() }
+        app.gatekeeper.config = .init(maxRequests: 10, per: .second)
+
+        app.grouped(GatekeeperMiddleware()).get("test") { req -> HTTPStatus in
+            return .ok
+        }
+
+        try app.test(
+            .GET,
+            "test",
+            beforeRequest: { req in
+                req.headers.forwarded = [HTTPHeaders.Forwarded(for: "\"[::1]\"")]
+            },
+            afterResponse: { res in
+                XCTAssertEqual(res.status, .ok)
+            }
+        )
+    }
+
     func testGateKeeperCountRefresh() throws {
         let app = Application(.testing)
         defer { app.shutdown() }