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 文件时两个用例均 失败并点名违规文件,清理后复验为绿。
106 lines
3.4 KiB
Swift
106 lines
3.4 KiB
Swift
import Foundation
|
|
|
|
/// 加密方式能力目录(与当前随 app 打包的 sslocal 版本保持一致)。
|
|
/// 目录值是本地可验证的能力事实,不代表远端服务器一定可达。
|
|
enum EncryptionMethodCatalog {
|
|
static let supported: Set<String> = [
|
|
"aes-128-gcm",
|
|
"aes-256-gcm",
|
|
"chacha20-ietf-poly1305",
|
|
"2022-blake3-aes-128-gcm",
|
|
"2022-blake3-aes-256-gcm",
|
|
"2022-blake3-chacha20-poly1305",
|
|
"none",
|
|
]
|
|
|
|
static func isSupported(_ method: String) -> Bool {
|
|
supported.contains(method)
|
|
}
|
|
}
|
|
|
|
/// 服务器配置的 app 可知校验结果。插件参数保持 opaque,不在此处判断其语法或
|
|
/// 远端握手;空 issues 只表示没有已知的本地激活阻塞原因。
|
|
struct ServerValidation: Equatable, Sendable {
|
|
let issues: [LeafInvalidationReason]
|
|
|
|
var isValid: Bool { issues.isEmpty }
|
|
|
|
static func evaluate(
|
|
_ fields: ServerFields,
|
|
credentials: CredentialStoring,
|
|
plugins: PluginExecutableResolving
|
|
) -> ServerValidation {
|
|
var issues: [LeafInvalidationReason] = []
|
|
appendAddressIssue(fields.address, to: &issues)
|
|
appendPortIssue(fields.port, to: &issues)
|
|
appendMethodIssue(fields.encryptionMethod, to: &issues)
|
|
appendCredentialIssue(fields.passwordRef, credentials: credentials, to: &issues)
|
|
appendPluginIssues(fields, credentials: credentials, plugins: plugins, to: &issues)
|
|
return ServerValidation(issues: issues)
|
|
}
|
|
|
|
private static func appendAddressIssue(
|
|
_ address: String, to issues: inout [LeafInvalidationReason]
|
|
) {
|
|
if address.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
|
issues.append(.invalidAddress)
|
|
}
|
|
}
|
|
|
|
private static func appendPortIssue(
|
|
_ port: Int, to issues: inout [LeafInvalidationReason]
|
|
) {
|
|
if !(1...65_535).contains(port) { issues.append(.invalidPort(port)) }
|
|
}
|
|
|
|
private static func appendMethodIssue(
|
|
_ method: String, to issues: inout [LeafInvalidationReason]
|
|
) {
|
|
let trimmed = method.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
if trimmed.isEmpty {
|
|
issues.append(.missingEncryptionMethod)
|
|
} else if !EncryptionMethodCatalog.isSupported(trimmed) {
|
|
issues.append(.unsupportedEncryptionMethod(trimmed))
|
|
}
|
|
}
|
|
|
|
private static func appendCredentialIssue(
|
|
_ reference: CredentialReference,
|
|
credentials: CredentialStoring,
|
|
to issues: inout [LeafInvalidationReason]
|
|
) {
|
|
if case .failure(let issue) = resolveCredential(reference, credentials: credentials) {
|
|
issues.append(issue)
|
|
}
|
|
}
|
|
|
|
private static func appendPluginIssues(
|
|
_ fields: ServerFields,
|
|
credentials: CredentialStoring,
|
|
plugins: PluginExecutableResolving,
|
|
to issues: inout [LeafInvalidationReason]
|
|
) {
|
|
guard let program = fields.pluginProgram else { return }
|
|
if plugins.executablePath(forProgram: program) == nil {
|
|
issues.append(.pluginNotProvided(program: program))
|
|
}
|
|
if let optionsRef = fields.pluginOptionsRef {
|
|
appendCredentialIssue(optionsRef, credentials: credentials, to: &issues)
|
|
}
|
|
}
|
|
|
|
private static func resolveCredential(
|
|
_ reference: CredentialReference,
|
|
credentials: CredentialStoring
|
|
) -> Result<String, LeafInvalidationReason> {
|
|
do {
|
|
guard let secret = try credentials.secret(for: reference), !secret.isEmpty else {
|
|
return .failure(.credentialUnresolved(reference))
|
|
}
|
|
return .success(secret)
|
|
} catch {
|
|
return .failure(.credentialReadFailed(reference))
|
|
}
|
|
}
|
|
}
|