Skip to content

api: disallow setting 'host' header directly #2275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goaway merged 11 commits into from
May 17, 2022
Merged

api: disallow setting 'host' header directly #2275

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2f5f66d
api: disallow setting 'host' header directly
goaway May 12, 2022
fd8ac86
update version history
goaway May 12, 2022
ded10f2
fix test
goaway May 16, 2022
1a02d50
Merge branch 'main' into ms/host-header
goaway May 16, 2022
f6a0634
fix
goaway May 16, 2022
b4fd51b
debugging vi ci
goaway May 16, 2022
d1b9ab2
fix?
goaway May 16, 2022
fb3c37f
this should be it
goaway May 16, 2022
0d58254
format
goaway May 16, 2022
03005ca
this is the one
goaway May 16, 2022
e21814a
.
goaway May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/kotlin/io/envoyproxy/envoymobile/HeadersBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ open class HeadersBuilder {
}

private fun isRestrictedHeader(name: String) = name.startsWith(":") ||
name.startsWith("x-envoy-mobile")
name.startsWith("x-envoy-mobile") || name == "host"
}
2 changes: 1 addition & 1 deletion library/swift/HeadersBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Foundation
private let kRestrictedPrefixes = [":", "x-envoy-mobile"]

private func isRestrictedHeader(name: String) -> Bool {
return kRestrictedPrefixes.contains { name.hasPrefix($0) }
return name == "host" || kRestrictedPrefixes.contains { name.hasPrefix($0) }
}

/// Base builder class used to construct `Headers` instances.
Expand Down
2 changes: 2 additions & 0 deletions test/kotlin/io/envoyproxy/envoymobile/RequestHeadersBuilderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,12 @@ class RequestHeadersBuilderTest {
)
.add(":x-foo", "123")
.add("x-envoy-mobile-foo", "abc")
.add("host", "example.com")
.build()

assertThat(headers.allHeaders()).doesNotContainKey(":x-foo")
assertThat(headers.allHeaders()).doesNotContainKey("x-envoy-mobile-foo")
assertThat(headers.allHeaders()).doesNotContainKey("host")
}

@Test
Expand Down
9 changes: 9 additions & 0 deletions test/swift/HeadersBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ final class HeadersBuilderTests: XCTestCase {
XCTAssertEqual(["x-foo": ["abc"]], headers)
}

func testRestrictedHeadersAreNotSettable() {
let builder = RequestHeadersBuilder(method: .get, authority: "example.com", path: "/")
builder.add("host", "example.com")
builder.set(":scheme", "http")
builder.set(":path", "nope")
let headers = builder.build()
XCTAssertEqual([":method": ["get"], ":authority": ["example.com"], ":path": ["/"])
}

func testBuildersAreEqualIfUnderlyingHeadersAreEqual() {
let builder1 = RequestHeadersBuilder(headers: ["x-foo": ["123"], "x-bar": ["abc"]])
let builder2 = RequestHeadersBuilder(headers: ["x-foo": ["123"], "x-bar": ["abc"]])
Expand Down