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

rewrote authwithpubkey, need to add error checking stuff

Browse Source
This commit is contained in:
neon443
2025-07-02 08:50:46 +01:00
parent ce162f437a
commit 8b2cdf910b
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ShhShell/SSH/SSHHandler.swift
View File

@@ -81,6 +81,9 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
return return
} }
try? authWithPubkey2()
fatalError()
if state != .authorized { if state != .authorized {
if !host.password.isEmpty { if !host.password.isEmpty {
do { try authWithPw() } catch { do { try authWithPw() } catch {
@@ -271,6 +274,23 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
} }
//MARK: auth //MARK: auth
func authWithPubkey2() throws(KeyError) {
guard let keyID = self.host.privateKeyID else { throw .importPrivkeyError }
guard let keypair = keyManager.keypairs.first(where: { $0.id == keyID }) else {
throw .importPrivkeyError
}
var pubkey: ssh_key?
ssh_pki_import_pubkey_base64(keypair.publicKey.base64EncodedString(), SSH_KEYTYPE_ECDSA, &pubkey)
ssh_userauth_try_publickey(session, nil, pubkey)
var privkey: ssh_key?
ssh_pki_import_privkey_base64(keypair.privateKey.base64EncodedString(), keypair.passphrase, nil, nil, &privkey)
ssh_userauth_publickey(session, nil, privkey)
state = .authorized
}
func authWithPubkey(pub pubInp: Data, priv privInp: Data, pass: String) throws(KeyError) { func authWithPubkey(pub pubInp: Data, priv privInp: Data, pass: String) throws(KeyError) {
guard session != nil else { throw .notConnected } guard session != nil else { throw .notConnected }