-
Notifications
You must be signed in to change notification settings - Fork 5k
libbeat/testing: use ephemeral ports to avoid TOCTOU collisions #51617
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.
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
Open
orestisfl
wants to merge
20
commits into
elastic:main
Choose a base branch
from
orestisfl:tests/ephemeral-ports-toctou
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 13 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
e5a72e4
Use ephemeral ports in tests instead of pre-allocating them
orestisfl 7a0db43
Make test OTel collector parallel-safe
orestisfl caf0c61
Tidy ephemeral-port test helpers
orestisfl 6b02d5e
Drop redundant per-config telemetry metrics-off blocks
orestisfl e115ab4
Cleanup BenchmarkInput
orestisfl 198800f
comments
orestisfl c6516ce
comments
orestisfl 6872651
Merge branch 'main' into tests/ephemeral-ports-toctou
orestisfl 9e7a2db
Move monitoring.go
orestisfl b0de648
Context
orestisfl 1ef00a0
Remove cast
orestisfl b0e6682
Remove cast
orestisfl 0e6f94d
comments
orestisfl fdbfd8f
Merge branch 'main' into tests/ephemeral-ports-toctou
orestisfl d57e14d
Merge remote-tracking branch 'upstream/main' into orestisfl/tests/eph…
orestisfl 7d75325
filebeat: log tcp/udp input bound address to enable ephemeral-port tests
orestisfl 7507001
Merge branch 'main' into tests/ephemeral-ports-toctou
orestisfl 32240cc
Merge remote-tracking branch 'upstream/main' into tests/ephemeral-por…
orestisfl abb9226
Merge remote-tracking branch 'upstream/main' into tests/ephemeral-por…
orestisfl 354ec0e
Merge remote-tracking branch 'upstream/main' into tests/ephemeral-por…
orestisfl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package integration | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "regexp" | ||
| "strconv" | ||
| ) | ||
|
|
||
| // MonitoringEndpointSnippet is the prefix libbeat/api logs when its HTTP | ||
| // monitoring server starts (see libbeat/api/server.go). Tests configure | ||
| // http.port: 0 and match this snippet to discover the OS-assigned port. | ||
| const MonitoringEndpointSnippet = "Metrics endpoint listening on:" | ||
|
|
||
| // e.g. "Metrics endpoint listening on: 127.0.0.1:5067 (configured: localhost)". | ||
| var reMonitoringEndpoint = regexp.MustCompile(regexp.QuoteMeta(MonitoringEndpointSnippet) + ` (\S+) \(configured:`) | ||
|
|
||
| // ParseMonitoringPort extracts the bound port from a MonitoringEndpointSnippet | ||
| // log line. It lets tests read the ephemeral port chosen by the OS instead of | ||
| // pre-allocating one, which avoids time-of-check/time-of-use port collisions | ||
| // when many tests run in parallel. | ||
| func ParseMonitoringPort(logLine string) (int, error) { | ||
| matches := reMonitoringEndpoint.FindStringSubmatch(logLine) | ||
| if len(matches) != 2 { | ||
| return 0, fmt.Errorf("no monitoring address found in log line: %q", logLine) | ||
| } | ||
| _, portStr, err := net.SplitHostPort(matches[1]) | ||
| if err != nil { | ||
| return 0, fmt.Errorf("could not split host:port from %q: %w", matches[1], err) | ||
| } | ||
| port, err := strconv.Atoi(portStr) | ||
| if err != nil { | ||
| return 0, fmt.Errorf("could not parse port from %q: %w", portStr, err) | ||
| } | ||
| return port, nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.