Skip to content

fix: enforce Content-Type to accept only binary responses #174

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

Merged
merged 3 commits into from
Aug 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Changed

- content-type is now enforced when downloading the CLI to accept only binary responses

## 0.6.1 - 2025-08-11

### Added
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=0.6.1
version=0.6.2
group=com.coder.toolbox
name=coder-toolbox
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ class CoderDownloadService(

return when (response.code()) {
HTTP_OK -> {
val contentType = response.headers()["Content-Type"]?.lowercase()
if (contentType?.startsWith("application/octet-stream") != true) {
throw ResponseException(
"Invalid content type '$contentType' when downloading CLI from $remoteBinaryURL. Expected application/octet-stream.",
response.code()
)
}
context.logger.info("Downloading binary to temporary $cliTempDst")
response.saveToDisk(cliTempDst, showTextProgress, buildVersion)?.makeExecutable()
DownloadResult.Downloaded(remoteBinaryURL, cliTempDst)
Expand Down
33 changes: 17 additions & 16 deletions src/test/kotlin/com/coder/toolbox/cli/CoderCLIManagerTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ internal class CoderCLIManagerTest {
}

val body = response.toByteArray()
exchange.responseHeaders["Content-Type"] = "application/octet-stream"
exchange.sendResponseHeaders(code, if (code == HttpURLConnection.HTTP_OK) body.size.toLong() else -1)
exchange.responseBody.write(body)
exchange.close()
Expand Down Expand Up @@ -197,11 +198,11 @@ internal class CoderCLIManagerTest {
val ccm = CoderCLIManager(
context.copy(
settingsStore = CoderSettingsStore(
pluginTestSettingsStore(
DATA_DIRECTORY to tmpdir.resolve("cli-dir-fail-to-write").toString(),
),
Environment(),
context.logger
pluginTestSettingsStore(
DATA_DIRECTORY to tmpdir.resolve("cli-dir-fail-to-write").toString(),
),
Environment(),
context.logger
)
),
url
Expand Down Expand Up @@ -307,11 +308,11 @@ internal class CoderCLIManagerTest {
val ccm = CoderCLIManager(
context.copy(
settingsStore = CoderSettingsStore(
pluginTestSettingsStore(
DATA_DIRECTORY to tmpdir.resolve("does-not-exist").toString(),
),
Environment(),
context.logger
pluginTestSettingsStore(
DATA_DIRECTORY to tmpdir.resolve("does-not-exist").toString(),
),
Environment(),
context.logger
)
),
URL("https://foo")
Expand All @@ -329,12 +330,12 @@ internal class CoderCLIManagerTest {
val ccm = CoderCLIManager(
context.copy(
settingsStore = CoderSettingsStore(
pluginTestSettingsStore(
FALLBACK_ON_CODER_FOR_SIGNATURES to "allow",
DATA_DIRECTORY to tmpdir.resolve("overwrite-cli").toString(),
),
Environment(),
context.logger
pluginTestSettingsStore(
FALLBACK_ON_CODER_FOR_SIGNATURES to "allow",
DATA_DIRECTORY to tmpdir.resolve("overwrite-cli").toString(),
),
Environment(),
context.logger
)
),
url
Expand Down
Loading