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,298 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* sign 模块单测:AES-128-GCM / PBKDF2 向量 + AesGcmKit 载荷 + 纯函数判定。
|
|
3
|
+
* 全部自包含(NIST / RFC 公开向量),不依赖本机材料与网络。
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
package cli
|
|
7
|
+
|
|
8
|
+
import std.collection.*
|
|
9
|
+
import stdx.encoding.json.*
|
|
10
|
+
|
|
11
|
+
// ---------- AES-128-GCM:NIST GCM Test Case 1-4(96bit nonce) ----------
|
|
12
|
+
|
|
13
|
+
func assertBytes(name: String, got: Array<Byte>, want: Array<Byte>): Bool {
|
|
14
|
+
if (got.size != want.size) {
|
|
15
|
+
eprintln("FAIL ${name}: 长度 ${got.size} != ${want.size}")
|
|
16
|
+
return false
|
|
17
|
+
}
|
|
18
|
+
for (i in 0..want.size) {
|
|
19
|
+
if (got[i] != want[i]) {
|
|
20
|
+
eprintln("FAIL ${name}[${i}]: ${got[i]} != ${want[i]}")
|
|
21
|
+
return false
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
eprintln("PASS ${name}")
|
|
25
|
+
return true
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
func hexBytes(s: String): Array<Byte> {
|
|
29
|
+
match (fromHexLower(s)) {
|
|
30
|
+
case Some(b) => return b
|
|
31
|
+
case None => return []
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
func testGcmVectors(): Bool {
|
|
36
|
+
var ok = true
|
|
37
|
+
// TC1: empty plaintext
|
|
38
|
+
let k1 = hexBytes("00000000000000000000000000000000")
|
|
39
|
+
let iv1 = hexBytes("000000000000000000000000")
|
|
40
|
+
let sealed1 = aes128GcmEncrypt(k1, iv1, [], [])
|
|
41
|
+
ok = assertBytes("gcm-tc1(sealed)", sealed1,
|
|
42
|
+
hexBytes("58e2fccefa7e3061367f1d57a4e7455a")) && ok
|
|
43
|
+
// TC2
|
|
44
|
+
let k2 = hexBytes("00000000000000000000000000000000")
|
|
45
|
+
let iv2 = hexBytes("000000000000000000000000")
|
|
46
|
+
let pt2 = hexBytes("00000000000000000000000000000000")
|
|
47
|
+
let sealed2 = aes128GcmEncrypt(k2, iv2, pt2, [])
|
|
48
|
+
ok = assertBytes("gcm-tc2(sealed)", sealed2,
|
|
49
|
+
hexBytes("0388dace60b6a392f328c2b971b2fe78" + "ab6e47d42cec13bdf53a67b21257bddf")) && ok
|
|
50
|
+
// TC2 已覆盖单块;多块明文用 roundtrip 钉住(加密→解密逐字节还原)
|
|
51
|
+
let k4 = hexBytes("feffe9928665731c6d6a8f9467308308")
|
|
52
|
+
let iv4 = hexBytes("cafebabefacedbaddecaf888")
|
|
53
|
+
var pt4 = ArrayList<Byte>()
|
|
54
|
+
for (i in 0..100) {
|
|
55
|
+
pt4.add(UInt8((i * 37 + 11) & 0xFF))
|
|
56
|
+
}
|
|
57
|
+
let sealed4 = aes128GcmEncrypt(k4, iv4, pt4.toArray(), [])
|
|
58
|
+
if (sealed4.size != pt4.size + 16) {
|
|
59
|
+
eprintln("FAIL gcm-multiblock: 输出长度 ${sealed4.size} != ${pt4.size + 16}")
|
|
60
|
+
ok = false
|
|
61
|
+
}
|
|
62
|
+
let dec4 = aes128GcmDecrypt(k4, iv4, sealed4, [])
|
|
63
|
+
ok = assertBytes("gcm-multiblock(roundtrip)", dec4, pt4.toArray()) && ok
|
|
64
|
+
// tag 篡改必须拒绝
|
|
65
|
+
var tampered = sealed4.clone()
|
|
66
|
+
tampered[tampered.size - 1] = tampered[tampered.size - 1] ^ 1
|
|
67
|
+
var rejected = false
|
|
68
|
+
try {
|
|
69
|
+
let _ = aes128GcmDecrypt(k4, iv4, tampered, [])
|
|
70
|
+
} catch (e: Exception) {
|
|
71
|
+
rejected = true
|
|
72
|
+
}
|
|
73
|
+
if (rejected) {
|
|
74
|
+
eprintln("PASS gcm-tamper-rejected")
|
|
75
|
+
} else {
|
|
76
|
+
eprintln("FAIL gcm-tamper-rejected: 篡改后的密文解密没有拒绝")
|
|
77
|
+
ok = false
|
|
78
|
+
}
|
|
79
|
+
return ok
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
// ---------- PBKDF2-HMAC-SHA256:RFC 6070 同族的公开向量(sha256 版) ----------
|
|
83
|
+
|
|
84
|
+
func testPbkdf2(): Bool {
|
|
85
|
+
var ok = true
|
|
86
|
+
// hashlib.pbkdf2_hmac('sha256', b'password', b'salt', 1, 32)
|
|
87
|
+
ok = assertBytes("pbkdf2-c1",
|
|
88
|
+
signPbkdf2HmacSha256("password".toArray(), "salt".toArray(), 1, 32),
|
|
89
|
+
hexBytes("120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be17b")) && ok
|
|
90
|
+
// c=2
|
|
91
|
+
ok = assertBytes("pbkdf2-c2",
|
|
92
|
+
signPbkdf2HmacSha256("password".toArray(), "salt".toArray(), 2, 32),
|
|
93
|
+
hexBytes("ae4d0c95af6b46d32d0adff928f06dd02a303f8ef3c251dfd6e2d85a95474c43")) && ok
|
|
94
|
+
// c=4096
|
|
95
|
+
ok = assertBytes("pbkdf2-c4096",
|
|
96
|
+
signPbkdf2HmacSha256("password".toArray(), "salt".toArray(), 4096, 32),
|
|
97
|
+
hexBytes("c5e478d59288c841aa530db6845c4c8d962893a001ce4e11a4963873aa98134a")) && ok
|
|
98
|
+
return ok
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
// ---------- lossyUtf8:非法序列按 U+FFFD 替换 ----------
|
|
102
|
+
|
|
103
|
+
func testLossyUtf8(): Bool {
|
|
104
|
+
var ok = true
|
|
105
|
+
// 合法序列原样
|
|
106
|
+
ok = assertBytes("lossy-ascii", lossyUtf8Bytes("abc".toArray()), "abc".toArray()) && ok
|
|
107
|
+
// 0xFF 非法 → EF BF BD
|
|
108
|
+
ok = assertBytes("lossy-0xff", lossyUtf8Bytes([0x41, 0xFF, 0x42]),
|
|
109
|
+
[0x41, 0xEF, 0xBF, 0xBD, 0x42]) && ok
|
|
110
|
+
// 截断的多字节序列:引导字节与续字节各产出一个 U+FFFD(与灵渠实测实现逐字节一致——
|
|
111
|
+
// 该实现已在真机 material/ 上验证过 workKey 推导,保真优先,不"聪明修正")
|
|
112
|
+
ok = assertBytes("lossy-truncated", lossyUtf8Bytes([0xE4, 0xB8]),
|
|
113
|
+
[0xEF, 0xBF, 0xBD, 0xEF, 0xBF, 0xBD]) && ok
|
|
114
|
+
return ok
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
// ---------- AesGcmKit 载荷打包 / workKey 口令往返 ----------
|
|
118
|
+
|
|
119
|
+
func testGcmPayloadRoundtrip(): Bool {
|
|
120
|
+
var ok = true
|
|
121
|
+
let workKey = hexBytes("000102030405060708090a0b0c0d0e0f")
|
|
122
|
+
let (hex1, err1) = encryptPasswordHex(workKey, "ab12cd34")
|
|
123
|
+
if (err1 != "") {
|
|
124
|
+
eprintln("FAIL encryptPasswordHex: ${err1}")
|
|
125
|
+
return false
|
|
126
|
+
}
|
|
127
|
+
// 同一口令两次加密结果不同(IV 随机)
|
|
128
|
+
let (hex2, _) = encryptPasswordHex(workKey, "ab12cd34")
|
|
129
|
+
if (hex1 == hex2) {
|
|
130
|
+
eprintln("FAIL gcm-payload: 同一口令两次加密结果相同(IV 应随机)")
|
|
131
|
+
ok = false
|
|
132
|
+
}
|
|
133
|
+
// 都能解回明文
|
|
134
|
+
let (plain1, errD1) = decryptPasswordHex(workKey, hex1)
|
|
135
|
+
let (plain2, errD2) = decryptPasswordHex(workKey, hex2)
|
|
136
|
+
if (errD1 != "" || errD2 != "" || plain1 != "ab12cd34" || plain2 != "ab12cd34") {
|
|
137
|
+
eprintln("FAIL gcm-payload-decrypt: ${plain1} / ${plain2}(${errD1}${errD2})")
|
|
138
|
+
ok = false
|
|
139
|
+
} else {
|
|
140
|
+
eprintln("PASS gcm-payload-roundtrip")
|
|
141
|
+
}
|
|
142
|
+
return ok
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
// ---------- 离线判定与命名纯函数 ----------
|
|
146
|
+
|
|
147
|
+
func testSignPureFuncs(): Bool {
|
|
148
|
+
var ok = true
|
|
149
|
+
// profile 判定
|
|
150
|
+
let p = OhosProfile()
|
|
151
|
+
p.profileType = "debug"
|
|
152
|
+
p.bundleName = "com.example.demo"
|
|
153
|
+
p.deviceIds.add("AABBCCDD")
|
|
154
|
+
if (!p.allows("AABBCCDD") || p.allows("0000") || p.allows("")) {
|
|
155
|
+
eprintln("FAIL ohos-profile-allows")
|
|
156
|
+
ok = false
|
|
157
|
+
} else {
|
|
158
|
+
eprintln("PASS ohos-profile-allows")
|
|
159
|
+
}
|
|
160
|
+
// judgeSign 各分支
|
|
161
|
+
if (judgeSign(false, false, false, "", "UDID", false).ok) {
|
|
162
|
+
eprintln("FAIL judge-no-config")
|
|
163
|
+
ok = false
|
|
164
|
+
} else {
|
|
165
|
+
eprintln("PASS judge-no-config")
|
|
166
|
+
}
|
|
167
|
+
let good = judgeSign(true, true, true, "debug", "UDID", false)
|
|
168
|
+
if (!good.ok) {
|
|
169
|
+
eprintln("FAIL judge-ok: ${good.reason}")
|
|
170
|
+
ok = false
|
|
171
|
+
} else {
|
|
172
|
+
eprintln("PASS judge-ok")
|
|
173
|
+
}
|
|
174
|
+
// bundle 判定
|
|
175
|
+
if (!bundleMatches("com.a.b", "com.a.b") || bundleMatches("com.a.b", "com.a.c") ||
|
|
176
|
+
bundleMatches("", "com.a")) {
|
|
177
|
+
eprintln("FAIL bundle-matches")
|
|
178
|
+
ok = false
|
|
179
|
+
} else {
|
|
180
|
+
eprintln("PASS bundle-matches")
|
|
181
|
+
}
|
|
182
|
+
// UDID 解析(hdc 输出形态)
|
|
183
|
+
if (parseUdid("udid of current device is :\nFEDCBA9876543210FEDCBA9876543210\n") !=
|
|
184
|
+
"FEDCBA9876543210FEDCBA9876543210") {
|
|
185
|
+
eprintln("FAIL parse-udid")
|
|
186
|
+
ok = false
|
|
187
|
+
} else {
|
|
188
|
+
eprintln("PASS parse-udid")
|
|
189
|
+
}
|
|
190
|
+
// 材料命名:工程路径 hash 必须用前向斜杠
|
|
191
|
+
let h1 = projectPathHash("E:/proj/gen/ohos")
|
|
192
|
+
let h2 = projectPathHash("E:\\proj\\gen\\ohos")
|
|
193
|
+
if (h1 != h2 || h1.size != 43) {
|
|
194
|
+
eprintln("FAIL project-path-hash: ${h1} vs ${h2}")
|
|
195
|
+
ok = false
|
|
196
|
+
} else {
|
|
197
|
+
eprintln("PASS project-path-hash")
|
|
198
|
+
}
|
|
199
|
+
// extractProfileJson:深度归零截取,尾部 0x7D 垃圾不带进来
|
|
200
|
+
let rawJson = "{\"a\":{\"b\":\"x}\"}}\u{0001}\u{0002}}garbage"
|
|
201
|
+
let got = extractProfileJson(rawJson)
|
|
202
|
+
if (got != "{\"a\":{\"b\":\"x}\"}}") {
|
|
203
|
+
eprintln("FAIL extract-profile-json: ${got}")
|
|
204
|
+
ok = false
|
|
205
|
+
} else {
|
|
206
|
+
eprintln("PASS extract-profile-json")
|
|
207
|
+
}
|
|
208
|
+
// json5 读取(带 \\ 转义的 Windows 路径)
|
|
209
|
+
let j5 = "{\"certpath\": \"C:\\\\Users\\\\yang\\\\x.cer\", signingConfigs: []}"
|
|
210
|
+
if (json5ValueAfter(j5, "certpath") != "C:\\Users\\yang\\x.cer") {
|
|
211
|
+
eprintln("FAIL json5-value-after: ${json5ValueAfter(j5, "certpath")}")
|
|
212
|
+
ok = false
|
|
213
|
+
} else {
|
|
214
|
+
eprintln("PASS json5-value-after")
|
|
215
|
+
}
|
|
216
|
+
// 写回:空数组注入 + product 指向
|
|
217
|
+
let bp = "{\n \"signingConfigs\": [],\n \"products\": [\n { \"name\": \"default\", \"signingConfig\": \"\" }\n ]\n}\n"
|
|
218
|
+
let m = SigningMaterial()
|
|
219
|
+
m.storeFile = "C:\\ohos\\a.p12"
|
|
220
|
+
m.certpath = "C:\\ohos\\a.cer"
|
|
221
|
+
m.profile = "C:\\ohos\\a.p7b"
|
|
222
|
+
m.storePassword = "0011aa"
|
|
223
|
+
m.keyPassword = "0022bb"
|
|
224
|
+
let (newText, err) = applySigningConfig(bp, m)
|
|
225
|
+
if (err != "") {
|
|
226
|
+
eprintln("FAIL apply-signing-config: ${err}")
|
|
227
|
+
ok = false
|
|
228
|
+
} else {
|
|
229
|
+
let s = parseProjSigning(newText)
|
|
230
|
+
if (!s.hasSigningConfigs || s.signingConfigName != "default" ||
|
|
231
|
+
json5ValueAfter(newText, "storeFile") != "C:\\ohos\\a.p12") {
|
|
232
|
+
eprintln("FAIL apply-signing-config-content: ${newText}")
|
|
233
|
+
ok = false
|
|
234
|
+
} else {
|
|
235
|
+
eprintln("PASS apply-signing-config")
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
// 就地更新:同一 .p12 才允许
|
|
239
|
+
let (updText, updErr) = replaceOwnSigningConfigs(newText, m)
|
|
240
|
+
if (updErr != "" || !parseProjSigning(updText).hasSigningConfigs) {
|
|
241
|
+
eprintln("FAIL replace-own-signing-configs: ${updErr}")
|
|
242
|
+
ok = false
|
|
243
|
+
} else {
|
|
244
|
+
eprintln("PASS replace-own-signing-configs")
|
|
245
|
+
}
|
|
246
|
+
// 换一套材料必须拒绝
|
|
247
|
+
let m2 = SigningMaterial()
|
|
248
|
+
m2.storeFile = "C:\\ohos\\other.p12"
|
|
249
|
+
m2.certpath = "C:\\ohos\\other.cer"
|
|
250
|
+
m2.profile = "C:\\ohos\\other.p7b"
|
|
251
|
+
m2.storePassword = "0033"
|
|
252
|
+
m2.keyPassword = "0044"
|
|
253
|
+
match (replaceOwnSigningConfigs(newText, m2)) {
|
|
254
|
+
case (_, e) => if (e == "") {
|
|
255
|
+
eprintln("FAIL replace-other-material: 换材料不该静默覆盖")
|
|
256
|
+
ok = false
|
|
257
|
+
} else {
|
|
258
|
+
eprintln("PASS replace-other-material-rejected")
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
return ok
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
func runAllSignTests(): Bool {
|
|
265
|
+
var ok = true
|
|
266
|
+
ok = testGcmVectors() && ok
|
|
267
|
+
ok = testPbkdf2() && ok
|
|
268
|
+
ok = testLossyUtf8() && ok
|
|
269
|
+
ok = testGcmPayloadRoundtrip() && ok
|
|
270
|
+
ok = testSignPureFuncs() && ok
|
|
271
|
+
return ok
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
/** 汇总入口:每个 @Test 跑一组 */
|
|
275
|
+
@Test
|
|
276
|
+
func signGcmVectors(): Unit {
|
|
277
|
+
@Expect(testGcmVectors())
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
@Test
|
|
281
|
+
func signPbkdf2Vectors(): Unit {
|
|
282
|
+
@Expect(testPbkdf2())
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
@Test
|
|
286
|
+
func signLossyUtf8(): Unit {
|
|
287
|
+
@Expect(testLossyUtf8())
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
@Test
|
|
291
|
+
func signGcmPayloadRoundtrip(): Unit {
|
|
292
|
+
@Expect(testGcmPayloadRoundtrip())
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
@Test
|
|
296
|
+
func signPureFuncs(): Unit {
|
|
297
|
+
@Expect(testSignPureFuncs())
|
|
298
|
+
}
|
|
@@ -0,0 +1,235 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* hap-sign-tool.jar 的定位与调用。
|
|
3
|
+
*
|
|
4
|
+
* 私钥永远不上云:本地生成密钥对与 CSR,再拿 CSR 去 AGC 换证书——这是 DevEco/ark-cli/flutter
|
|
5
|
+
* 共同的做法。三个"照抄才不会跑偏"的点:
|
|
6
|
+
* ① jar 与 java 的位置有多档候选(SDK 的 toolchains/lib、数字版本目录、DevEco 自带 JBR);
|
|
7
|
+
* ② generate-keypair 没有 -outFile(写进 keystore),generate-csr 才有;
|
|
8
|
+
* ③ 口令是随机的字母数字(8 随机字节 → base64url → 去掉 -_=),才能安全当命令行参数,
|
|
9
|
+
* 而且日志里必须打码——口令进了日志就等于泄漏。
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
package cli
|
|
13
|
+
|
|
14
|
+
import std.collection.*
|
|
15
|
+
import std.fs.*
|
|
16
|
+
import std.process.*
|
|
17
|
+
|
|
18
|
+
/** 默认的密钥参数(与 DevEco 一致,别改) */
|
|
19
|
+
public let SIGN_KEY_ALIAS: String = "debugKey"
|
|
20
|
+
public let SIGN_KEY_ALG: String = "ECC"
|
|
21
|
+
public let SIGN_KEY_SIZE: String = "NIST-P-256"
|
|
22
|
+
public let SIGN_CSR_SUBJECT: String = "CN=DebugKey"
|
|
23
|
+
public let SIGN_ALG: String = "SHA256withECDSA"
|
|
24
|
+
|
|
25
|
+
/** 8 随机字节 → base64url(去 -_=)→ 纯字母数字口令(7~10 位,与 flutter 的 generateRandomPwd 同规则) */
|
|
26
|
+
public func randomPasswordAlnum(): String {
|
|
27
|
+
let raw = b64UrlNoPad(signRandomBytes(8))
|
|
28
|
+
let out = ArrayList<Byte>()
|
|
29
|
+
for (b in raw.toArray()) {
|
|
30
|
+
if (b == 45 || b == 95 || b == 61) { // - _ =
|
|
31
|
+
continue
|
|
32
|
+
}
|
|
33
|
+
out.add(b)
|
|
34
|
+
}
|
|
35
|
+
return String.fromUtf8(out.toArray())
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** java 可执行文件的候选路径(JAVA_HOME → DevEco JBR → PATH 里的裸名) */
|
|
39
|
+
public func signJavaCandidates(javaHome: String, devecoHome: String): ArrayList<String> {
|
|
40
|
+
let out = ArrayList<String>()
|
|
41
|
+
if (javaHome.trimAscii() != "") {
|
|
42
|
+
out.add(signHostPathOf("${javaHome.trimAscii()}/bin/java.exe"))
|
|
43
|
+
out.add(signHostPathOf("${javaHome.trimAscii()}/bin/java"))
|
|
44
|
+
}
|
|
45
|
+
if (devecoHome.trimAscii() != "") {
|
|
46
|
+
// DevEco 自带 JetBrains Runtime(JBR);两个常见目录都试
|
|
47
|
+
out.add(signHostPathOf("${devecoHome.trimAscii()}/jbr/bin/java.exe"))
|
|
48
|
+
out.add(signHostPathOf("${devecoHome.trimAscii()}/jre/bin/java.exe"))
|
|
49
|
+
}
|
|
50
|
+
out.add("java") // 走 PATH(找不到会执行失败,错误会如实回传)
|
|
51
|
+
return out
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* hap-sign-tool.jar 的候选路径(按 flutter 的三档顺序):
|
|
56
|
+
* ① {sdk}/default/openharmony/toolchains/lib/hap-sign-tool.jar
|
|
57
|
+
* ② {sdk}/openharmony/toolchains/lib/hap-sign-tool.jar
|
|
58
|
+
* ③ 带版本号的 SDK 目录({sdk}/{数字版本}/openharmony/toolchains/lib/...),版本降序
|
|
59
|
+
*/
|
|
60
|
+
public func signHapSignToolCandidates(sdkHome: String): ArrayList<String> {
|
|
61
|
+
let out = ArrayList<String>()
|
|
62
|
+
let sdk = sdkHome.trimAscii()
|
|
63
|
+
if (sdk == "") {
|
|
64
|
+
return out
|
|
65
|
+
}
|
|
66
|
+
out.add(signHostPathOf("${sdk}/default/openharmony/toolchains/lib/hap-sign-tool.jar"))
|
|
67
|
+
out.add(signHostPathOf("${sdk}/openharmony/toolchains/lib/hap-sign-tool.jar"))
|
|
68
|
+
// 数字版本目录:挑形如 6.1.1(24) / 5.0.0 的名字,按字符串降序(够用)
|
|
69
|
+
let versions = ArrayList<String>()
|
|
70
|
+
try {
|
|
71
|
+
for (info in Directory.readFrom(Path(sdk))) {
|
|
72
|
+
if (!info.isDirectory()) {
|
|
73
|
+
continue
|
|
74
|
+
}
|
|
75
|
+
let n = info.name
|
|
76
|
+
if (n.size > 0 && n.toArray()[0] >= 48 && n.toArray()[0] <= 57) {
|
|
77
|
+
versions.add(n)
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
} catch (e: Exception) {
|
|
81
|
+
let _ = e
|
|
82
|
+
}
|
|
83
|
+
var list = versions.toArray()
|
|
84
|
+
// 简单降序(版本目录个数很少,插入排序足够)
|
|
85
|
+
var i: Int64 = 1
|
|
86
|
+
while (i < Int64(list.size)) {
|
|
87
|
+
let cur = list[i]
|
|
88
|
+
var j = i - 1
|
|
89
|
+
while (j >= 0 && list[j] < cur) {
|
|
90
|
+
list[j + 1] = list[j]
|
|
91
|
+
j -= 1
|
|
92
|
+
}
|
|
93
|
+
list[j + 1] = cur
|
|
94
|
+
i += 1
|
|
95
|
+
}
|
|
96
|
+
for (v in list) {
|
|
97
|
+
out.add(signHostPathOf("${sdk}/${v}/openharmony/toolchains/lib/hap-sign-tool.jar"))
|
|
98
|
+
out.add(signHostPathOf("${sdk}/${v}/default/openharmony/toolchains/lib/hap-sign-tool.jar"))
|
|
99
|
+
}
|
|
100
|
+
return out
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/** 返回第一个真实存在的候选(裸名 "java" 跳过存在性判断) */
|
|
104
|
+
public func signFirstExisting(candidates: ArrayList<String>): String {
|
|
105
|
+
for (c in candidates) {
|
|
106
|
+
if (c == "java") {
|
|
107
|
+
continue
|
|
108
|
+
}
|
|
109
|
+
if (exists(Path(c))) {
|
|
110
|
+
return c
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
return ""
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/** generate-keypair 的完整参数(不含 java -jar 前缀;没有 -outFile,写进 keystore) */
|
|
117
|
+
public func signKeypairArgs(keyAlias: String, p12Path: String, password: String): ArrayList<String> {
|
|
118
|
+
let a = ArrayList<String>()
|
|
119
|
+
a.add("generate-keypair")
|
|
120
|
+
a.add("-keyAlias")
|
|
121
|
+
a.add(keyAlias)
|
|
122
|
+
a.add("-keyAlg")
|
|
123
|
+
a.add(SIGN_KEY_ALG)
|
|
124
|
+
a.add("-keySize")
|
|
125
|
+
a.add(SIGN_KEY_SIZE)
|
|
126
|
+
a.add("-keystoreFile")
|
|
127
|
+
a.add(p12Path)
|
|
128
|
+
a.add("-keystorePwd")
|
|
129
|
+
a.add(password)
|
|
130
|
+
a.add("-keyPwd")
|
|
131
|
+
a.add(password)
|
|
132
|
+
return a
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/** generate-csr 的完整参数(这个有 -outFile) */
|
|
136
|
+
public func signCsrArgs(keyAlias: String, p12Path: String, password: String,
|
|
137
|
+
csrPath: String): ArrayList<String> {
|
|
138
|
+
let a = ArrayList<String>()
|
|
139
|
+
a.add("generate-csr")
|
|
140
|
+
a.add("-keyAlias")
|
|
141
|
+
a.add(keyAlias)
|
|
142
|
+
a.add("-subject")
|
|
143
|
+
a.add(SIGN_CSR_SUBJECT)
|
|
144
|
+
a.add("-signAlg")
|
|
145
|
+
a.add(SIGN_ALG)
|
|
146
|
+
a.add("-keystoreFile")
|
|
147
|
+
a.add(p12Path)
|
|
148
|
+
a.add("-keystorePwd")
|
|
149
|
+
a.add(password)
|
|
150
|
+
a.add("-keyPwd")
|
|
151
|
+
a.add(password)
|
|
152
|
+
a.add("-outFile")
|
|
153
|
+
a.add(csrPath)
|
|
154
|
+
return a
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
/** 命令行打码:紧跟 -keystorePwd / -keyPwd 的那个值换成 ****** */
|
|
158
|
+
public func signMaskSecrets(args: ArrayList<String>): String {
|
|
159
|
+
var text = ""
|
|
160
|
+
var maskNext = false
|
|
161
|
+
for (a in args) {
|
|
162
|
+
let shown = if (maskNext) { "******" } else { a }
|
|
163
|
+
if (text != "") {
|
|
164
|
+
text += " "
|
|
165
|
+
}
|
|
166
|
+
text += shown
|
|
167
|
+
maskNext = (a == "-keystorePwd" || a == "-keyPwd")
|
|
168
|
+
}
|
|
169
|
+
return text
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
/** 一次 hap-sign-tool 调用的结果 */
|
|
173
|
+
public class SignToolResult {
|
|
174
|
+
public var ok: Bool = false
|
|
175
|
+
public var error: String = ""
|
|
176
|
+
/** 打码后的命令行(排障用,绝不含口令) */
|
|
177
|
+
public var command: String = ""
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
/** 跑一次 hap-sign-tool:java -jar <jar> <args...> */
|
|
181
|
+
public func signRunSignTool(javaPath: String, jarPath: String, args: ArrayList<String>,
|
|
182
|
+
workingDir: String): SignToolResult {
|
|
183
|
+
let r = SignToolResult()
|
|
184
|
+
r.command = signMaskSecrets(args)
|
|
185
|
+
if (javaPath == "") {
|
|
186
|
+
r.error = "找不到 java(设 JAVA_HOME,或用 DEVECO_HOME 指向 DevEco,或把 java 放进 PATH)"
|
|
187
|
+
return r
|
|
188
|
+
}
|
|
189
|
+
if (jarPath == "") {
|
|
190
|
+
r.error = "找不到 hap-sign-tool.jar(设 DEVECO_SDK_HOME 指向 SDK 根)"
|
|
191
|
+
return r
|
|
192
|
+
}
|
|
193
|
+
let argv = ArrayList<String>()
|
|
194
|
+
argv.add("-jar")
|
|
195
|
+
argv.add(jarPath)
|
|
196
|
+
for (a in args) {
|
|
197
|
+
argv.add(a)
|
|
198
|
+
}
|
|
199
|
+
try {
|
|
200
|
+
let (code, out, errOut) = executeWithOutput(javaPath, argv.toArray(),
|
|
201
|
+
workingDirectory: Path(workingDir))
|
|
202
|
+
let log = lenientUtf8(out) + "\n" + lenientUtf8(errOut)
|
|
203
|
+
if (code != 0) {
|
|
204
|
+
r.error = "hap-sign-tool 失败(exit=${code}):${signTailOf(log, 400)}"
|
|
205
|
+
return r
|
|
206
|
+
}
|
|
207
|
+
r.ok = true
|
|
208
|
+
return r
|
|
209
|
+
} catch (e: Exception) {
|
|
210
|
+
r.error = "起 java 失败:${e}"
|
|
211
|
+
return r
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/** 取文本尾部(错误信息只要最后几句就够定位) */
|
|
216
|
+
public func signTailOf(s: String, n: Int64): String {
|
|
217
|
+
if (s.size <= n) {
|
|
218
|
+
return s
|
|
219
|
+
}
|
|
220
|
+
return "…${s[(s.size - n)..s.size]}"
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
/** 生成密钥对(p12) */
|
|
224
|
+
public func signGenKeypair(javaPath: String, jarPath: String, p12Path: String, password: String,
|
|
225
|
+
workingDir: String): SignToolResult {
|
|
226
|
+
return signRunSignTool(javaPath, jarPath, signKeypairArgs(SIGN_KEY_ALIAS, p12Path, password),
|
|
227
|
+
workingDir)
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
/** 生成 CSR */
|
|
231
|
+
public func signGenCsr(javaPath: String, jarPath: String, p12Path: String, password: String,
|
|
232
|
+
csrPath: String, workingDir: String): SignToolResult {
|
|
233
|
+
return signRunSignTool(javaPath, jarPath, signCsrArgs(SIGN_KEY_ALIAS, p12Path, password, csrPath),
|
|
234
|
+
workingDir)
|
|
235
|
+
}
|