1
This commit is contained in:
parent
2a224c74ff
commit
5a9cdf1e1c
26
package-lock.json
generated
26
package-lock.json
generated
@ -12,6 +12,8 @@
|
|||||||
"@iconify/vue": "^5.0.0",
|
"@iconify/vue": "^5.0.0",
|
||||||
"@internationalized/date": "^3.12.0",
|
"@internationalized/date": "^3.12.0",
|
||||||
"@internationalized/number": "^3.6.5",
|
"@internationalized/number": "^3.6.5",
|
||||||
|
"@noble/ciphers": "^2.1.1",
|
||||||
|
"@noble/hashes": "^2.0.1",
|
||||||
"@tailwindcss/vite": "^4.1.18",
|
"@tailwindcss/vite": "^4.1.18",
|
||||||
"@vueuse/core": "^14.2.1",
|
"@vueuse/core": "^14.2.1",
|
||||||
"ag-grid-enterprise": "^35.1.0",
|
"ag-grid-enterprise": "^35.1.0",
|
||||||
@ -273,6 +275,30 @@
|
|||||||
"@jridgewell/sourcemap-codec": "^1.4.14"
|
"@jridgewell/sourcemap-codec": "^1.4.14"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@noble/ciphers": {
|
||||||
|
"version": "2.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-2.1.1.tgz",
|
||||||
|
"integrity": "sha512-bysYuiVfhxNJuldNXlFEitTVdNnYUc+XNJZd7Qm2a5j1vZHgY+fazadNFWFaMK/2vye0JVlxV3gHmC0WDfAOQw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 20.19.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://paulmillr.com/funding/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@noble/hashes": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 20.19.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://paulmillr.com/funding/"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@oxc-project/runtime": {
|
"node_modules/@oxc-project/runtime": {
|
||||||
"version": "0.114.0",
|
"version": "0.114.0",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
|||||||
@ -14,6 +14,8 @@
|
|||||||
"@iconify/vue": "^5.0.0",
|
"@iconify/vue": "^5.0.0",
|
||||||
"@internationalized/date": "^3.12.0",
|
"@internationalized/date": "^3.12.0",
|
||||||
"@internationalized/number": "^3.6.5",
|
"@internationalized/number": "^3.6.5",
|
||||||
|
"@noble/ciphers": "^2.1.1",
|
||||||
|
"@noble/hashes": "^2.0.1",
|
||||||
"@tailwindcss/vite": "^4.1.18",
|
"@tailwindcss/vite": "^4.1.18",
|
||||||
"@vueuse/core": "^14.2.1",
|
"@vueuse/core": "^14.2.1",
|
||||||
"ag-grid-enterprise": "^35.1.0",
|
"ag-grid-enterprise": "^35.1.0",
|
||||||
|
|||||||
@ -719,6 +719,8 @@ const importContractSegments = async (event: Event) => {
|
|||||||
showMessageDialog(t('ht.importFailedTitle'), t('ht.importCurrentIndustryMissing'))
|
showMessageDialog(t('ht.importFailedTitle'), t('ht.importCurrentIndustryMissing'))
|
||||||
} else if (message === 'IMPORT_PACKAGE_INDUSTRY_MISSING') {
|
} else if (message === 'IMPORT_PACKAGE_INDUSTRY_MISSING') {
|
||||||
showMessageDialog(t('ht.importFailedTitle'), t('ht.importPackageIndustryMissing'))
|
showMessageDialog(t('ht.importFailedTitle'), t('ht.importPackageIndustryMissing'))
|
||||||
|
} else if (message === 'ZW_CRYPTO_UNAVAILABLE') {
|
||||||
|
showMessageDialog(t('ht.importFailedTitle'), t('ht.importCryptoUnavailable'))
|
||||||
} else {
|
} else {
|
||||||
showMessageDialog(t('ht.importFailedTitle'), t('ht.importFileInvalid'))
|
showMessageDialog(t('ht.importFailedTitle'), t('ht.importFileInvalid'))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -180,6 +180,7 @@ export const enUS = {
|
|||||||
importProjectIdMissing: 'This package does not contain project ID (legacy export). Import is blocked to avoid cross-project overwrite.',
|
importProjectIdMissing: 'This package does not contain project ID (legacy export). Import is blocked to avoid cross-project overwrite.',
|
||||||
importProjectMismatch: 'This package belongs to another project and cannot override current project.',
|
importProjectMismatch: 'This package belongs to another project and cannot override current project.',
|
||||||
importInvalidFile: 'File is invalid, corrupted, or modified.',
|
importInvalidFile: 'File is invalid, corrupted, or modified.',
|
||||||
|
importCryptoUnavailable: 'This runtime does not support secure archive decryption. Please open the site over HTTPS or another secure local context and try again.',
|
||||||
importWriteError: 'An error occurred while writing local data.',
|
importWriteError: 'An error occurred while writing local data.',
|
||||||
openFile: 'Open file'
|
openFile: 'Open file'
|
||||||
}
|
}
|
||||||
@ -259,6 +260,7 @@ export const enUS = {
|
|||||||
importCurrentIndustryMissing: 'Current project industry is not set. Please set it in "Basic Info" first.',
|
importCurrentIndustryMissing: 'Current project industry is not set. Please set it in "Basic Info" first.',
|
||||||
importPackageIndustryMissing: 'Import package missing industry info. Re-export with latest version and try again.',
|
importPackageIndustryMissing: 'Import package missing industry info. Re-export with latest version and try again.',
|
||||||
importFileInvalid: 'Invalid or corrupted file, or not a contract-segment package.',
|
importFileInvalid: 'Invalid or corrupted file, or not a contract-segment package.',
|
||||||
|
importCryptoUnavailable: 'This runtime does not support secure archive decryption. Please open the site over HTTPS or another secure local context and try again.',
|
||||||
deleteSingleTitle: 'Confirm Delete Segment',
|
deleteSingleTitle: 'Confirm Delete Segment',
|
||||||
deleteSingleDesc: 'Delete "{name}" and all related service/pricing data. Continue?',
|
deleteSingleDesc: 'Delete "{name}" and all related service/pricing data. Continue?',
|
||||||
deleteBatchTitle: 'Confirm Batch Delete',
|
deleteBatchTitle: 'Confirm Batch Delete',
|
||||||
|
|||||||
@ -180,6 +180,7 @@ export const zhCN = {
|
|||||||
importProjectIdMissing: '该数据包不包含项目标识(旧版本导出包),为避免串项目已禁止导入。',
|
importProjectIdMissing: '该数据包不包含项目标识(旧版本导出包),为避免串项目已禁止导入。',
|
||||||
importProjectMismatch: '该数据包属于其他项目,不能覆盖当前项目。',
|
importProjectMismatch: '该数据包属于其他项目,不能覆盖当前项目。',
|
||||||
importInvalidFile: '文件无效、已损坏或被修改。',
|
importInvalidFile: '文件无效、已损坏或被修改。',
|
||||||
|
importCryptoUnavailable: '当前运行环境不支持安全解密导入,请使用 HTTPS 域名或本地安全环境访问后重试。',
|
||||||
importWriteError: '写入本地数据时发生错误。',
|
importWriteError: '写入本地数据时发生错误。',
|
||||||
openFile: '打开文件'
|
openFile: '打开文件'
|
||||||
}
|
}
|
||||||
@ -259,6 +260,7 @@ export const zhCN = {
|
|||||||
importCurrentIndustryMissing: '当前项目未设置工程行业,请先在“基础信息”里新建项目。',
|
importCurrentIndustryMissing: '当前项目未设置工程行业,请先在“基础信息”里新建项目。',
|
||||||
importPackageIndustryMissing: '导入包缺少工程行业信息,请使用最新版本重新导出后再导入。',
|
importPackageIndustryMissing: '导入包缺少工程行业信息,请使用最新版本重新导出后再导入。',
|
||||||
importFileInvalid: '文件无效、已损坏或不是合同段导出文件。',
|
importFileInvalid: '文件无效、已损坏或不是合同段导出文件。',
|
||||||
|
importCryptoUnavailable: '当前运行环境不支持安全解密导入,请使用 HTTPS 域名或本地安全环境访问后重试。',
|
||||||
deleteSingleTitle: '确认删除合同段',
|
deleteSingleTitle: '确认删除合同段',
|
||||||
deleteSingleDesc: '即将删除“{name}”及其关联咨询服务和计价数据,是否继续?',
|
deleteSingleDesc: '即将删除“{name}”及其关联咨询服务和计价数据,是否继续?',
|
||||||
deleteBatchTitle: '确认批量删除',
|
deleteBatchTitle: '确认批量删除',
|
||||||
|
|||||||
@ -1519,6 +1519,14 @@ const triggerImport = () => {
|
|||||||
importFileRef.value?.click()
|
importFileRef.value?.click()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const resolveProjectImportErrorMessage = (error: unknown) => {
|
||||||
|
const message = error instanceof Error ? error.message : ''
|
||||||
|
if (message === 'ZW_CRYPTO_UNAVAILABLE') {
|
||||||
|
return t('tab.messages.importCryptoUnavailable')
|
||||||
|
}
|
||||||
|
return t('tab.messages.importInvalidFile')
|
||||||
|
}
|
||||||
|
|
||||||
const prepareImportPayloadFromFile = async (
|
const prepareImportPayloadFromFile = async (
|
||||||
file: File,
|
file: File,
|
||||||
options?: { skipConfirm?: boolean }
|
options?: { skipConfirm?: boolean }
|
||||||
@ -1549,7 +1557,7 @@ const importData = async (event: Event) => {
|
|||||||
await prepareImportPayloadFromFile(file)
|
await prepareImportPayloadFromFile(file)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('import failed:', error)
|
console.error('import failed:', error)
|
||||||
showMessageDialog(t('tab.messages.importFailedTitle'), t('tab.messages.importInvalidFile'))
|
showMessageDialog(t('tab.messages.importFailedTitle'), resolveProjectImportErrorMessage(error))
|
||||||
} finally {
|
} finally {
|
||||||
input.value = ''
|
input.value = ''
|
||||||
}
|
}
|
||||||
@ -1747,7 +1755,7 @@ onMounted(() => {
|
|||||||
if (!pendingHomeImportFile) return
|
if (!pendingHomeImportFile) return
|
||||||
await prepareImportPayloadFromFile(pendingHomeImportFile, { skipConfirm: skipWorkspaceImportConfirm }).catch(error => {
|
await prepareImportPayloadFromFile(pendingHomeImportFile, { skipConfirm: skipWorkspaceImportConfirm }).catch(error => {
|
||||||
console.error('home import failed:', error)
|
console.error('home import failed:', error)
|
||||||
showMessageDialog(t('tab.messages.importFailedTitle'), t('tab.messages.importInvalidFile'))
|
showMessageDialog(t('tab.messages.importFailedTitle'), resolveProjectImportErrorMessage(error))
|
||||||
})
|
})
|
||||||
})()
|
})()
|
||||||
void (async () => {
|
void (async () => {
|
||||||
|
|||||||
@ -1,3 +1,6 @@
|
|||||||
|
import { gcm } from '@noble/ciphers/aes.js'
|
||||||
|
import { sha256 } from '@noble/hashes/sha2.js'
|
||||||
|
|
||||||
const ZW_VERSION = 1
|
const ZW_VERSION = 1
|
||||||
const KEY_SEED = 'JGJS2026::ZW::ARCHIVE::V1::DO_NOT_TAMPER'
|
const KEY_SEED = 'JGJS2026::ZW::ARCHIVE::V1::DO_NOT_TAMPER'
|
||||||
const MAGIC_BYTES = new Uint8Array([0x4a, 0x47, 0x4a, 0x53, 0x5a, 0x57]) // JGJSZW
|
const MAGIC_BYTES = new Uint8Array([0x4a, 0x47, 0x4a, 0x53, 0x5a, 0x57]) // JGJSZW
|
||||||
@ -6,32 +9,59 @@ export const ZW_FILE_EXTENSION = '.zw'
|
|||||||
|
|
||||||
const encoder = new TextEncoder()
|
const encoder = new TextEncoder()
|
||||||
const decoder = new TextDecoder()
|
const decoder = new TextDecoder()
|
||||||
let cachedKeyPromise: Promise<CryptoKey> | null = null
|
let cachedKeyBytes: Uint8Array | null = null
|
||||||
|
|
||||||
const toArrayBuffer = (bytes: Uint8Array): ArrayBuffer =>
|
const toArrayBuffer = (bytes: Uint8Array): ArrayBuffer =>
|
||||||
bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength) as ArrayBuffer
|
bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength) as ArrayBuffer
|
||||||
|
|
||||||
const getArchiveKey = async (): Promise<CryptoKey> => {
|
const getCryptoApi = () => {
|
||||||
if (!cachedKeyPromise) {
|
const cryptoApi = globalThis.crypto
|
||||||
cachedKeyPromise = (async () => {
|
if (!cryptoApi || typeof cryptoApi.getRandomValues !== 'function') {
|
||||||
const hash = await crypto.subtle.digest('SHA-256', encoder.encode(KEY_SEED))
|
throw new Error('ZW_CRYPTO_UNAVAILABLE')
|
||||||
return crypto.subtle.importKey('raw', hash, { name: 'AES-GCM' }, false, ['encrypt', 'decrypt'])
|
|
||||||
})()
|
|
||||||
}
|
}
|
||||||
return cachedKeyPromise
|
return cryptoApi
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasSubtleCrypto = () => {
|
||||||
|
const subtle = globalThis.crypto?.subtle
|
||||||
|
return Boolean(
|
||||||
|
subtle &&
|
||||||
|
typeof subtle.importKey === 'function' &&
|
||||||
|
typeof subtle.encrypt === 'function' &&
|
||||||
|
typeof subtle.decrypt === 'function'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const getArchiveKeyBytes = () => {
|
||||||
|
if (!cachedKeyBytes) {
|
||||||
|
cachedKeyBytes = sha256(encoder.encode(KEY_SEED))
|
||||||
|
}
|
||||||
|
return cachedKeyBytes
|
||||||
|
}
|
||||||
|
|
||||||
|
const getArchiveWebCryptoKey = async () => {
|
||||||
|
if (!hasSubtleCrypto()) throw new Error('ZW_SUBTLE_UNAVAILABLE')
|
||||||
|
return getCryptoApi().subtle.importKey(
|
||||||
|
'raw',
|
||||||
|
toArrayBuffer(getArchiveKeyBytes()),
|
||||||
|
{ name: 'AES-GCM' },
|
||||||
|
false,
|
||||||
|
['encrypt', 'decrypt']
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export const encodeZwArchive = async (payload: unknown): Promise<Uint8Array> => {
|
export const encodeZwArchive = async (payload: unknown): Promise<Uint8Array> => {
|
||||||
const key = await getArchiveKey()
|
const cryptoApi = getCryptoApi()
|
||||||
const iv = crypto.getRandomValues(new Uint8Array(12))
|
const iv = cryptoApi.getRandomValues(new Uint8Array(12))
|
||||||
const ivBuffer = toArrayBuffer(iv)
|
const ivBuffer = toArrayBuffer(iv)
|
||||||
const plainText = encoder.encode(JSON.stringify(payload))
|
const plainText = encoder.encode(JSON.stringify(payload))
|
||||||
const cipherBuffer = await crypto.subtle.encrypt(
|
const cipher = hasSubtleCrypto()
|
||||||
|
? new Uint8Array(await cryptoApi.subtle.encrypt(
|
||||||
{ name: 'AES-GCM', iv: ivBuffer },
|
{ name: 'AES-GCM', iv: ivBuffer },
|
||||||
key,
|
await getArchiveWebCryptoKey(),
|
||||||
toArrayBuffer(plainText)
|
toArrayBuffer(plainText)
|
||||||
)
|
))
|
||||||
const cipher = new Uint8Array(cipherBuffer)
|
: gcm(getArchiveKeyBytes(), iv).encrypt(plainText)
|
||||||
const result = new Uint8Array(MAGIC_BYTES.length + 1 + 1 + iv.length + cipher.length)
|
const result = new Uint8Array(MAGIC_BYTES.length + 1 + 1 + iv.length + cipher.length)
|
||||||
let offset = 0
|
let offset = 0
|
||||||
result.set(MAGIC_BYTES, offset)
|
result.set(MAGIC_BYTES, offset)
|
||||||
@ -80,13 +110,17 @@ export const decodeZwArchive = async <T>(raw: ArrayBuffer | Uint8Array): Promise
|
|||||||
throw new Error('INVALID_ZW_PAYLOAD')
|
throw new Error('INVALID_ZW_PAYLOAD')
|
||||||
}
|
}
|
||||||
|
|
||||||
const key = await getArchiveKey()
|
|
||||||
const ivBuffer = toArrayBuffer(iv)
|
|
||||||
const cipherBuffer = toArrayBuffer(cipher)
|
|
||||||
|
|
||||||
let plainBuffer: ArrayBuffer
|
let plainBuffer: ArrayBuffer
|
||||||
try {
|
try {
|
||||||
plainBuffer = await crypto.subtle.decrypt({ name: 'AES-GCM', iv: ivBuffer }, key, cipherBuffer)
|
if (hasSubtleCrypto()) {
|
||||||
|
plainBuffer = await getCryptoApi().subtle.decrypt(
|
||||||
|
{ name: 'AES-GCM', iv: toArrayBuffer(iv) },
|
||||||
|
await getArchiveWebCryptoKey(),
|
||||||
|
toArrayBuffer(cipher)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
plainBuffer = toArrayBuffer(gcm(getArchiveKeyBytes(), iv).decrypt(cipher))
|
||||||
|
}
|
||||||
} catch {
|
} catch {
|
||||||
throw new Error('INVALID_ZW_TAMPERED')
|
throw new Error('INVALID_ZW_TAMPERED')
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user