mirror of
https://github.com/neon443/ShhShell.git
synced 2026-03-11 13:26:16 +00:00
rewrote authwithpubkey - currently doesnt auth but it can save the pub/privkeys temporarily and import? testing rn
This commit is contained in:
@@ -164,16 +164,25 @@ class SSHHandler: ObservableObject {
|
||||
return
|
||||
}
|
||||
|
||||
func authWithPubkey() -> Bool {
|
||||
var status: CInt
|
||||
status = ssh_userauth_publickey_auto(session, nil, nil)
|
||||
if status == SSH_AUTH_ERROR.rawValue {
|
||||
print("pubkey auth failed")
|
||||
logSshGetError()
|
||||
return false
|
||||
}
|
||||
withAnimation { authorized = true }
|
||||
return true
|
||||
func authWithPubkey(pub: String, priv: String, pass: String) {
|
||||
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)
|
||||
|
||||
try? pub.data(using: .utf8)?.write(to: tempPubkey)
|
||||
try? priv.data(using: .utf8)?.write(to: tempKey)
|
||||
|
||||
var pubkey: ssh_key?
|
||||
ssh_pki_import_pubkey_file(tempPubkey.path(), &pubkey)
|
||||
let status = ssh_userauth_try_publickey(session, nil, pubkey)
|
||||
print(status)
|
||||
|
||||
var privkey: ssh_key?
|
||||
ssh_pki_import_privkey_file(tempKey.path(), pass, nil, nil, &privkey)
|
||||
}
|
||||
|
||||
func authWithPw() -> Bool {
|
||||
|
||||
@@ -9,11 +9,17 @@ import SwiftUI
|
||||
|
||||
struct ContentView: View {
|
||||
@ObservedObject var handler: SSHHandler
|
||||
// @State var connected: Bool = false
|
||||
|
||||
@State var pubkey: String = ""
|
||||
@State var privkey: String = ""
|
||||
@State var passphrase: String = ""
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
List {
|
||||
TextField("", text: $pubkey)
|
||||
TextField("", text: $privkey)
|
||||
TextField("", text: $passphrase)
|
||||
HStack {
|
||||
Text(handler.connected ? "connected" : "not connected")
|
||||
.modifier(foregroundColorStyle(handler.connected ? .green : .red))
|
||||
@@ -46,12 +52,16 @@ struct ContentView: View {
|
||||
TextField("username", text: $handler.host.username)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
|
||||
TextField("password", text: $handler.host.password)
|
||||
SecureField("password", text: $handler.host.password)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
|
||||
Button() {
|
||||
handler.connect()
|
||||
if !pubkey.isEmpty && !privkey.isEmpty {
|
||||
handler.authWithPubkey(pub: pubkey, priv: privkey, pass: passphrase)
|
||||
} else {
|
||||
let _ = handler.authWithPw()
|
||||
}
|
||||
handler.openShell()
|
||||
} label: {
|
||||
Label("Connect", systemImage: "powerplug.portrait")
|
||||
|
||||
Reference in New Issue
Block a user