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

[Cherry-pick]: add quotes windows path for CVE #7029

Merged
merged 4 commits into from
Sep 19, 2024
Merged

[Cherry-pick]: add quotes windows path for CVE #7029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3be66e
add quotes windows path (#7028)
wildum Sep 19, 2024
e58c0fa
update changelog
wildum Sep 19, 2024
19ff0f8
update version to v0.43.1 (#7030)
wildum Sep 19, 2024
c1258fc
fix changelog
wildum Sep 19, 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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ This document contains a historical list of changes between releases. Only
changes that impact end-user behavior are listed; changes to documentation or
internal API changes are not present.

v0.43.1 (2024-09-19)
-------------------------

### Security fixes

- Add quotes to windows service path to prevent path interception attack. (@wildum)

v0.43.0 (2024-09-11)
-------------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: Grafana Agent
description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector
weight: 350
cascade:
AGENT_RELEASE: v0.43.0
AGENT_RELEASE: v0.43.1
OTEL_VERSION: v0.96.0
refs:
variants:
Expand Down
4 changes: 2 additions & 2 deletions packaging/grafana-agent-flow/windows/install_script.nsis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Section "install"
Call InitializeRegistry

# Create the service.
nsExec::ExecToLog 'sc create "Grafana Agent Flow" start= delayed-auto binpath= "$INSTDIR\grafana-agent-service-windows-amd64.exe"'
nsExec::ExecToLog 'sc create "Grafana Agent Flow" start= delayed-auto binpath= "\"$INSTDIR\grafana-agent-service-windows-amd64.exe\""'
Pop $0

# Start the service.
Expand Down Expand Up @@ -135,7 +135,7 @@ Function InitializeRegistry
nsExec::ExecToLog 'Reg.exe query "${REGKEY}" /reg:64 /ve'
Pop $0
${If} $0 == 1
nsExec::ExecToLog 'Reg.exe add "${REGKEY}" /reg:64 /ve /d "$INSTDIR\grafana-agent-flow-windows-amd64.exe"'
nsExec::ExecToLog 'Reg.exe add "${REGKEY}" /reg:64 /ve /d "\"$INSTDIR\grafana-agent-flow-windows-amd64.exe\""'
Pop $0 # Ignore return result
${EndIf}

Expand Down
2 changes: 1 addition & 1 deletion static/operator/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package operator

// Supported versions of the Grafana Agent.
var (
DefaultAgentVersion = "v0.43.0"
DefaultAgentVersion = "v0.43.1"
DefaultAgentBaseImage = "grafana/agent"
DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion
)
Expand Down
2 changes: 1 addition & 1 deletion tools/gen-versioned-files/agent-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.43.0
v0.43.1
Loading