external/secretive
1
0
Fork 0
mirror of https://github.com/maxgoedjen/secretive.git synced 2025-08-31 01:20:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into fix_test_action

Browse Source
This commit is contained in:
Max Goedjen 2025-08-23 20:44:27 -07:00 committed by GitHub
commit 333f8e3e57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/Packages/Package.swift
View File

@ -36,47 +36,47 @@ let package = Package(
name: "SecretKit", name: "SecretKit",
dependencies: [], dependencies: [],
resources: [localization], resources: [localization],
swiftSettings: swiftSettings swiftSettings: swiftSettings,
), ),
.testTarget( .testTarget(
name: "SecretKitTests", name: "SecretKitTests",
dependencies: ["SecretKit", "SecureEnclaveSecretKit", "SmartCardSecretKit"], dependencies: ["SecretKit", "SecureEnclaveSecretKit", "SmartCardSecretKit"],
swiftSettings: swiftSettings swiftSettings: swiftSettings,
), ),
.target( .target(
name: "SecureEnclaveSecretKit", name: "SecureEnclaveSecretKit",
dependencies: ["SecretKit"], dependencies: ["SecretKit"],
resources: [localization], resources: [localization],
swiftSettings: swiftSettings swiftSettings: swiftSettings,
), ),
.target( .target(
name: "SmartCardSecretKit", name: "SmartCardSecretKit",
dependencies: ["SecretKit"], dependencies: ["SecretKit"],
resources: [localization], resources: [localization],
swiftSettings: swiftSettings swiftSettings: swiftSettings,
), ),
.target( .target(
name: "SecretAgentKit", name: "SecretAgentKit",
dependencies: ["SecretKit", "SecretAgentKitHeaders"], dependencies: ["SecretKit", "SecretAgentKitHeaders"],
resources: [localization], resources: [localization],
swiftSettings: swiftSettings swiftSettings: swiftSettings,
), ),
.systemLibrary( .systemLibrary(
name: "SecretAgentKitHeaders" name: "SecretAgentKitHeaders",
), ),
.testTarget( .testTarget(
name: "SecretAgentKitTests", name: "SecretAgentKitTests",
dependencies: ["SecretAgentKit"]) dependencies: ["SecretAgentKit"],
, ),
.target( .target(
name: "Brief", name: "Brief",
dependencies: [], dependencies: [],
resources: [localization], resources: [localization],
swiftSettings: swiftSettings swiftSettings: swiftSettings,
), ),
.testTarget( .testTarget(
name: "BriefTests", name: "BriefTests",
dependencies: ["Brief"] dependencies: ["Brief"],
), ),
] ]
) )

2
Sources/Packages/Sources/SecretKit/Erasers/AnySecret.swift
View File

@ -3,7 +3,7 @@ import Foundation
/// Type eraser for Secret. /// Type eraser for Secret.
public struct AnySecret: Secret, @unchecked Sendable { public struct AnySecret: Secret, @unchecked Sendable {
let base: Any public let base: Any
private let hashable: AnyHashable private let hashable: AnyHashable
private let _id: () -> AnyHashable private let _id: () -> AnyHashable
private let _name: () -> String private let _name: () -> String

3
Sources/Packages/Sources/SecretKit/Erasers/AnySecretStore.swift
View File

@ -1,8 +1,7 @@
import Foundation import Foundation
import Combine
/// Type eraser for SecretStore. /// Type eraser for SecretStore.
public class AnySecretStore: SecretStore, @unchecked Sendable { open class AnySecretStore: SecretStore, @unchecked Sendable {
let base: any Sendable let base: any Sendable
private let _isAvailable: @MainActor @Sendable () -> Bool private let _isAvailable: @MainActor @Sendable () -> Bool

1
Sources/Packages/Sources/SecretKit/Types/SecretStore.swift
View File

@ -1,5 +1,4 @@
import Foundation import Foundation
import Combine
/// Manages access to Secrets, and performs signature operations on data using those Secrets. /// Manages access to Secrets, and performs signature operations on data using those Secrets.
public protocol SecretStore: Identifiable, Sendable { public protocol SecretStore: Identifiable, Sendable {

1
Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveSecret.swift
View File

@ -1,5 +1,4 @@
import Foundation import Foundation
import Combine
import SecretKit import SecretKit
extension SecureEnclave { extension SecureEnclave {

6
Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveStore.swift
View File

@ -248,9 +248,9 @@ extension SecureEnclave.Store {
extension SecureEnclave { extension SecureEnclave {
enum Constants { public enum Constants {
static let keyTag = Data("com.maxgoedjen.secretive.secureenclave.key".utf8) public static let keyTag = Data("com.maxgoedjen.secretive.secureenclave.key".utf8)
static let keyType = kSecAttrKeyTypeECSECPrimeRandom as String public static let keyType = kSecAttrKeyTypeECSECPrimeRandom as String
static let unauthenticatedThreshold: TimeInterval = 0.05 static let unauthenticatedThreshold: TimeInterval = 0.05
} }

1
Sources/Packages/Sources/SmartCardSecretKit/SmartCardSecret.swift
View File

@ -1,5 +1,4 @@
import Foundation import Foundation
import Combine
import SecretKit import SecretKit
extension SmartCard { extension SmartCard {

2
Sources/SecretAgent/AppDelegate.swift
View File

@ -1,6 +1,5 @@
import Cocoa import Cocoa
import OSLog import OSLog
import Combine
import SecretKit import SecretKit
import SecureEnclaveSecretKit import SecureEnclaveSecretKit
import SmartCardSecretKit import SmartCardSecretKit
@ -27,7 +26,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let path = (NSHomeDirectory() as NSString).appendingPathComponent("socket.ssh") as String let path = (NSHomeDirectory() as NSString).appendingPathComponent("socket.ssh") as String
return SocketController(path: path) return SocketController(path: path)
}() }()
private var updateSink: AnyCancellable?
private let logger = Logger(subsystem: "com.maxgoedjen.secretive.secretagent", category: "AppDelegate") private let logger = Logger(subsystem: "com.maxgoedjen.secretive.secretagent", category: "AppDelegate")
func applicationDidFinishLaunching(_ aNotification: Notification) { func applicationDidFinishLaunching(_ aNotification: Notification) {

1
Sources/Secretive/Controllers/AgentStatusChecker.swift
View File

@ -1,5 +1,4 @@
import Foundation import Foundation
import Combine
import AppKit import AppKit
import SecretKit import SecretKit
import Observation import Observation

1
Sources/Secretive/Controllers/JustUpdatedChecker.swift
View File

@ -1,5 +1,4 @@
import Foundation import Foundation
import Combine
import AppKit import AppKit
protocol JustUpdatedCheckerProtocol: Observable { protocol JustUpdatedCheckerProtocol: Observable {

1
Sources/Secretive/Preview Content/PreviewAgentStatusChecker.swift
View File

@ -1,5 +1,4 @@
import Foundation import Foundation
import Combine
class PreviewAgentStatusChecker: AgentStatusCheckerProtocol { class PreviewAgentStatusChecker: AgentStatusCheckerProtocol {

1
Sources/Secretive/Views/StoreListView.swift
View File

@ -1,5 +1,4 @@
import SwiftUI import SwiftUI
import Combine
import SecretKit import SecretKit
struct StoreListView: View { struct StoreListView: View {