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

Add curl timeout for cloud metadata lookup at unix systems on Azure #4895

Merged
merged 7 commits into from
Nov 20, 2024
Merged

Add curl timeout for cloud metadata lookup at unix systems on Azure #4895

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e1b2eb
add curl timeout for cloud metadata lookup on unix systems
tomtrix Nov 20, 2024
14deb10
add retries and retry-delay to curl command of metadata lookup
tomtrix Nov 20, 2024
4d7f22c
increase timeout of metadata lookup at windows systems
tomtrix Nov 20, 2024
370205a
add and increase --max-time to 30
tomtrix Nov 20, 2024
bae690e
increase timeout of metadata lookup at windows systems from 5 to 15 s…
tomtrix Nov 20, 2024
f346372
ajust metadata lookup timeouts to 5 seconds
tomtrix Nov 20, 2024
28d0e25
ensure curl connection timeout of 5 seconds
tomtrix Nov 20, 2024
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
4 changes: 2 additions & 2 deletions providers/os/id/azcompute/azcompute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

const (
identityUrl = "http://169.254.169.254/metadata/instance?api-version=2021-02-01"
metadataIdentityScriptWindows = `Invoke-RestMethod -TimeoutSec 1 -Headers @{"Metadata"="true"} -Method GET -URI http://169.254.169.254/metadata/instance?api-version=2021-02-01 -UseBasicParsing | ConvertTo-Json`
metadataIdentityScriptWindows = `Invoke-RestMethod -TimeoutSec 5 -Headers @{"Metadata"="true"} -Method GET -URI http://169.254.169.254/metadata/instance?api-version=2021-02-01 -UseBasicParsing | ConvertTo-Json`
)

func MondooAzureInstanceID(instanceID string) string {
Expand Down Expand Up @@ -57,7 +57,7 @@ func (m *commandInstanceMetadata) Identify() (Identity, error) {
var instanceDocument string
switch {
case m.platform.IsFamily(inventory.FAMILY_UNIX):
cmd, err := m.conn.RunCommand("curl --noproxy '*' -H Metadata:true " + identityUrl)
cmd, err := m.conn.RunCommand("curl --retry 5 --retry-delay 1 --connect-timeout 1 --retry-max-time 5 --max-time 10 --noproxy '*' -H Metadata:true " + identityUrl)
if err != nil {
return Identity{}, err
}
Expand Down