style: apply swiftformat fixes
This commit is contained in:
@@ -95,7 +95,9 @@ struct GeneralSettings: View {
|
|||||||
.pickerStyle(.segmented)
|
.pickerStyle(.segmented)
|
||||||
|
|
||||||
Text("""
|
Text("""
|
||||||
Controls remote command execution on this Mac when it is paired as a node. "Always Ask" prompts on each command; "Always Allow" runs without prompts; "Never" disables `system.run`.
|
Controls remote command execution on this Mac when it is paired as a node. \
|
||||||
|
"Always Ask" prompts on each command; "Always Allow" runs without prompts; \
|
||||||
|
"Never" disables `system.run`.
|
||||||
""")
|
""")
|
||||||
.font(.footnote)
|
.font(.footnote)
|
||||||
.foregroundStyle(.tertiary)
|
.foregroundStyle(.tertiary)
|
||||||
|
|||||||
@@ -19,14 +19,14 @@ enum MacNodeBridgeTLSStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static func loadFingerprint(stableID: String) -> String? {
|
static func loadFingerprint(stableID: String) -> String? {
|
||||||
let key = keyPrefix + stableID
|
let key = self.keyPrefix + stableID
|
||||||
let raw = defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines)
|
let raw = self.defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
return raw?.isEmpty == false ? raw : nil
|
return raw?.isEmpty == false ? raw : nil
|
||||||
}
|
}
|
||||||
|
|
||||||
static func saveFingerprint(_ value: String, stableID: String) {
|
static func saveFingerprint(_ value: String, stableID: String) {
|
||||||
let key = keyPrefix + stableID
|
let key = self.keyPrefix + stableID
|
||||||
defaults.set(value, forKey: key)
|
self.defaults.set(value, forKey: key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,5 +71,5 @@ private func sha256Hex(_ data: Data) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func normalizeMacNodeFingerprint(_ raw: String) -> String {
|
private func normalizeMacNodeFingerprint(_ raw: String) -> String {
|
||||||
raw.lowercased().filter { $0.isHexDigit }
|
raw.lowercased().filter(\.isHexDigit)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -586,8 +586,8 @@ actor MacNodeRuntime {
|
|||||||
let key = rawKey.trimmingCharacters(in: .whitespacesAndNewlines)
|
let key = rawKey.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
guard !key.isEmpty else { continue }
|
guard !key.isEmpty else { continue }
|
||||||
let upper = key.uppercased()
|
let upper = key.uppercased()
|
||||||
if blockedEnvKeys.contains(upper) { continue }
|
if self.blockedEnvKeys.contains(upper) { continue }
|
||||||
if blockedEnvPrefixes.contains(where: { upper.hasPrefix($0) }) { continue }
|
if self.blockedEnvPrefixes.contains(where: { upper.hasPrefix($0) }) { continue }
|
||||||
merged[key] = value
|
merged[key] = value
|
||||||
}
|
}
|
||||||
return merged
|
return merged
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ enum SystemRunPolicy: String, CaseIterable, Identifiable {
|
|||||||
var title: String {
|
var title: String {
|
||||||
switch self {
|
switch self {
|
||||||
case .never:
|
case .never:
|
||||||
return "Never"
|
"Never"
|
||||||
case .ask:
|
case .ask:
|
||||||
return "Always Ask"
|
"Always Ask"
|
||||||
case .always:
|
case .always:
|
||||||
return "Always Allow"
|
"Always Allow"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,13 +75,13 @@ enum SystemRunAllowlist {
|
|||||||
|
|
||||||
static func contains(_ argv: [String], defaults: UserDefaults = .standard) -> Bool {
|
static func contains(_ argv: [String], defaults: UserDefaults = .standard) -> Bool {
|
||||||
let key = key(for: argv)
|
let key = key(for: argv)
|
||||||
return load(from: defaults).contains(key)
|
return self.load(from: defaults).contains(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
static func add(_ argv: [String], defaults: UserDefaults = .standard) {
|
static func add(_ argv: [String], defaults: UserDefaults = .standard) {
|
||||||
let key = key(for: argv)
|
let key = key(for: argv)
|
||||||
guard !key.isEmpty else { return }
|
guard !key.isEmpty else { return }
|
||||||
var allowlist = load(from: defaults)
|
var allowlist = self.load(from: defaults)
|
||||||
if allowlist.insert(key).inserted {
|
if allowlist.insert(key).inserted {
|
||||||
MacNodeConfigFile.setSystemRunAllowlist(Array(allowlist).sorted())
|
MacNodeConfigFile.setSystemRunAllowlist(Array(allowlist).sorted())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user