mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-22 05:25:41 +00:00
Domain/ 根目录原有 62 个平铺源文件,无法从目录读出主题划分。 按「目录即主题」重组为 11 个目录(Rules/Custom 为嵌套子目录):Catalog / Subscription / Rules / Runtime / Activation / Settings / SystemProxy / Plugin / Credentials / LegacyImport / Diagnostics。纯移动:类型名、模块名 与 import 均未改动,Domain/ 根下不再有散落文件。目录口径取自 GLOSSARY.md 的章节划分(配置与订阅、代理规则、代理控制与网络、设置、 凭据与诊断),而非新造分类。 配套改动: - project.yml:wrapper 与 helper 两个 target 按文件引用的 15 条显式路径 随目录改名,并补注释固定这一约定——这 15 条指向不存在的文件时, xcodegen generate 以 "missing source directory" 直接失败(实测,不静默)。 - SkeletonTests 新增 DomainLayoutTests:断言 Domain/ 根下无平铺 .swift、 树下只有 .swift。后者防的是与 App/ 同源的坑——Domain/ 整目录是 app 与 Core 的 source path,任何非源码文件都会被 XcodeGen 收进 Resources 阶段 并封进签名后的 bundle。 - README 工程结构说明同步;docs/design 与 docs/research 属历史文档不改。 验证:xcodegen generate 后 app 164 / Core 163 源文件数与整理前一致;Agent 恰好 9 个、Helper 恰好 6 个 Domain 文件(无缺失无多出);app 与 Core 各覆盖 全部 62 个。clean build 0 error;task test 1024 用例全通过(整理前 1022, +2 为新增守卫);task format 未改写任何被移动文件(证明纯移动);task lint 与整理前同为 21 条内容型 warning;packaging-gate.sh ALL CHECKS PASSED。 布局守卫已做变异验证:临时投放松散 .swift 与非 .swift 文件时两个用例均 失败并点名违规文件,清理后复验为绿。
79 lines
3.1 KiB
Swift
79 lines
3.1 KiB
Swift
import Foundation
|
|
import Security
|
|
|
|
/// 凭据存储缝(spec #21 D5):密码、插件参数、非空远程 URL 等秘密值的权威持久
|
|
/// 副本在 Keychain,配置树只持凭据引用。实现须保证写入/读出一致。
|
|
protocol CredentialStoring {
|
|
/// 写入即覆盖既有值(同一引用始终对应最新秘密)。
|
|
func save(_ secret: String, for reference: CredentialReference) throws
|
|
/// 无对应条目返回 `nil`,不视为错误。
|
|
func secret(for reference: CredentialReference) throws -> String?
|
|
/// 删除不存在的条目不视为错误(幂等)。
|
|
func delete(_ reference: CredentialReference) throws
|
|
}
|
|
|
|
enum CredentialStoreError: Error, Equatable {
|
|
/// Keychain 返回预期之外的状态码。
|
|
case keychainStatus(OSStatus)
|
|
/// 存储的秘密值不是合法 UTF-8 文本。
|
|
case secretNotUTF8
|
|
}
|
|
|
|
/// 生产实现:登录钥匙串 Generic Password。`service` 隔离本应用命名空间,
|
|
/// `account` 即凭据引用;可访问性取「首次解锁后」,兼顾代理运行时读取。
|
|
struct KeychainCredentialStore: CredentialStoring {
|
|
let service: String
|
|
|
|
init(service: String = "com.qiuyuzhou.ShadowsocksX-NG2.credentials") {
|
|
self.service = service
|
|
}
|
|
|
|
func save(_ secret: String, for reference: CredentialReference) throws {
|
|
let data = Data(secret.utf8)
|
|
let query = baseQuery(for: reference)
|
|
let update: [String: Any] = [
|
|
kSecValueData as String: data,
|
|
kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock,
|
|
]
|
|
var status = SecItemUpdate(query as CFDictionary, update as CFDictionary)
|
|
if status == errSecItemNotFound {
|
|
var addItem = query
|
|
addItem[kSecValueData as String] = data
|
|
addItem[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
|
|
status = SecItemAdd(addItem as CFDictionary, nil)
|
|
}
|
|
guard status == errSecSuccess else { throw CredentialStoreError.keychainStatus(status) }
|
|
}
|
|
|
|
func secret(for reference: CredentialReference) throws -> String? {
|
|
var query = baseQuery(for: reference)
|
|
query[kSecReturnData as String] = kCFBooleanTrue as Any
|
|
query[kSecMatchLimit as String] = kSecMatchLimitOne
|
|
var result: AnyObject?
|
|
let status = SecItemCopyMatching(query as CFDictionary, &result)
|
|
if status == errSecItemNotFound { return nil }
|
|
guard status == errSecSuccess, let data = result as? Data else {
|
|
throw CredentialStoreError.keychainStatus(status)
|
|
}
|
|
guard let secret = String(data: data, encoding: .utf8) else {
|
|
throw CredentialStoreError.secretNotUTF8
|
|
}
|
|
return secret
|
|
}
|
|
|
|
func delete(_ reference: CredentialReference) throws {
|
|
let status = SecItemDelete(baseQuery(for: reference) as CFDictionary)
|
|
guard status == errSecSuccess || status == errSecItemNotFound else {
|
|
throw CredentialStoreError.keychainStatus(status)
|
|
}
|
|
}
|
|
|
|
private func baseQuery(for reference: CredentialReference) -> [String: Any] {
|
|
[
|
|
kSecClass as String: kSecClassGenericPassword,
|
|
kSecAttrService as String: service,
|
|
kSecAttrAccount as String: reference.rawValue,
|
|
]
|
|
}
|
|
}
|