mirror of
https://github.com/AgentSeal/codeburn.git
synced 2026-08-26 00:44:41 +00:00
The Codex settings copy implied the cached credential was app-private. It is a normal login-Keychain item: reachable by programs running as you, with no per-app ACL. The real win is that it is no longer a world-readable 0644 file, so say that instead. Also documents why readAfterSecuringPermissions repairs permissions before validating content (validating first would read the secret while it is still world-readable, which is the window the function exists to close), and why the Keychain service names are deliberately not derived from CFBundleIdentifier (the Electron app hardcodes the same strings). Adds the #1037 changelog entry.
254 lines
9.5 KiB
Swift
254 lines
9.5 KiB
Swift
import Foundation
|
|
|
|
/// Symlink-safe file I/O with atomic writes and optional cross-process flock.
|
|
///
|
|
/// Every cache file we touch (`~/.cache/codeburn/fx-rates.json`,
|
|
/// `~/.cache/codeburn/subscription-snapshots.json`, `~/.config/codeburn/config.json`) is a
|
|
/// legitimate target for a local-symlink attack: if an attacker plants a symlink from one of
|
|
/// those paths to, say, `~/.ssh/config`, a naive `Data.write(to:)` blindly follows the link and
|
|
/// clobbers the real file. `O_NOFOLLOW` on the write() refuses the operation instead.
|
|
enum SafeFile {
|
|
enum Error: Swift.Error {
|
|
case symlinkDetected(String)
|
|
case openFailed(String, Int32)
|
|
case writeFailed(String, Int32)
|
|
case renameFailed(String, Int32)
|
|
case readFailed(String, Int32)
|
|
case sizeLimitExceeded(String, Int)
|
|
}
|
|
|
|
/// Default max bytes when reading untrusted cache files. Prevents a malicious cache file
|
|
/// from exhausting memory in the Swift process.
|
|
static let defaultReadLimit = 8 * 1024 * 1024
|
|
|
|
/// Open the existing regular file with O_NOFOLLOW, fchmod 0600, and
|
|
/// fstat-verify the mode. Used when leftover credential JSON cannot be
|
|
/// unlinked after a verified Keychain write.
|
|
static func tightenToOwnerReadWrite(at path: String) throws {
|
|
var linkInfo = stat()
|
|
guard lstat(path, &linkInfo) == 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
if (linkInfo.st_mode & S_IFMT) == S_IFLNK {
|
|
throw Error.symlinkDetected(path)
|
|
}
|
|
let fd = Darwin.open(path, O_RDONLY | O_NOFOLLOW)
|
|
guard fd >= 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
defer { Darwin.close(fd) }
|
|
var opened = stat()
|
|
guard fstat(fd, &opened) == 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
guard (opened.st_mode & S_IFMT) == S_IFREG else {
|
|
throw SecureReadError.notRegularFile(path)
|
|
}
|
|
if fchmod(fd, 0o600) != 0 {
|
|
throw SecureReadError.chmodFailed(path, errno)
|
|
}
|
|
var verified = stat()
|
|
guard fstat(fd, &verified) == 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
let mode = verified.st_mode & 0o777
|
|
guard mode == 0o600 else {
|
|
throw SecureReadError.modeVerifyFailed(path, mode)
|
|
}
|
|
}
|
|
|
|
/// Refuses to follow symlinks and writes atomically via a tmp file + rename. `mode` is the
|
|
/// final file permission (0o600 by default so cache files stay user-private).
|
|
static func write(_ data: Data, to path: String, mode: mode_t = 0o600) throws {
|
|
let parent = (path as NSString).deletingLastPathComponent
|
|
try FileManager.default.createDirectory(
|
|
atPath: parent,
|
|
withIntermediateDirectories: true,
|
|
attributes: [.posixPermissions: NSNumber(value: 0o700)]
|
|
)
|
|
|
|
// Reject if the existing file is a symlink. We use lstat so the link itself is
|
|
// inspected, not its target.
|
|
var linkInfo = stat()
|
|
if lstat(path, &linkInfo) == 0, (linkInfo.st_mode & S_IFMT) == S_IFLNK {
|
|
throw Error.symlinkDetected(path)
|
|
}
|
|
|
|
let tmpPath = parent + "/.codeburn-" + UUID().uuidString + ".tmp"
|
|
let flags: Int32 = O_CREAT | O_WRONLY | O_EXCL | O_NOFOLLOW
|
|
let fd = Darwin.open(tmpPath, flags, mode)
|
|
guard fd >= 0 else {
|
|
throw Error.openFailed(tmpPath, errno)
|
|
}
|
|
|
|
let writeResult: Int = data.withUnsafeBytes { buffer -> Int in
|
|
guard let base = buffer.baseAddress else { return 0 }
|
|
return Darwin.write(fd, base, buffer.count)
|
|
}
|
|
let writeErrno = errno
|
|
fsync(fd)
|
|
Darwin.close(fd)
|
|
|
|
guard writeResult == data.count else {
|
|
unlink(tmpPath)
|
|
throw Error.writeFailed(tmpPath, writeErrno)
|
|
}
|
|
|
|
if rename(tmpPath, path) != 0 {
|
|
let renameErrno = errno
|
|
unlink(tmpPath)
|
|
throw Error.renameFailed(path, renameErrno)
|
|
}
|
|
}
|
|
|
|
/// Refuses to read through a symlink. `maxBytes` bounds the read so a tampered cache file
|
|
/// can't balloon the process.
|
|
static func read(from path: String, maxBytes: Int = defaultReadLimit) throws -> Data {
|
|
var linkInfo = stat()
|
|
guard lstat(path, &linkInfo) == 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
if (linkInfo.st_mode & S_IFMT) == S_IFLNK {
|
|
throw Error.symlinkDetected(path)
|
|
}
|
|
|
|
let fd = Darwin.open(path, O_RDONLY | O_NOFOLLOW)
|
|
guard fd >= 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
defer { Darwin.close(fd) }
|
|
|
|
let size = Int(linkInfo.st_size)
|
|
if size > maxBytes {
|
|
throw Error.sizeLimitExceeded(path, size)
|
|
}
|
|
|
|
var data = Data(count: size)
|
|
let readBytes: Int = data.withUnsafeMutableBytes { buffer -> Int in
|
|
guard let base = buffer.baseAddress else { return 0 }
|
|
return Darwin.read(fd, base, buffer.count)
|
|
}
|
|
guard readBytes >= 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
if readBytes < size {
|
|
data = data.prefix(readBytes)
|
|
}
|
|
return data
|
|
}
|
|
|
|
enum SecureReadError: Swift.Error, Equatable {
|
|
case notRegularFile(String)
|
|
case wrongOwner(String)
|
|
case chmodFailed(String, Int32)
|
|
case modeVerifyFailed(String, mode_t)
|
|
}
|
|
|
|
/// Legacy credential migration path: open with `O_NOFOLLOW`, refuse non-regular /
|
|
/// non-owned files, `fchmod(0600)` and verify mode, then read bounded bytes from
|
|
/// the same descriptor. Permissions are repaired before any secret byte is read.
|
|
///
|
|
/// The chmod deliberately precedes any content check: validating JSON first would
|
|
/// mean reading the secret while it is still world-readable, which is the exact
|
|
/// window this function exists to close. The cost is that a non-credential file
|
|
/// sitting at the caller's exact cache path also gets tightened to 0600 — bounded
|
|
/// to our own Application Support directory, and already symlink- and owner-checked.
|
|
static func readAfterSecuringPermissions(
|
|
from path: String,
|
|
maxBytes: Int = defaultReadLimit,
|
|
expectedOwner: uid_t = geteuid()
|
|
) throws -> Data {
|
|
var linkInfo = stat()
|
|
guard lstat(path, &linkInfo) == 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
if (linkInfo.st_mode & S_IFMT) == S_IFLNK {
|
|
throw Error.symlinkDetected(path)
|
|
}
|
|
guard (linkInfo.st_mode & S_IFMT) == S_IFREG else {
|
|
throw SecureReadError.notRegularFile(path)
|
|
}
|
|
guard linkInfo.st_uid == expectedOwner else {
|
|
throw SecureReadError.wrongOwner(path)
|
|
}
|
|
|
|
let fd = Darwin.open(path, O_RDONLY | O_NOFOLLOW)
|
|
guard fd >= 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
defer { Darwin.close(fd) }
|
|
|
|
var opened = stat()
|
|
guard fstat(fd, &opened) == 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
guard (opened.st_mode & S_IFMT) == S_IFREG else {
|
|
throw SecureReadError.notRegularFile(path)
|
|
}
|
|
guard opened.st_uid == expectedOwner else {
|
|
throw SecureReadError.wrongOwner(path)
|
|
}
|
|
|
|
if fchmod(fd, 0o600) != 0 {
|
|
throw SecureReadError.chmodFailed(path, errno)
|
|
}
|
|
var verified = stat()
|
|
guard fstat(fd, &verified) == 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
let mode = verified.st_mode & 0o777
|
|
guard mode == 0o600 else {
|
|
throw SecureReadError.modeVerifyFailed(path, mode)
|
|
}
|
|
|
|
let size = Int(verified.st_size)
|
|
if size > maxBytes {
|
|
throw Error.sizeLimitExceeded(path, size)
|
|
}
|
|
|
|
var data = Data()
|
|
data.reserveCapacity(max(size, 0))
|
|
var chunk = [UInt8](repeating: 0, count: 4096)
|
|
let limit = maxBytes + 1
|
|
while data.count < limit {
|
|
let n = chunk.withUnsafeMutableBytes { buffer -> Int in
|
|
guard let base = buffer.baseAddress else { return 0 }
|
|
return Darwin.read(fd, base, min(buffer.count, limit - data.count))
|
|
}
|
|
guard n >= 0 else {
|
|
throw Error.readFailed(path, errno)
|
|
}
|
|
if n == 0 { break }
|
|
data.append(contentsOf: chunk.prefix(n))
|
|
}
|
|
if data.count > maxBytes {
|
|
throw Error.sizeLimitExceeded(path, data.count)
|
|
}
|
|
return data
|
|
}
|
|
|
|
/// Runs `body` while holding an exclusive POSIX advisory lock on `path`. The lock file is
|
|
/// created if missing (with 0o600 permissions) and released on scope exit, so other
|
|
/// codeburn processes (the CLI running in a terminal, say) block on the same file instead
|
|
/// of racing on a shared config.
|
|
static func withExclusiveLock<T>(at path: String, body: () throws -> T) throws -> T {
|
|
let parent = (path as NSString).deletingLastPathComponent
|
|
try FileManager.default.createDirectory(
|
|
atPath: parent,
|
|
withIntermediateDirectories: true,
|
|
attributes: [.posixPermissions: NSNumber(value: 0o700)]
|
|
)
|
|
let fd = Darwin.open(path, O_CREAT | O_RDWR | O_NOFOLLOW, 0o600)
|
|
guard fd >= 0 else {
|
|
throw Error.openFailed(path, errno)
|
|
}
|
|
defer { Darwin.close(fd) }
|
|
|
|
guard flock(fd, LOCK_EX) == 0 else {
|
|
throw Error.openFailed(path, errno)
|
|
}
|
|
defer { _ = flock(fd, LOCK_UN) }
|
|
|
|
return try body()
|
|
}
|
|
}
|