[RFC] Keychain-backed settings #536
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
|
|
||
| import Foundation | ||
|
|
||
| class SettingsStore: ObservableObject { | ||
| enum Constants { | ||
| static let service = "com.maxgoedjen.Secretive" | ||
| } | ||
| } | ||
|
|
||
| extension SettingsStore { | ||
| subscript(key: String) -> String? { | ||
| set(value) { | ||
| guard let valueData = value?.data(using: String.Encoding.utf8)! else { | ||
| return | ||
| } | ||
|
|
||
| if let keyVal = self[key] { | ||
| if keyVal == value { | ||
| return | ||
| } | ||
|
|
||
| let updateQuery: [String: Any] = [kSecClass as String: kSecClassGenericPassword, | ||
| kSecAttrServer as String: Constants.service] | ||
| let attributes: [String: Any] = [kSecAttrAccount as String: key, | ||
| kSecValueData as String: valueData] | ||
| // FIXME: Make this non-blocking as described here: https://developer.apple.com/documentation/security/1393617-secitemupdate | ||
| let status = SecItemUpdate(updateQuery as CFDictionary, attributes as CFDictionary) | ||
| guard status == errSecSuccess else { | ||
| print("Couldn't update item in keychain. " + status.description) | ||
| return | ||
| } | ||
| } else { | ||
| let addquery: [String: Any] = [kSecClass as String: kSecClassGenericPassword, | ||
| kSecAttrAccount as String: key, | ||
| kSecAttrServer as String: Constants.service, | ||
| kSecValueData as String: valueData] | ||
| // FIXME: Make this non-blocking as described here: https://developer.apple.com/documentation/security/1401659-secitemadd | ||
| let status = SecItemAdd(addquery as CFDictionary, nil) | ||
| guard status == errSecSuccess else { | ||
| print("Couldn't add item to keychain. " + status.description) | ||
| return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| get { | ||
| let getquery: [String: Any] = [kSecClass as String: kSecClassGenericPassword, | ||
| kSecAttrAccount as String: key, | ||
| kSecAttrServer as String: Constants.service, | ||
| kSecMatchLimit as String: kSecMatchLimitOne, | ||
| kSecReturnData as String: true] | ||
| var item: CFTypeRef? | ||
| let status = SecItemCopyMatching(getquery as CFDictionary, &item) | ||
|
|
||
| return status == errSecSuccess ? String(decoding: item as! Data, as: UTF8.self) : nil | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
|
|
||
| import SwiftUI | ||
|
|
||
| enum CommentStyle: String, CaseIterable, Identifiable { | ||
| case keyAndHost = "keyAndHost" | ||
| case none = "none" | ||
|
|
||
| var id: Self { self } | ||
| } | ||
|
|
||
| struct GeneralSettingsView: View { | ||
| @AppStorage("com.maxgoedjen.Secretive.commentStyle") var selectedCommentStyle: CommentStyle = .keyAndHost | ||
|
There was a problem hiding this comment. Same as secretdetailview, need to make sure this makes it to secure store not just defaults. |
||
|
|
||
| var body: some View { | ||
|
|
||
| VStack(alignment: .leading) { | ||
| Section(footer: Text("SSH public keys can be extended with an arbitrary comment string without changing the meaning of the key.") | ||
| .font(.caption) | ||
| .fontWeight(.light)) { | ||
| Picker("SSH Public Key Comment", selection: $selectedCommentStyle) { | ||
| Text("Default").tag(CommentStyle.keyAndHost) | ||
| Text("None").tag(CommentStyle.none) | ||
| } | ||
| .pickerStyle(DefaultPickerStyle()) | ||
| } | ||
| } | ||
| .padding(20) | ||
| .frame(width: 350, height: 100) | ||
| .navigationTitle("Settings") | ||
| } | ||
| } | ||
|
|
||
|
|
||
| struct SettingsView: View { | ||
| private enum Tabs: Hashable { | ||
| case general | ||
| } | ||
| var body: some View { | ||
| TabView { | ||
| GeneralSettingsView() | ||
| .tabItem { | ||
| Label("General", systemImage: "gear") | ||
| } | ||
| .tag(Tabs.general) | ||
| } | ||
| .padding(20) | ||
| .frame(width: 500, height: 200) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| SettingsView() | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this method gets more complicated, it MIGHT make sense to move it into
OpenSSHKeyWriter– just instead of taking acomment: Stringparameter, we define that enum insideOpenSSHKeyWriterand pass an enum valuecommentStyle: CommentStyleThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dashedKeyNameanddashedHostNameare both defined inSecretDetailView.swift. That means we would also have to move those intoOpenSSHKeyWriter.swifttoo, yes?EDIT: forgot to tag you, @maxgoedjen 🙂
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@maxgoedjen just giving this a polite bump in case it got lost 🙂
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah they're just there since I think that's the only place that used them til now - feel free to move them somewhere more appropriate