Skip to content

impl: verify cli signature #562

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

Merged
merged 11 commits into from
Jul 25, 2025
Merged

impl: verify cli signature #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4001f7d
impl: support for downloading and verifying cli signatures
fioan89 Jul 22, 2025
94e74f5
fix: class cast exception
fioan89 Jul 22, 2025
345371f
impl: embed the pgp public key as a plugin resource
fioan89 Jul 22, 2025
c7af603
chore: fix UTs related to CLI downloading
fioan89 Jul 22, 2025
8f5e559
fix: download the correct CLI signature for Windows
fioan89 Jul 22, 2025
ea0e4ea
Merge branch 'main' into impl-verify-cli-signature
fioan89 Jul 22, 2025
5945b6c
chore: next version is 2.22.0
fioan89 Jul 22, 2025
06f0feb
impl: strict URL validation for the connection screen
fioan89 Jul 25, 2025
f8414f9
impl: strict URL validation for the URI handling
fioan89 Jul 25, 2025
8623572
fix: transform to url only after we checked the validation result
fioan89 Jul 25, 2025
8838a8e
chore: update UT expected result
fioan89 Jul 25, 2025
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

## Unreleased

### Added

- support for checking if CLI is signed
- improved progress reporting while downloading the CLI
- URL validation is stricter in the connection screen and URI protocol handler

## 2.21.1 - 2025-06-26

### Fixed
Expand Down
2 changes: 2 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ dependencies {
testImplementation(kotlin("test"))
// required by the unit tests
testImplementation(kotlin("test-junit5"))
testImplementation("io.mockk:mockk:1.13.12")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
// required by IntelliJ test framework
testImplementation("junit:junit:4.13.2")

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pluginGroup=com.coder.gateway
artifactName=coder-gateway
pluginName=Coder
# SemVer format -> https://semver.org
pluginVersion=2.21.1
pluginVersion=2.22.0
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild=243.26574
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
private val localTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MMM-dd HH:mm")
private val dialogUi = DialogUi(settings)

fun connect(getParameters: (indicator: ProgressIndicator) -> WorkspaceProjectIDE) {
fun connect(getParameters: suspend (indicator: ProgressIndicator) -> WorkspaceProjectIDE) {
val clientLifetime = LifetimeDefinition()
clientLifetime.launchUnderBackgroundProgress(CoderGatewayBundle.message("gateway.connector.coder.connection.provider.title")) {
try {
Expand Down Expand Up @@ -274,7 +274,7 @@
},
),
)
val handle = client.connect(URI(joinLink)) // Downloads the client too, if needed.

Check warning on line 277 in src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Usage of redundant or deprecated syntax or deprecated symbols 

'connect(URI): ThinClientHandle' is deprecated. Use connect(URI, ExtractedJetBrainsClientData)

// Reconnect if the join link changes.
logger.info("Launched ${workspace.ideName} client; beginning backend monitoring")
Expand Down
8 changes: 8 additions & 0 deletions src/main/kotlin/com/coder/gateway/CoderSettingsConfigurable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ class CoderSettingsConfigurable : BoundConfigurable("Coder") {
CoderGatewayBundle.message("gateway.connector.settings.enable-binary-directory-fallback.comment"),
)
}.layout(RowLayout.PARENT_GRID)
row {
cell() // For alignment.
checkBox(CoderGatewayBundle.message("gateway.connector.settings.fallback-on-coder-for-signatures.title"))
.bindSelected(state::fallbackOnCoderForSignatures)
.comment(
CoderGatewayBundle.message("gateway.connector.settings.fallback-on-coder-for-signatures.comment"),
)
}.layout(RowLayout.PARENT_GRID)
row(CoderGatewayBundle.message("gateway.connector.settings.header-command.title")) {
textField().resizableColumn().align(AlignX.FILL)
.bindText(state::headerCommand)
Expand Down
Loading
Loading