Skip to content

fix(state machine): PENDING is queued, not refused — don't tear down the transport #269

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

Open
wdrs-dev wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −4
Open

fix(state machine): PENDING is queued, not refused — don't tear down the transport #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions sshlib/src/main/kotlin/org/connectbot/sshlib/protocol/SshClientStateMachine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,13 +661,13 @@ internal class SshClientStateMachine(
return !isDisconnected()
}

suspend fun authorizeAuthenticationPacket(): Boolean = process(SshEvent.AuthorizeAuthenticationPacket)
suspend fun authorizeAuthenticationPacket(): Boolean = authorize(SshEvent.AuthorizeAuthenticationPacket)

suspend fun authorizeAuthenticatedPacket(): Boolean = process(SshEvent.AuthorizeAuthenticatedPacket)
suspend fun authorizeAuthenticatedPacket(): Boolean = authorize(SshEvent.AuthorizeAuthenticatedPacket)

suspend fun authorizeConnectionPacket(): Boolean = process(SshEvent.AuthorizeConnectionPacket)
suspend fun authorizeConnectionPacket(): Boolean = authorize(SshEvent.AuthorizeConnectionPacket)

suspend fun authorizeExtInfo(): Boolean = process(SshEvent.AuthorizeExtInfo)
suspend fun authorizeExtInfo(): Boolean = authorize(SshEvent.AuthorizeExtInfo)

suspend fun disconnect(): Boolean = process(SshEvent.Disconnect)

Expand All @@ -690,6 +690,17 @@ internal class SshClientStateMachine(
internal fun formalModel(): SshStateMachineFormalModel = stateMachine.toSshFormalModel()

private suspend fun process(event: SshEvent): Boolean = stateMachine.processEvent(event) == ProcessingResult.PROCESSED

/**
* As guardas de autorização não têm efeito próprio: elas só perguntam "este pacote cabe no
* estado atual?". Quando outro evento já está sendo processado (o laço de pacotes entra no meio
* de um `OpenChannel`/`SendChannelRequest` que suspendeu para escrever no socket), o
* `queuePendingEventHandler` — o padrão do KStateMachine — ENFILEIRA o evento e devolve
* `PENDING`. Enfileirado não é recusado; tratar `PENDING` como recusa derruba o transporte
* inteiro com `SSH_MSG_CHANNEL_DATA in the current protocol state`.
*/
private suspend fun authorize(event: SshEvent): Boolean =
stateMachine.processEvent(event) != ProcessingResult.IGNORED
}

internal interface SshClientCallbacks {
Expand Down