neon443/ShhShell
1
0
Fork 0
mirror of https://github.com/neon443/ShhShell.git synced 2026-03-11 21:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

made more funcitons throw errors instead of just return, more informative

Browse Source 
added name to host
removed hostkey from connectionview as its in keys now
fix crash on force unrap in keypair navigatoin labels
added hostinvalid() to check if the host is invalid
added case notconnected for keyerror
openshell is throwing
moved stuff round
This commit is contained in:
neon443
2025-06-25 17:17:47 +01:00
parent 2548dde85b
commit 76601e0470
12 changed files with 91 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ShhShell/SSH/SSHError.swift
View File

@@ -19,6 +19,7 @@ enum AuthError: Error {
}
enum KeyError: Error {
case notConnected
case importPubkeyError
case importPrivkeyError
case pubkeyRejected

51
ShhShell/SSH/SSHHandler.swift
View File

@@ -82,7 +82,13 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
print(error.localizedDescription)
}
}
openShell()
do {
try openShell()
} catch {
print(error.localizedDescription)
}
setTitle("\(host.username)@\(host.address)")
ssh_channel_request_env(channel, "TERM", "xterm-256color")
ssh_channel_request_env(channel, "LANG", "en_US.UTF-8")
@@ -90,6 +96,7 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
}
func connect() throws(SSHError) {
guard !host.address.isEmpty else { throw .connectionFailed("No address to connect to.") }
withAnimation { state = .connecting }
var verbosity: Int = 0
@@ -153,6 +160,14 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
}
}
func hostInvalid() -> Bool {
if host.address.isEmpty && host.username.isEmpty {
return true
} else {
return false
}
}
func testExec() {
var success = false
defer {
@@ -174,9 +189,7 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
var nbytes: CInt
let testChannel = ssh_channel_new(session)
guard testChannel != nil else {
return
}
guard testChannel != nil else { return }
status = ssh_channel_open_session(testChannel)
guard status == SSH_OK else {
@@ -220,9 +233,7 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
//MARK: auth
func authWithPubkey(pub pubInp: Data, priv privInp: Data, pass: String) throws(KeyError) {
guard session != nil else {
return
}
guard session != nil else { throw .notConnected }
let fileManager = FileManager.default
let tempDir = fileManager.temporaryDirectory
@@ -328,32 +339,36 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
}
//MARK: shell
func openShell() {
func openShell() throws(SSHError) {
var status: CInt
channel = ssh_channel_new(session)
guard let channel else { return }
guard let channel else { throw .communicationError("Not connected") }
status = ssh_channel_open_session(channel)
guard status == SSH_OK else {
ssh_channel_free(channel)
return
throw .communicationError("Failed opening channel")
}
interactiveShellSession()
do {
try interactiveShellSession()
} catch {
print(error.localizedDescription)
}
}
private func interactiveShellSession() {
private func interactiveShellSession() throws(SSHError) {
var status: CInt
status = ssh_channel_request_pty(self.channel)
guard status == SSH_OK else { return }
guard status == SSH_OK else { throw .communicationError("PTY request failed") }
status = ssh_channel_change_pty_size(self.channel, 80, 24)
guard status == SSH_OK else { return }
guard status == SSH_OK else { throw .communicationError("Failed setting PTY size") }
status = ssh_channel_request_shell(self.channel)
guard status == SSH_OK else { return }
guard status == SSH_OK else { throw .communicationError("Failed requesting shell") }
withAnimation { state = .shellOpen }
}
@@ -398,9 +413,9 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
}
}
func resizePTY(toRows: Int, toCols: Int) {
guard ssh_channel_is_open(channel) != 0 else { return }
guard ssh_channel_is_eof(channel) == 0 else { return }
func resizePTY(toRows: Int, toCols: Int) throws(SSHError) {
guard ssh_channel_is_open(channel) != 0 else { throw .communicationError("Channel not open") }
guard ssh_channel_is_eof(channel) == 0 else { throw .backendError("Channel is EOF") }
ssh_channel_change_pty_size(channel, Int32(toCols), Int32(toRows))
// print("resized tty to \(toRows)rows and \(toCols)cols")