Skip to content

Emit error message when TouchID is cancelled #4

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
joy13975 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Emit error message when TouchID is cancelled #4

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
35 changes: 19 additions & 16 deletions keymaster.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ func setPassword(key: String, password: String) -> Bool {
let query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: key,
kSecValueData as String: password
kSecValueData as String: password.data(using: .utf8)!
]

let status = SecItemAdd(query as CFDictionary, nil)
return status == errSecSuccess
}

func deletePassword(key: String) -> Bool {
let query: [String: Any] = [
let query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: key,
kSecMatchLimit as String: kSecMatchLimitOne
Expand All @@ -38,7 +38,7 @@ func getPassword(key: String) -> String? {

guard status == errSecSuccess,
let passwordData = item as? Data,
let password = String(data: passwordData, encoding: String.Encoding.utf8)
let password = String(data: passwordData, encoding: .utf8)
else { return nil }

return password
Expand All @@ -52,7 +52,7 @@ func main() {
let inputArgs: [String] = Array(CommandLine.arguments.dropFirst())
if (inputArgs.count < 2 || inputArgs.count > 3) {
usage()
exit(EXIT_FAILURE)
exit(EXIT_FAILURE)
}
let action = inputArgs[0]
let key = inputArgs[1]
Expand All @@ -72,28 +72,32 @@ func main() {

if (action == "set") {
context.evaluatePolicy(policy, localizedReason: "set to your password") { success, error in
guard setPassword(key: key, password: secret) else {
print("Error setting password")
if success {
guard setPassword(key: key, password: secret) else {
print("Error setting password")
exit(EXIT_FAILURE)
}
print("Key \(key) has been successfully set in the keychain")
exit(EXIT_SUCCESS)
} else {
print("Authentication failed or was canceled: \(error?.localizedDescription ?? "Unknown error")")
exit(EXIT_FAILURE)
}
print("Key \(key) has been sucessfully set in the keychain")
exit(EXIT_SUCCESS)
}
dispatchMain()
}

if (action == "get") {
context.evaluatePolicy(policy, localizedReason: "access to your password") { success, error in
if success && error == nil {
if success {
guard let password = getPassword(key: key) else {
print("Error getting password")
exit(EXIT_FAILURE)
}
print(password)
exit(EXIT_SUCCESS)
} else {
let errorDescription = error?.localizedDescription ?? "Unknown error"
print("Error \(errorDescription)")
print("Authentication failed or was canceled: \(error?.localizedDescription ?? "Unknown error")")
exit(EXIT_FAILURE)
}
}
Expand All @@ -102,21 +106,20 @@ func main() {

if (action == "delete") {
context.evaluatePolicy(policy, localizedReason: "delete your password") { success, error in
if success && error == nil {
if success {
guard deletePassword(key: key) else {
print("Error deleting password")
exit(EXIT_FAILURE)
}
print("Key \(key) has been sucessfully deleted from the keychain")
print("Key \(key) has been successfully deleted from the keychain")
exit(EXIT_SUCCESS)
} else {
let errorDescription = error?.localizedDescription ?? "Unknown error"
print("Error \(errorDescription)")
print("Authentication failed or was canceled: \(error?.localizedDescription ?? "Unknown error")")
exit(EXIT_FAILURE)
}
}
dispatchMain()
}
}

main()
main()