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 autwithpubkey to use emmeory strings

Browse Source 
added strip pubkey and privkey functions to remove stuff like ssh-ed25519 and neon443@mac anc  -----begin key ----- end key etcc
This commit is contained in:
neon443
2025-06-23 11:23:25 +01:00
parent 01d569a859
commit db76329f80
1 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
ShhShell/SSH/SSHHandler.swift
View File

@@ -55,7 +55,7 @@ class SSHHandler: ObservableObject {
self.host.key = getHostkey() self.host.key = getHostkey()
} }
var verbosity: Int = 0 var verbosity: Int = SSH_LOG_FUNCTIONS
session = ssh_new() session = ssh_new()
guard session != nil else { guard session != nil else {
@@ -168,41 +168,49 @@ class SSHHandler: ObservableObject {
return return
} }
func stripPubkey(_ data: Data) -> [CChar] {
let string = String(data: data, encoding: .utf8) ?? ""
let splitString = string.components(separatedBy: " ")
if splitString.count >= 2 {
return splitString[1].cString(using: .utf8) ?? []
} else { return [] }
}
func stripPrivkey(_ data: Data) -> [CChar] {
let string = String(data: data, encoding: .utf8) ?? ""
var splitString = string.components(separatedBy: "-----BEGIN OPENSSH PRIVATE KEY-----")
splitString[splitString.count-1] = splitString[splitString.count-1].components(separatedBy: "-----END OPENSSH PRIVATE KEY-----")[0]
if splitString.count >= 2 {
return splitString[1].cString(using: .utf8) ?? []
} else { return [] }
}
func authWithPubkey(pub pubInp: Data, priv privInp: Data, pass: String) { func authWithPubkey(pub pubInp: Data, priv privInp: Data, pass: String) {
guard session != nil else { guard session != nil else {
withAnimation { authorized = false } withAnimation { authorized = false }
return return
} }
var status: Int32
let fileManager = FileManager.default
let tempDir = fileManager.temporaryDirectory
let tempPubkey = tempDir.appendingPathComponent("key.pub")
let tempKey = tempDir.appendingPathComponent("key")
fileManager.createFile(atPath: tempPubkey.path(), contents: nil)
fileManager.createFile(atPath: tempKey.path(), contents: nil)
let attributes: [FileAttributeKey: Any] = [.posixPermissions: 0o600]
try? fileManager.setAttributes(attributes, ofItemAtPath: tempPubkey.path())
try? fileManager.setAttributes(attributes, ofItemAtPath: tempKey.path())
try? pubInp.write(to: tempPubkey)
try? privInp.write(to: tempKey)
var pubkey: ssh_key? var pubkey: ssh_key?
ssh_pki_import_pubkey_file(tempPubkey.path(), &pubkey) if ssh_pki_import_pubkey_base64(stripPubkey(pubInp), SSH_KEYTYPE_ED25519, &pubkey) != 0 {
status = ssh_userauth_try_publickey(session, nil, pubkey) print("pubkey import error")
print(status)
var privkey: ssh_key?
if ssh_pki_import_privkey_file(tempKey.path(), pass, nil, nil, &privkey) != 0 {
print("help?!?")
print("likeley password is incorrect")
} }
status = ssh_userauth_publickey(session, nil, privkey) if ssh_userauth_try_publickey(session, nil, pubkey) != 0 {
if status != 0 { print("pubkey pubkey auth error")
}
var privkey: ssh_key?
let strippedPrivkey = stripPrivkey(privInp)
if ssh_pki_import_privkey_base64(strippedPrivkey, pass, nil, nil, &privkey) != 0 {
print("privkey import error")
print("likely incorrect passphrase")
}
if (ssh_userauth_publickey(session, nil, privkey) != 0) {
withAnimation { authorized = false } withAnimation { authorized = false }
print("auth failed lol") print("auth failed lol")
return return
@@ -214,8 +222,8 @@ class SSHHandler: ObservableObject {
DispatchQueue.main.asyncAfter(deadline: .now()+10) { DispatchQueue.main.asyncAfter(deadline: .now()+10) {
ssh_key_free(pubkey) ssh_key_free(pubkey)
ssh_key_free(privkey) ssh_key_free(privkey)
try? fileManager.removeItem(at: tempPubkey) // try? fileManager.removeItem(at: tempPubkey)
try? fileManager.removeItem(at: tempKey) // try? fileManager.removeItem(at: tempKey)
} }
return return