diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d769d0..68290b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
## Unreleased
+### Fixed
+
+- fix class cast exception during signature verification
+- the correct CLI signature for Windows is now downloaded
+
## 0.5.1 - 2025-07-21
### Added
diff --git a/gradle.properties b/gradle.properties
index 79386fe..e6dc4d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=0.5.1
+version=0.5.2
group=com.coder.toolbox
name=coder-toolbox
diff --git a/src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt b/src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt
index 177ba81..8afd954 100644
--- a/src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt
+++ b/src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt
@@ -277,8 +277,8 @@ class CoderCLIManager(
}
else -> {
- UnsignedBinaryExecutionDeniedException((result as Failed).error.message)
- val failure = result as DownloadResult.Failed
+ val failure = result as Failed
+ UnsignedBinaryExecutionDeniedException(result.error.message)
context.logger.error(failure.error, "Failed to verify signature for ${cliResult.dst}")
}
}
@@ -467,7 +467,7 @@ class CoderCLIManager(
*/
private fun writeSSHConfig(contents: String?) {
if (contents != null) {
- if (!context.settingsStore.sshConfigPath.isNullOrBlank()) {
+ if (context.settingsStore.sshConfigPath.isNotBlank()) {
val sshConfPath = Path.of(context.settingsStore.sshConfigPath)
sshConfPath.parent.toFile().mkdirs()
sshConfPath.toFile().writeText(contents)
@@ -492,9 +492,9 @@ class CoderCLIManager(
throw MissingVersionException("No version found in output")
}
return SemVer.parse(json.version)
- } catch (exception: JsonDataException) {
+ } catch (_: JsonDataException) {
throw MissingVersionException("No version found in output")
- } catch (exception: EOFException) {
+ } catch (_: EOFException) {
throw MissingVersionException("No version found in output")
}
}
@@ -532,7 +532,7 @@ class CoderCLIManager(
val buildVersion =
try {
SemVer.parse(rawBuildVersion)
- } catch (e: InvalidVersionException) {
+ } catch (_: InvalidVersionException) {
context.logger.info("Got invalid build version: $rawBuildVersion")
return null
}
diff --git a/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt b/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt
index a57ff45..ff56380 100644
--- a/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt
+++ b/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt
@@ -250,42 +250,17 @@ class CoderSettingsStore(
/**
* Return the name of the binary (with extension) for the provided OS and architecture.
*/
- private fun getCoderCLIForOS(
- os: OS?,
- arch: Arch?,
- ): String {
+ private fun getCoderCLIForOS(os: OS?, arch: Arch?): String {
logger.debug("Resolving binary for $os $arch")
- return buildCoderFileName(os, arch)
- }
-
- /**
- * Return the name of the signature file (.asc) for the provided OS and architecture.
- */
- private fun getCoderSignatureForOS(
- os: OS?,
- arch: Arch?,
- ): String {
- logger.debug("Resolving signature for $os $arch")
- return buildCoderFileName(os, arch, true)
- }
-
- /**
- * Build the coder file name based on OS, architecture, and whether it's a signature file.
- */
- private fun buildCoderFileName(
- os: OS?,
- arch: Arch?,
- isSignature: Boolean = false
- ): String {
- if (os == null) {
- logger.error("Could not resolve client OS and architecture, defaulting to WINDOWS AMD64")
- return if (isSignature) "coder-windows-amd64.asc" else "coder-windows-amd64.exe"
- }
- val osName = when (os) {
- OS.WINDOWS -> "windows"
- OS.LINUX -> "linux"
- OS.MAC -> "darwin"
+ val (osName, extension) = when (os) {
+ OS.WINDOWS -> "windows" to ".exe"
+ OS.LINUX -> "linux" to ""
+ OS.MAC -> "darwin" to ""
+ null -> {
+ logger.error("Could not resolve client OS and architecture, defaulting to WINDOWS AMD64")
+ return "coder-windows-amd64.exe"
+ }
}
val archName = when (arch) {
@@ -295,14 +270,17 @@ class CoderSettingsStore(
else -> "amd64" // default fallback
}
- val extension = if (isSignature) ".asc" else when (os) {
- OS.WINDOWS -> ".exe"
- OS.LINUX, OS.MAC -> ""
- }
-
return "coder-$osName-$archName$extension"
}
+ /**
+ * Return the name of the signature file (.asc) for the provided OS and architecture.
+ */
+ private fun getCoderSignatureForOS(os: OS?, arch: Arch?): String {
+ logger.debug("Resolving signature for $os $arch")
+ return "${getCoderCLIForOS(os, arch)}.asc"
+ }
+
/**
* Append the host to the path. For example, foo/bar could become
* foo/bar/dev.coder.com-8080.
diff --git a/src/test/kotlin/com/coder/toolbox/store/CoderSettingsStoreTest.kt b/src/test/kotlin/com/coder/toolbox/store/CoderSettingsStoreTest.kt
index 5798524..636ef61 100644
--- a/src/test/kotlin/com/coder/toolbox/store/CoderSettingsStoreTest.kt
+++ b/src/test/kotlin/com/coder/toolbox/store/CoderSettingsStoreTest.kt
@@ -35,15 +35,11 @@ class CoderSettingsStoreTest {
@Test
fun `Default CLI and signature for Windows AMD64`() =
- assertBinaryAndSignature("Windows 10", "amd64", "coder-windows-amd64.exe", "coder-windows-amd64.asc")
+ assertBinaryAndSignature("Windows 10", "amd64", "coder-windows-amd64.exe", "coder-windows-amd64.exe.asc")
@Test
fun `Default CLI and signature for Windows ARM64`() =
- assertBinaryAndSignature("Windows 10", "aarch64", "coder-windows-arm64.exe", "coder-windows-arm64.asc")
-
- @Test
- fun `Default CLI and signature for Windows ARMV7`() =
- assertBinaryAndSignature("Windows 10", "armv7l", "coder-windows-armv7.exe", "coder-windows-armv7.asc")
+ assertBinaryAndSignature("Windows 10", "aarch64", "coder-windows-arm64.exe", "coder-windows-arm64.exe.asc")
@Test
fun `Default CLI and signature for Linux AMD64`() =
@@ -65,13 +61,9 @@ class CoderSettingsStoreTest {
fun `Default CLI and signature for Mac ARM64`() =
assertBinaryAndSignature("Mac OS X", "aarch64", "coder-darwin-arm64", "coder-darwin-arm64.asc")
- @Test
- fun `Default CLI and signature for Mac ARMV7`() =
- assertBinaryAndSignature("Mac OS X", "armv7l", "coder-darwin-armv7", "coder-darwin-armv7.asc")
-
@Test
fun `Default CLI and signature for unknown OS and Arch`() =
- assertBinaryAndSignature(null, null, "coder-windows-amd64.exe", "coder-windows-amd64.asc")
+ assertBinaryAndSignature(null, null, "coder-windows-amd64.exe", "coder-windows-amd64.exe.asc")
@Test
fun `Default CLI and signature for unknown Arch fallback on Linux`() =
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy