Skip to content
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

Jump to bottom

[NET-4897] net/http host header is now verified and request.host that contains socked now error #18129

Merged
merged 14 commits into from
Jul 14, 2023
Merged

[NET-4897] net/http host header is now verified and request.host that contains socked now error #18129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
747195f
see if go 1.26.4 fails in ci for compatibility and upgrade tests
jmurret Jul 13, 2023
5164924
pin CI for compatibility and upgrade tests to go version 1.20.5 as 1.…
jmurret Jul 13, 2023
f4d6ca1
allow optionally specifying a specific go-version when using reusable…
jmurret Jul 13, 2023
a474071
updating if logic on steps so they can be parsed.
jmurret Jul 13, 2023
8c03b36
fix go-tests-1.19 to actually pass 1.19 as the version. previously w…
jmurret Jul 13, 2023
c50b17c
fix reusable unit to specify go-version rather than go-version-file w…
jmurret Jul 13, 2023
cc8eaf8
detect slashes in hostname and replace with localhost for socket addr…
jmurret Jul 13, 2023
ce10138
remove pinning of 1.20.5
jmurret Jul 13, 2023
133c7ec
Merge branch 'main' into jm/req-host-val
jmurret Jul 13, 2023
b0bd440
Merge branch 'main' into jm/req-host-val
jmurret Jul 14, 2023
8f22308
fix test
jmurret Jul 14, 2023
f8578b0
unpin the sdk 1.20 go tests
jmurret Jul 14, 2023
4452224
add comment. remove test
jmurret Jul 14, 2023
19634a4
explicitly set version on go sdk 1.20 tests
jmurret Jul 14, 2023
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
10 changes: 3 additions & 7 deletions .github/workflows/go-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ jobs:
runs-on: ${{ needs.setup.outputs.compute-xl }}
repository-name: ${{ github.repository }}
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
go-version: "1.19.10"
go-version: "1.19"
jmurret marked this conversation as resolved.
Show resolved Hide resolved
permissions:
id-token: write # NOTE: this permission is explicitly required for Vault auth.
contents: read
Expand All @@ -395,12 +395,7 @@ jobs:
runs-on: ${{ needs.setup.outputs.compute-xl }}
repository-name: ${{ github.repository }}
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
# pinning this to 1.20.5 because this issue in go-testcontainers occurs
# in 1.20.6 with the error "http: invalid Host header, host port waiting failed"
# https://github.com/testcontainers/testcontainers-go/issues/1359
# remove setting this when the above issue is fixed so that the reusable
# job will just get the go version from go.mod.
go-version: "1.20.5"
go-version: "1.20"
permissions:
id-token: write # NOTE: this permission is explicitly required for Vault auth.
contents: read
Expand Down Expand Up @@ -438,6 +433,7 @@ jobs:
runs-on: ${{ needs.setup.outputs.compute-xl }}
repository-name: ${{ github.repository }}
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
go-version: "1.20"
permissions:
id-token: write # NOTE: this permission is explicitly required for Vault auth.
contents: read
Expand Down
11 changes: 11 additions & 0 deletions api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,17 @@ func (r *request) toHTTP() (*http.Request, error) {
return nil, err
}

// validate that socket communications that do not use the host, detect
// slashes in the host name and replace it with local host.
// this is required since go started validating req.host in 1.20.6 and 1.19.11.
// prior to that they would strip out the slashes for you. They removed that
// behavior and added more strict validation as part of a CVE.
// https://github.com/golang/go/issues/60374
// the hope is that
if strings.HasPrefix(r.url.Host, "/") {
jmurret marked this conversation as resolved.
Show resolved Hide resolved
r.url.Host = "localhost"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like the moby folks remarked, it's too bad we couldn't just leave this blank.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So . or - may be accepted (see moby/moby#45942 (review)), but yeah, empty would've been most transparent.

}

req.URL.Host = r.url.Host
req.URL.Scheme = r.url.Scheme
req.Host = r.url.Host
Expand Down