cj-tauri 2.3.1 → 2.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/cj-tauri.js +20 -4
- package/cjpm.toml +1 -1
- package/cli/cjpm.toml +1 -1
- package/cli/src/main.cj +8 -0
- package/cli/src/project.cj +25 -6
- package/cli/src/scaffold.cj +5 -1
- package/cli/src/sign_agc.cj +386 -0
- package/cli/src/sign_auto.cj +592 -0
- package/cli/src/sign_cloud.cj +724 -0
- package/cli/src/sign_cmd.cj +444 -0
- package/cli/src/sign_gcm.cj +703 -0
- package/cli/src/sign_login.cj +602 -0
- package/cli/src/sign_offline.cj +1183 -0
- package/cli/src/sign_test.cj +298 -0
- package/cli/src/sign_tool.cj +235 -0
- package/cli/src/sync.cj +94 -22
- package/cli/src/util.cj +26 -1
- package/cli/src/util_path_test.cj +72 -0
- package/cli/templates/app/README.md +1 -0
- package/cli/templates/app-react/README.md +1 -0
- package/cli/templates/app-vue/README.md +1 -0
- package/cli/templates/ohos-skeleton/README.md +19 -1
- package/cli/templates/ohos-skeleton/build-hap.bat +219 -0
- package/package.json +1 -1
- package/src/host_arkweb.cj +10 -0
- package/src/version.cj +1 -1
|
@@ -0,0 +1,592 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `cj-tauri sign --auto` 编排:登录令牌 → 团队 → 设备 → 本地密钥/CSR → 云端证书 →
|
|
3
|
+
* profile → 口令加密 → 写回 build-profile.json5。
|
|
4
|
+
*
|
|
5
|
+
* 七步每步失败都带步骤号与人话原因(跑完了但不知道哪步没做,比失败更糟)。
|
|
6
|
+
* 私钥永不上云:本地生成密钥对与 CSR,再拿 CSR 去 AGC 换证书。
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
package cli
|
|
10
|
+
|
|
11
|
+
import std.collection.*
|
|
12
|
+
import std.fs.*
|
|
13
|
+
import stdx.encoding.json.*
|
|
14
|
+
|
|
15
|
+
/** 编排结果 */
|
|
16
|
+
public class AutoSignOutcome {
|
|
17
|
+
public var ok: Bool = false
|
|
18
|
+
/** 逐步日志(一行一步) */
|
|
19
|
+
public var steps: ArrayList<String> = ArrayList<String>()
|
|
20
|
+
public var error: String = ""
|
|
21
|
+
public var teamId: String = ""
|
|
22
|
+
public var certName: String = ""
|
|
23
|
+
public var certId: String = ""
|
|
24
|
+
public var p12Path: String = ""
|
|
25
|
+
public var csrPath: String = ""
|
|
26
|
+
public var cerPath: String = ""
|
|
27
|
+
public var p7bPath: String = ""
|
|
28
|
+
public var buildProfile: String = ""
|
|
29
|
+
public var backup: String = ""
|
|
30
|
+
/** 是否本次新生成了密钥(false = 复用本地已有 p12) */
|
|
31
|
+
public var generatedKeys: Bool = false
|
|
32
|
+
/** 口令长度(只回长度,绝不回明文) */
|
|
33
|
+
public var passwordLen: Int64 = 0
|
|
34
|
+
|
|
35
|
+
public func add(s: String): Unit {
|
|
36
|
+
this.steps.add(s)
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
public func toJson(): JsonObject {
|
|
40
|
+
var o = JsonObject()
|
|
41
|
+
o.put("ok", JsonBool(this.ok))
|
|
42
|
+
o.put("error", JsonString(this.error))
|
|
43
|
+
var arr = JsonArray()
|
|
44
|
+
for (s in this.steps) {
|
|
45
|
+
arr.add(JsonString(s))
|
|
46
|
+
}
|
|
47
|
+
o.put("steps", arr)
|
|
48
|
+
o.put("teamId", JsonString(this.teamId))
|
|
49
|
+
o.put("certName", JsonString(this.certName))
|
|
50
|
+
o.put("certId", JsonString(this.certId))
|
|
51
|
+
o.put("p12", JsonString(this.p12Path))
|
|
52
|
+
o.put("csr", JsonString(this.csrPath))
|
|
53
|
+
o.put("cer", JsonString(this.cerPath))
|
|
54
|
+
o.put("p7b", JsonString(this.p7bPath))
|
|
55
|
+
o.put("buildProfile", JsonString(this.buildProfile))
|
|
56
|
+
o.put("backup", JsonString(this.backup))
|
|
57
|
+
o.put("generatedKeys", JsonBool(this.generatedKeys))
|
|
58
|
+
o.put("passwordLen", JsonInt(this.passwordLen))
|
|
59
|
+
return o
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** 一次自动签名的输入 */
|
|
64
|
+
public class AutoSignInput {
|
|
65
|
+
/** ~/.ohos/config */
|
|
66
|
+
public var configDir: String = ""
|
|
67
|
+
/** product 名(通常是 default) */
|
|
68
|
+
public var product: String = "default"
|
|
69
|
+
/** DevEco 眼中的"工程根"(前向斜杠由内部归一) */
|
|
70
|
+
public var projectRoot: String = ""
|
|
71
|
+
/** 工程的 bundleName(AppScope/app.json5) */
|
|
72
|
+
public var bundleName: String = ""
|
|
73
|
+
/** 工程 build-profile.json5 路径 */
|
|
74
|
+
public var buildProfile: String = ""
|
|
75
|
+
/** 本机 UDID(大写) */
|
|
76
|
+
public var udid: String = ""
|
|
77
|
+
/** hw_sc.build.os.deviceType 解析出的设备类型码 */
|
|
78
|
+
public var deviceType: String = "4"
|
|
79
|
+
/** 云端 profile 是否保留(默认 false:下载完就删,省配额) */
|
|
80
|
+
public var keepProvision: Bool = false
|
|
81
|
+
/**
|
|
82
|
+
* 丢弃本地旧材料、重新生成密钥对(并把云端那张同名证书换成绑新公钥的)。
|
|
83
|
+
* 材料是拷来的 / material/ 重建过时,.p12 的口令没人知道(密文解不开)→
|
|
84
|
+
* hvigor 报 00303242,这时唯一干净的路是换一套自己能掌握口令的材料。
|
|
85
|
+
*/
|
|
86
|
+
public var forceNewKeys: Bool = false
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/** 读现有 build-profile 里的两段口令密文(复用旧 p12 时沿用) */
|
|
90
|
+
func signExistingCiphertexts(buildProfile: String): (String, String) {
|
|
91
|
+
if (buildProfile == "" || !exists(Path(buildProfile))) {
|
|
92
|
+
return ("", "")
|
|
93
|
+
}
|
|
94
|
+
try {
|
|
95
|
+
let m = signingMaterialOf(String.fromUtf8(File.readFrom(buildProfile)))
|
|
96
|
+
return (m.storePassword, m.keyPassword)
|
|
97
|
+
} catch (e: Exception) {
|
|
98
|
+
let _ = e
|
|
99
|
+
return ("", "")
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/** 把材料写回 build-profile.json5(先留 .bak) */
|
|
104
|
+
func signWriteBack(out: AutoSignOutcome, inp: AutoSignInput, m: SigningMaterial): AutoSignOutcome {
|
|
105
|
+
if (inp.buildProfile == "" || !exists(Path(inp.buildProfile))) {
|
|
106
|
+
out.error = "⑦ 找不到 build-profile.json5(${inp.buildProfile})"
|
|
107
|
+
return out
|
|
108
|
+
}
|
|
109
|
+
out.buildProfile = inp.buildProfile
|
|
110
|
+
try {
|
|
111
|
+
let origin = String.fromUtf8(File.readFrom(inp.buildProfile))
|
|
112
|
+
// 已有配置:同一套材料(同一个 .p12)就地更新(.p7b/.cer 会因证书换发而变);
|
|
113
|
+
// 别的材料一律不动,报错让人决定
|
|
114
|
+
let (newText, err) = if (parseProjSigning(origin).hasSigningConfigs) {
|
|
115
|
+
replaceOwnSigningConfigs(origin, m)
|
|
116
|
+
} else {
|
|
117
|
+
applySigningConfig(origin, m)
|
|
118
|
+
}
|
|
119
|
+
if (err != "") {
|
|
120
|
+
out.error = "⑦ 写回失败:${err}"
|
|
121
|
+
return out
|
|
122
|
+
}
|
|
123
|
+
let bak = "${inp.buildProfile}.cj-tauri-autosign.bak"
|
|
124
|
+
File.writeTo(bak, origin.toArray())
|
|
125
|
+
File.writeTo(inp.buildProfile, newText.toArray())
|
|
126
|
+
out.backup = bak
|
|
127
|
+
out.add("⑦ 已写回 signingConfigs(备份:${bak})")
|
|
128
|
+
out.ok = true
|
|
129
|
+
return out
|
|
130
|
+
} catch (e: Exception) {
|
|
131
|
+
out.error = "⑦ 写盘失败:${e}"
|
|
132
|
+
return out
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* 让本地 .cer 与刚下载的 profile 里的开发证书是同一张(证书以云端为准,本地 .cer 只是缓存)。
|
|
138
|
+
* 不一致时按 certObjectId 重下一次(旧文件改名留底),再核一次;重下仍不一致说明
|
|
139
|
+
* 云端那张证书不是当前 .p12 这把钥匙签的,只能 --newKeys。
|
|
140
|
+
*/
|
|
141
|
+
func signEnsureCerMatchesProfile(out: AutoSignOutcome, token: AgcLoginOutcome, teamId: String,
|
|
142
|
+
cert: AgcCert): (Bool, String) {
|
|
143
|
+
var cerText = ""
|
|
144
|
+
try {
|
|
145
|
+
if (exists(Path(out.cerPath))) {
|
|
146
|
+
cerText = String.fromUtf8(File.readFrom(out.cerPath))
|
|
147
|
+
}
|
|
148
|
+
} catch (e: Exception) {
|
|
149
|
+
return (false, "读本地证书失败:${e}")
|
|
150
|
+
}
|
|
151
|
+
if (cerText == "") {
|
|
152
|
+
return (false, "本地没有证书文件(${out.cerPath})")
|
|
153
|
+
}
|
|
154
|
+
var devPem = ""
|
|
155
|
+
try {
|
|
156
|
+
if (exists(Path(out.p7bPath))) {
|
|
157
|
+
devPem = signProfileDevCertPemOf(extractProfileJson(String.fromUtf8(File.readFrom(out.p7bPath))))
|
|
158
|
+
}
|
|
159
|
+
} catch (e: Exception) {
|
|
160
|
+
let _ = e
|
|
161
|
+
devPem = ""
|
|
162
|
+
}
|
|
163
|
+
if (devPem == "") {
|
|
164
|
+
// 读不出就不拦:证书格式一变更不该让整条链全红(宁可真机那一步再说话)
|
|
165
|
+
return (true, "profile 里读不出开发证书,跳过证书一致性自检")
|
|
166
|
+
}
|
|
167
|
+
if (signCerHasCertOf(cerText, devPem)) {
|
|
168
|
+
return (true, "本地 .cer 与 profile 是同一张开发证书")
|
|
169
|
+
}
|
|
170
|
+
let bak = "${out.cerPath}.cj-tauri-stale-${signNowMs()}"
|
|
171
|
+
try {
|
|
172
|
+
File.writeTo(bak, cerText.toArray())
|
|
173
|
+
} catch (e: Exception) {
|
|
174
|
+
return (false, "备份旧证书失败:${e}")
|
|
175
|
+
}
|
|
176
|
+
let objectRef = if (cert.certObjectId != "") { cert.certObjectId } else { cert.id }
|
|
177
|
+
let (saved, dlErr) = agcDownloadObject(token.accessToken, token.userId, teamId, objectRef,
|
|
178
|
+
out.cerPath)
|
|
179
|
+
if (dlErr != "") {
|
|
180
|
+
return (false, "本地 .cer 是旧证书且重下失败(${dlErr})——装到真机会被 9568322 拒")
|
|
181
|
+
}
|
|
182
|
+
var fresh = ""
|
|
183
|
+
try {
|
|
184
|
+
fresh = String.fromUtf8(File.readFrom(out.cerPath))
|
|
185
|
+
} catch (e: Exception) {
|
|
186
|
+
return (false, "重下后读不出证书:${e}")
|
|
187
|
+
}
|
|
188
|
+
if (!signCerHasCertOf(fresh, devPem)) {
|
|
189
|
+
return (false, "本地 .cer 与 profile 不是同一张证书,重下后仍不一致(旧文件已备份到 ${bak})——" +
|
|
190
|
+
"云端那张证书不是当前 .p12 这把钥匙签的,用 `sign --auto --newKeys` 重生成密钥对再签")
|
|
191
|
+
}
|
|
192
|
+
return (true, "本地 .cer 是旧证书,已按云端重下:${saved}")
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
/**
|
|
196
|
+
* 抽出 PEM 文本里所有证书块并规范化(去掉换行与行内空白)。
|
|
197
|
+
* 同一张证书在不同文件里换行位置可能不同,直接字符串比较会假红;
|
|
198
|
+
* 而 .cer 是一条链(顺序是 根 → 中间 → 开发者),只谈"链里有没有这张"。
|
|
199
|
+
*/
|
|
200
|
+
public func signPemCertBlocksOf(text: String): ArrayList<String> {
|
|
201
|
+
let blocks = ArrayList<String>()
|
|
202
|
+
let begin = "-----BEGIN CERTIFICATE-----"
|
|
203
|
+
let endMark = "-----END CERTIFICATE-----"
|
|
204
|
+
var from: Int64 = 0
|
|
205
|
+
var go = true
|
|
206
|
+
while (go) {
|
|
207
|
+
match (text.indexOf(begin, from)) {
|
|
208
|
+
case Some(s) =>
|
|
209
|
+
match (text.indexOf(endMark, s + begin.size)) {
|
|
210
|
+
case Some(e) =>
|
|
211
|
+
let norm = signSquashWhitespaceOf(text[(s + begin.size)..e])
|
|
212
|
+
if (norm != "") {
|
|
213
|
+
blocks.add(norm)
|
|
214
|
+
}
|
|
215
|
+
from = e + endMark.size
|
|
216
|
+
case None => go = false
|
|
217
|
+
}
|
|
218
|
+
case None => go = false
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
return blocks
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/** 去掉所有空白字节,用于证书正文比较 */
|
|
225
|
+
func signSquashWhitespaceOf(s: String): String {
|
|
226
|
+
let bytes = s.toArray()
|
|
227
|
+
let acc = ArrayList<Byte>()
|
|
228
|
+
for (b in bytes) {
|
|
229
|
+
if (b == 32 || b == 9 || b == 10 || b == 13) {
|
|
230
|
+
continue
|
|
231
|
+
}
|
|
232
|
+
acc.add(b)
|
|
233
|
+
}
|
|
234
|
+
return String.fromUtf8(acc.toArray())
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
/**
|
|
238
|
+
* 取 profile JSON 里 bundle-info.development-certificate 的证书正文(已规范化)。
|
|
239
|
+
* profile 里的证书是一行带 \n 转义的长 base64;取值后必须交回 signPemCertBlocksOf
|
|
240
|
+
* 再解析一次,否则一边是链里的块体、一边是带 BEGIN/END 标记的整段,比较口径不一致。
|
|
241
|
+
*/
|
|
242
|
+
public func signProfileDevCertPemOf(profileJson: String): String {
|
|
243
|
+
let key = "\"development-certificate\""
|
|
244
|
+
match (profileJson.indexOf(key)) {
|
|
245
|
+
case Some(k) =>
|
|
246
|
+
match (profileJson.indexOf("\"", k + key.size)) {
|
|
247
|
+
case Some(q) =>
|
|
248
|
+
let bytes = profileJson.toArray()
|
|
249
|
+
let acc = ArrayList<Byte>()
|
|
250
|
+
var i = q + 1
|
|
251
|
+
var esc = false
|
|
252
|
+
while (i < bytes.size) {
|
|
253
|
+
let c = bytes[i]
|
|
254
|
+
if (esc) {
|
|
255
|
+
esc = false
|
|
256
|
+
// \n / \r / \t 还原成真空白;其余转义保留字符本身
|
|
257
|
+
if (c == 110) {
|
|
258
|
+
acc.add(10)
|
|
259
|
+
} else if (c == 114) {
|
|
260
|
+
acc.add(13)
|
|
261
|
+
} else if (c == 116) {
|
|
262
|
+
acc.add(9)
|
|
263
|
+
} else {
|
|
264
|
+
acc.add(c)
|
|
265
|
+
}
|
|
266
|
+
} else if (c == 92) {
|
|
267
|
+
esc = true
|
|
268
|
+
} else if (c == 34) {
|
|
269
|
+
break
|
|
270
|
+
} else {
|
|
271
|
+
acc.add(c)
|
|
272
|
+
}
|
|
273
|
+
i++
|
|
274
|
+
}
|
|
275
|
+
let blocks = signPemCertBlocksOf(String.fromUtf8(acc.toArray()))
|
|
276
|
+
if (blocks.size == 0) {
|
|
277
|
+
return ""
|
|
278
|
+
}
|
|
279
|
+
return blocks[0]
|
|
280
|
+
case None => return ""
|
|
281
|
+
}
|
|
282
|
+
case None => return ""
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
/** 本地 .cer(证书链)里是否含这张证书(纯函数) */
|
|
287
|
+
public func signCerHasCertOf(cerText: String, pem: String): Bool {
|
|
288
|
+
if (pem == "") {
|
|
289
|
+
return false
|
|
290
|
+
}
|
|
291
|
+
for (b in signPemCertBlocksOf(cerText)) {
|
|
292
|
+
if (b == pem) {
|
|
293
|
+
return true
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
return false
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
/**
|
|
300
|
+
* 跑完整条编排(需要已登录的令牌)。
|
|
301
|
+
* token 里必须带 accessToken / userId(teamId 缺时这里会重新拉)。
|
|
302
|
+
*/
|
|
303
|
+
public func autoSign(inp: AutoSignInput, token: AgcLoginOutcome): AutoSignOutcome {
|
|
304
|
+
let out = AutoSignOutcome()
|
|
305
|
+
// ---------------- ① 令牌 ----------------
|
|
306
|
+
if (token.accessToken == "" || token.userId == "") {
|
|
307
|
+
out.error = "没有可用的登录令牌:先跑 `cj-tauri sign --login` 完成一次浏览器授权"
|
|
308
|
+
return out
|
|
309
|
+
}
|
|
310
|
+
var teamId = token.teamId
|
|
311
|
+
if (teamId == "") {
|
|
312
|
+
// UDID 可能注册在非默认团队里:profile 按团队签发,必须选对团队。
|
|
313
|
+
// 先逐团队查设备列表,挑含本机 UDID 的;都不含再用第一个团队去注册。
|
|
314
|
+
let (teams, tErr) = agcTeamListAll(token.accessToken, token.userId)
|
|
315
|
+
if (tErr != "") {
|
|
316
|
+
out.error = "拉团队列表失败(token 可能已失效,重跑 `cj-tauri sign --login`):${tErr}"
|
|
317
|
+
return out
|
|
318
|
+
}
|
|
319
|
+
if (teams.size == 0) {
|
|
320
|
+
out.error = "账号下没有团队"
|
|
321
|
+
return out
|
|
322
|
+
}
|
|
323
|
+
var picked: Option<AgcTeam> = None
|
|
324
|
+
for (t in teams) {
|
|
325
|
+
let (devices, _) = agcDeviceList(token.accessToken, token.userId, t.id)
|
|
326
|
+
if (deviceRegistered(devices, inp.udid)) {
|
|
327
|
+
picked = Some(t)
|
|
328
|
+
out.add("② 团队:设备已注册在 ${t.name}(${t.id}),用它签")
|
|
329
|
+
break
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
match (picked) {
|
|
333
|
+
case Some(t) =>
|
|
334
|
+
teamId = t.id
|
|
335
|
+
case None =>
|
|
336
|
+
teamId = teams[0].id
|
|
337
|
+
out.add("② 团队:没有任何团队含本机设备,用第一个 ${teams[0].name}(${teamId})去注册")
|
|
338
|
+
}
|
|
339
|
+
} else {
|
|
340
|
+
out.add("② 团队:用令牌里的 ${token.teamName}(${teamId})")
|
|
341
|
+
}
|
|
342
|
+
out.teamId = teamId
|
|
343
|
+
// ---------------- ③ 设备 ----------------
|
|
344
|
+
let (devOK, devMsg) = agcEnsureDevice(token.accessToken, token.userId, teamId, inp.udid,
|
|
345
|
+
inp.deviceType)
|
|
346
|
+
out.add("③ 设备:${devMsg}")
|
|
347
|
+
if (!devOK) {
|
|
348
|
+
out.error = devMsg
|
|
349
|
+
return out
|
|
350
|
+
}
|
|
351
|
+
// ---------------- ④ 材料命名与本地密钥 ----------------
|
|
352
|
+
let base = signingFileBaseName(inp.product, inp.projectRoot)
|
|
353
|
+
// 四种材料同一个前缀(<base>=):后面凡是拼路径都必须走它,
|
|
354
|
+
// 手抄模板漏掉那个 = 就会得到"看着像、其实不存在"的路径。
|
|
355
|
+
let matPrefix = "${inp.configDir}/${base}="
|
|
356
|
+
out.p12Path = "${matPrefix}.p12"
|
|
357
|
+
out.csrPath = "${matPrefix}.csr"
|
|
358
|
+
out.cerPath = "${matPrefix}.cer"
|
|
359
|
+
out.p7bPath = "${matPrefix}.p7b"
|
|
360
|
+
out.add("④ 材料路径(DevEco 同名规则):${base}=.{p12,csr,cer,p7b}")
|
|
361
|
+
// java / hap-sign-tool 位置(只在需要生成/申请证书时用)
|
|
362
|
+
let javaHome = signEnvOf("JAVA_HOME")
|
|
363
|
+
let devecoHome = signFirstExistingEnv(["DEVECO_HOME", "DEVECO_SDK_HOME"])
|
|
364
|
+
let sdkHome = signFirstExistingEnv(["DEVECO_SDK_HOME", "OHOS_HOME"])
|
|
365
|
+
// DEVECO_SDK_HOME 没设时按 DEVECO_HOME/sdk 推导(DevEco 6.x 的实际布局)
|
|
366
|
+
var jarHome = sdkHome
|
|
367
|
+
if (jarHome == "" && devecoHome != "") {
|
|
368
|
+
let guess = signHostPathOf("${devecoHome}/sdk")
|
|
369
|
+
if (exists(Path(guess))) {
|
|
370
|
+
jarHome = guess
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
let javaPath = signJavaCandidates(javaHome, devecoHome)
|
|
374
|
+
var javaExe = signFirstExisting(javaPath)
|
|
375
|
+
if (javaExe == "") {
|
|
376
|
+
javaExe = "java" // 交给 PATH,失败会在 signRunSignTool 里带回错误
|
|
377
|
+
}
|
|
378
|
+
let jar = signFirstExisting(signHapSignToolCandidates(jarHome))
|
|
379
|
+
var password = ""
|
|
380
|
+
// 先把旧材料挪开(改名不删:私钥不可再生,留一份可回退)
|
|
381
|
+
if (inp.forceNewKeys) {
|
|
382
|
+
for (suffix in [".p12", ".csr", ".cer", ".p7b"]) {
|
|
383
|
+
let p = matPrefix + suffix
|
|
384
|
+
if (!exists(Path(p))) {
|
|
385
|
+
continue
|
|
386
|
+
}
|
|
387
|
+
let dst = "${p}.cj-tauri-bak-${signNowMs()}"
|
|
388
|
+
try {
|
|
389
|
+
File.writeTo(dst, File.readFrom(p))
|
|
390
|
+
remove(Path(p))
|
|
391
|
+
out.add("④ 旧材料已改名留底:${signFileNameOf(dst)}")
|
|
392
|
+
} catch (e: Exception) {
|
|
393
|
+
out.error = "④ 挪开旧材料失败(${p}):${e}"
|
|
394
|
+
return out
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
if (!exists(Path(out.p12Path))) {
|
|
399
|
+
if (jar == "") {
|
|
400
|
+
out.error = "本地没有 ${out.p12Path},且找不到 hap-sign-tool.jar(设 DEVECO_SDK_HOME)"
|
|
401
|
+
return out
|
|
402
|
+
}
|
|
403
|
+
password = randomPasswordAlnum()
|
|
404
|
+
let kp = signGenKeypair(javaExe, jar, out.p12Path, password, signTempDir())
|
|
405
|
+
if (!kp.ok) {
|
|
406
|
+
out.error = "④ 生成密钥对失败:${kp.error}"
|
|
407
|
+
return out
|
|
408
|
+
}
|
|
409
|
+
out.generatedKeys = true
|
|
410
|
+
out.passwordLen = Int64(password.size)
|
|
411
|
+
out.add("④ 生成密钥对:${out.p12Path}(口令 ${password.size} 位,未落日志)")
|
|
412
|
+
let csr = signGenCsr(javaExe, jar, out.p12Path, password, out.csrPath, signTempDir())
|
|
413
|
+
if (!csr.ok) {
|
|
414
|
+
out.error = "④ 生成 CSR 失败:${csr.error}"
|
|
415
|
+
return out
|
|
416
|
+
}
|
|
417
|
+
out.add("④ 生成 CSR:${out.csrPath}")
|
|
418
|
+
} else {
|
|
419
|
+
out.add("④ 复用本地已有密钥:${out.p12Path}")
|
|
420
|
+
}
|
|
421
|
+
// ---------------- ⑤ 证书 ----------------
|
|
422
|
+
let certName = certNameFor(teamId)
|
|
423
|
+
out.certName = certName
|
|
424
|
+
let (certs, certErr) = agcCertList(token.accessToken, token.userId, teamId)
|
|
425
|
+
if (certErr != "") {
|
|
426
|
+
out.error = "⑤ ${certErr}"
|
|
427
|
+
return out
|
|
428
|
+
}
|
|
429
|
+
out.add("⑤ 云端已有证书 ${certs.size} 张,按名字找 ${certName}")
|
|
430
|
+
var cert = AgcCert()
|
|
431
|
+
// 新建证书时必须重下本地 .cer:本地那份对应的是旧证书(多半已过期)
|
|
432
|
+
var freshCert = false
|
|
433
|
+
// 刚生成了新密钥对 → 云端那张同名证书绑的是旧公钥,必须换一张
|
|
434
|
+
if (out.generatedKeys) {
|
|
435
|
+
match (findCertByName(certs, certName)) {
|
|
436
|
+
case Some(old) =>
|
|
437
|
+
let oldIds = ArrayList<String>()
|
|
438
|
+
oldIds.add(old.id)
|
|
439
|
+
let (delOK, delNote) = agcCertDelete(token.accessToken, token.userId, teamId, oldIds)
|
|
440
|
+
out.add("⑤ 旧证书绑的是旧密钥,先换掉:${delNote}")
|
|
441
|
+
if (!delOK) {
|
|
442
|
+
out.error = "⑤ ${delNote}"
|
|
443
|
+
return out
|
|
444
|
+
}
|
|
445
|
+
case None => ()
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
var reusable: Option<AgcCert> = None
|
|
449
|
+
if (!out.generatedKeys) {
|
|
450
|
+
reusable = findUsableCert(certs, certName)
|
|
451
|
+
}
|
|
452
|
+
match (reusable) {
|
|
453
|
+
case Some(c) =>
|
|
454
|
+
cert = c
|
|
455
|
+
out.add("⑤ 复用证书:${certName}(id=${cert.id})")
|
|
456
|
+
case None =>
|
|
457
|
+
if (!exists(Path(out.csrPath))) {
|
|
458
|
+
out.error = "⑤ 云端没有可用的 ${certName},本地也没有 CSR 可用来新建(删掉 p12 让它重生)"
|
|
459
|
+
return out
|
|
460
|
+
}
|
|
461
|
+
var csrText = ""
|
|
462
|
+
try {
|
|
463
|
+
csrText = String.fromUtf8(File.readFrom(out.csrPath))
|
|
464
|
+
} catch (e: Exception) {
|
|
465
|
+
out.error = "⑤ 读 CSR 失败:${e}"
|
|
466
|
+
return out
|
|
467
|
+
}
|
|
468
|
+
// AGC 证书数量有上限,过期的照样占位 → 先把自己的过期自动签名证书删掉腾位置
|
|
469
|
+
let stale = staleCertsOf(certs)
|
|
470
|
+
if (stale.size > 0) {
|
|
471
|
+
let ids = ArrayList<String>()
|
|
472
|
+
for (s in stale) {
|
|
473
|
+
ids.add(s.id)
|
|
474
|
+
out.add("⑤ 过期证书占位:${s.certName}(id=${s.id},到期 ${s.expireMs})")
|
|
475
|
+
}
|
|
476
|
+
let (ok, note) = agcCertDelete(token.accessToken, token.userId, teamId, ids)
|
|
477
|
+
out.add("⑤ ${note}")
|
|
478
|
+
if (!ok) {
|
|
479
|
+
out.error = "⑤ ${note}(可以登录 AGC 控制台手动删除过期证书后重试)"
|
|
480
|
+
return out
|
|
481
|
+
}
|
|
482
|
+
}
|
|
483
|
+
let (newCert, addErr) = agcCertAdd(token.accessToken, token.userId, teamId, csrText,
|
|
484
|
+
certName, "1") // 1 = debug 证书
|
|
485
|
+
if (addErr != "") {
|
|
486
|
+
out.error = "⑤ ${addErr}"
|
|
487
|
+
return out
|
|
488
|
+
}
|
|
489
|
+
cert = newCert
|
|
490
|
+
freshCert = true
|
|
491
|
+
out.add("⑤ 新建证书:${certName}(id=${cert.id})")
|
|
492
|
+
}
|
|
493
|
+
out.certId = cert.id
|
|
494
|
+
out.add("⑤ 证书对象:id=${cert.id} objectId=${cert.certObjectId}")
|
|
495
|
+
if (cert.id == "") {
|
|
496
|
+
out.error = "⑤ 证书没有 id,无法申请 profile"
|
|
497
|
+
return out
|
|
498
|
+
}
|
|
499
|
+
// 本地 .cer:没有(或刚换了新证书)就按 certObjectId 下载
|
|
500
|
+
if (freshCert || !exists(Path(out.cerPath))) {
|
|
501
|
+
let objectRef = if (cert.certObjectId != "") { cert.certObjectId } else { cert.id }
|
|
502
|
+
let (saved, dlErr) = agcDownloadObject(token.accessToken, token.userId, teamId, objectRef,
|
|
503
|
+
out.cerPath)
|
|
504
|
+
if (dlErr != "") {
|
|
505
|
+
out.error = "⑤ 下载证书失败:${dlErr}"
|
|
506
|
+
return out
|
|
507
|
+
}
|
|
508
|
+
out.add("⑤ 下载证书:${saved}")
|
|
509
|
+
} else {
|
|
510
|
+
out.add("⑤ 复用本地证书文件:${out.cerPath}")
|
|
511
|
+
}
|
|
512
|
+
// ---------------- ⑥ profile ----------------
|
|
513
|
+
// deviceList 要的是云端设备 id(不是 UDID):UDID 是 64 位十六进制,
|
|
514
|
+
// AGC 对元素长度有限制(≤32),直接传 UDID 会被拒(实测踩到)
|
|
515
|
+
let (cloudDevices, devErr) = agcDeviceList(token.accessToken, token.userId, teamId)
|
|
516
|
+
if (devErr != "") {
|
|
517
|
+
out.error = "⑥ 拉设备列表失败:${devErr}"
|
|
518
|
+
return out
|
|
519
|
+
}
|
|
520
|
+
let deviceIds = ArrayList<String>()
|
|
521
|
+
for (d in cloudDevices) {
|
|
522
|
+
if (d.id != "") {
|
|
523
|
+
deviceIds.add(d.id)
|
|
524
|
+
}
|
|
525
|
+
}
|
|
526
|
+
if (deviceIds.size == 0) {
|
|
527
|
+
out.error = "⑥ 云端没有已注册设备(先跑设备注册,或检查 UDID 是否在团队里)"
|
|
528
|
+
return out
|
|
529
|
+
}
|
|
530
|
+
out.add("⑥ 云端设备 id ${deviceIds.size} 个(用它申请 profile,不是 UDID)")
|
|
531
|
+
let (p7b, provNote) = agcProvisionDebug(token.accessToken, token.userId, teamId, cert.id,
|
|
532
|
+
inp.bundleName, inp.product, deviceIds, ArrayList<String>(), out.p7bPath)
|
|
533
|
+
if (p7b == "") {
|
|
534
|
+
out.error = "⑥ ${provNote}"
|
|
535
|
+
return out
|
|
536
|
+
}
|
|
537
|
+
out.add("⑥ profile:${provNote}")
|
|
538
|
+
out.add("⑥ 落盘:${out.p7bPath}")
|
|
539
|
+
// 证书-配置一致性自检:profile 里绑定的开发证书,必须是本地 .cer 里那张
|
|
540
|
+
let (cerOK, cerNote) = signEnsureCerMatchesProfile(out, token, teamId, cert)
|
|
541
|
+
out.add("⑥ ${cerNote}")
|
|
542
|
+
if (!cerOK) {
|
|
543
|
+
out.error = "⑥ ${cerNote}"
|
|
544
|
+
return out
|
|
545
|
+
}
|
|
546
|
+
// ---------------- ⑦ 写 build-profile ----------------
|
|
547
|
+
let (workKey, wkErr) = loadWorkKey(materialDirOfConfig(inp.configDir))
|
|
548
|
+
if (wkErr != "") {
|
|
549
|
+
out.error = "⑦ 读 material/ 失败:${wkErr}"
|
|
550
|
+
return out
|
|
551
|
+
}
|
|
552
|
+
if (password == "") {
|
|
553
|
+
// 复用旧 p12 时拿不到明文口令 → 只能沿用现有密文;没有现有密文就报错
|
|
554
|
+
let (storePwd, keyPwd) = signExistingCiphertexts(inp.buildProfile)
|
|
555
|
+
if (storePwd == "" || keyPwd == "") {
|
|
556
|
+
out.error = "⑦ 复用现有 p12 但工程里没有可沿用的口令密文(删掉 p12 让它重新生成)"
|
|
557
|
+
return out
|
|
558
|
+
}
|
|
559
|
+
let m = SigningMaterial()
|
|
560
|
+
m.storeFile = out.p12Path
|
|
561
|
+
m.certpath = out.cerPath
|
|
562
|
+
m.profile = out.p7bPath
|
|
563
|
+
m.storePassword = storePwd
|
|
564
|
+
m.keyPassword = keyPwd
|
|
565
|
+
return signWriteBack(out, inp, m)
|
|
566
|
+
}
|
|
567
|
+
let (storePwd, e1) = encryptPasswordHex(workKey, password)
|
|
568
|
+
if (e1 != "") {
|
|
569
|
+
out.error = "⑦ 加密 storePassword 失败:${e1}"
|
|
570
|
+
return out
|
|
571
|
+
}
|
|
572
|
+
let (keyPwd, e2) = encryptPasswordHex(workKey, password)
|
|
573
|
+
if (e2 != "") {
|
|
574
|
+
out.error = "⑦ 加密 keyPassword 失败:${e2}"
|
|
575
|
+
return out
|
|
576
|
+
}
|
|
577
|
+
// 写回前自检:刚生成的密文必须能用同一 workKey 解回原口令。写坏的代价很贵——
|
|
578
|
+
// 等下一轮「复用现有 p12」时口令就不可知了(明文只在这一次存在过),而 hvigor 那边
|
|
579
|
+
// 只会报一句签名失败。这里解一遍再对,宁可当场失败。
|
|
580
|
+
let (backPwd, backErr) = decryptPasswordHex(workKey, storePwd)
|
|
581
|
+
if (backErr != "" || backPwd != password) {
|
|
582
|
+
out.error = "⑦ 口令密文自检失败(${backErr}),已中止写回(未改动 build-profile.json5)"
|
|
583
|
+
return out
|
|
584
|
+
}
|
|
585
|
+
let m = SigningMaterial()
|
|
586
|
+
m.storeFile = out.p12Path
|
|
587
|
+
m.certpath = out.cerPath
|
|
588
|
+
m.profile = out.p7bPath
|
|
589
|
+
m.storePassword = storePwd
|
|
590
|
+
m.keyPassword = keyPwd
|
|
591
|
+
return signWriteBack(out, inp, m)
|
|
592
|
+
}
|