Alawn/ShadowsocksX-NG
1
0
Fork 0
mirror of https://github.com/shadowsocks/ShadowsocksX-NG.git synced 2026-10-29 05:33:45 +00:00
Code Releases Activity

fix(sip008): emit UUID identifiers in lowercase

Browse Source
This commit is contained in:
Qiu Yuzhou
2026-10-28 18:28:58 +08:00
parent 9ccee1fc53
commit b1b9fcfd37
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ShadowsocksX-NG2/App/Application/CatalogWorkflow/CatalogWorkflow+GroupExport.swift
+4 -4
View File
@@ -182,19 +182,19 @@ private struct SIP008ExportIdentity {
private static let namespace = UUID(uuidString: "0d89e9f8-8f0e-4a55-941a-77d61736eaa3")!
func groupID(for nodeID: NodeID) -> String {
Self.version5(name: "group:\(nodeID.rawValue)").uuidString
Self.version5(name: "group:\(nodeID.rawValue)").uuidString.lowercased()
}
func serverID(for entry: CatalogEntry) -> String {
if entry.source == .manual, let id = UUID(uuidString: entry.id.rawValue) {
return id.uuidString
return id.uuidString.lowercased()
}
if entry.source == .subscription,
let providerID = subscriptionServerID(entry.id), let id = UUID(uuidString: providerID)
{
return id.uuidString
return id.uuidString.lowercased()
}
return Self.version5(name: "server:\(entry.id.rawValue)").uuidString
return Self.version5(name: "server:\(entry.id.rawValue)").uuidString.lowercased()
}
private func subscriptionServerID(_ nodeID: NodeID) -> String? {
ShadowsocksX-NG2/Domain/Catalog/NodeIdentity.swift
+1 -1
View File
@@ -15,7 +15,7 @@ struct NodeID: Hashable, Codable, Sendable {
init(rawValue: String) { self.rawValue = rawValue }
/// 手动新建节点身份。
static func fresh() -> NodeID { NodeID(rawValue: UUID().uuidString) }
static func fresh() -> NodeID { NodeID(rawValue: UUID().uuidString.lowercased()) }
init(from decoder: Decoder) throws {
rawValue = try decoder.singleValueContainer().decode(String.self)
ShadowsocksX-NG2/Tests/Catalog/ConfigurationGroupExportTests.swift
+3 -3
View File
@@ -104,9 +104,9 @@ final class ConfigurationGroupExportTests: XCTestCase {
let rootIDs = rootServers.compactMap { $0["id"] as? String }
let nestedIDs = nestedServers.compactMap { $0["id"] as? String }
XCTAssertEqual(rootIDs[0], providerID.uppercased())
XCTAssertEqual(rootIDs[1], nestedProviderID.uppercased())
XCTAssertEqual(nestedIDs, [nestedProviderID.uppercased()])
XCTAssertEqual(rootIDs[0], providerID)
XCTAssertEqual(rootIDs[1], nestedProviderID)
XCTAssertEqual(nestedIDs, [nestedProviderID])
let repeatedRootIDs = try jsonServers(in: repeatedRootDraft).compactMap { $0["id"] as? String }
XCTAssertEqual(rootIDs[2], repeatedRootIDs[2], "无 provider UUID 的服务器身份稳定")
XCTAssertNotNil(UUID(uuidString: try XCTUnwrap(rootIDs[2])))