diff --git a/components.d.ts b/components.d.ts index cb1ab221..cc3e704c 100644 --- a/components.d.ts +++ b/components.d.ts @@ -84,6 +84,7 @@ declare module '@vue/runtime-core' { Countdown: typeof import('./src/tools/countdown/countdown.vue')['default'] Counter: typeof import('./src/tools/pomodoro-timer/app/components/Counter.vue')['default'] CrcCalculator: typeof import('./src/tools/crc-calculator/crc-calculator.vue')['default'] + CronAlarm: typeof import('./src/tools/cron-alarm/cron-alarm.vue')['default'] CrontabGenerator: typeof import('./src/tools/crontab-generator/crontab-generator.vue')['default'] CSelect: typeof import('./src/ui/c-select/c-select.vue')['default'] 'CSelect.demo': typeof import('./src/ui/c-select/c-select.demo.vue')['default'] @@ -293,24 +294,40 @@ declare module '@vue/runtime-core' { MultiLinkDownloader: typeof import('./src/tools/multi-link-downloader/multi-link-downloader.vue')['default'] MyIp: typeof import('./src/tools/my-ip/my-ip.vue')['default'] NA: typeof import('naive-ui')['NA'] + NAlert: typeof import('naive-ui')['NAlert'] NanoidGenerator: typeof import('./src/tools/nanoid-generator/nanoid-generator.vue')['default'] NanoMemo: typeof import('./src/tools/nano-memo/nano-memo.vue')['default'] 'NanoMemo.content': typeof import('./src/tools/nano-memo/nano-memo.content.md')['default'] NavbarButtons: typeof import('./src/components/NavbarButtons.vue')['default'] + NButton: typeof import('naive-ui')['NButton'] + NCard: typeof import('naive-ui')['NCard'] + NCheckbox: typeof import('naive-ui')['NCheckbox'] + NCheckboxGroup: typeof import('naive-ui')['NCheckboxGroup'] + NCode: typeof import('naive-ui')['NCode'] NCollapseTransition: typeof import('naive-ui')['NCollapseTransition'] NConfigProvider: typeof import('naive-ui')['NConfigProvider'] NDataTable: typeof import('naive-ui')['NDataTable'] + NDivider: typeof import('naive-ui')['NDivider'] NEllipsis: typeof import('naive-ui')['NEllipsis'] NFormItem: typeof import('naive-ui')['NFormItem'] NginxFormatter: typeof import('./src/tools/nginx-formatter/nginx-formatter.vue')['default'] NH1: typeof import('naive-ui')['NH1'] NH3: typeof import('naive-ui')['NH3'] NIcon: typeof import('naive-ui')['NIcon'] + NInput: typeof import('naive-ui')['NInput'] NInputNumber: typeof import('naive-ui')['NInputNumber'] NLayout: typeof import('naive-ui')['NLayout'] NLayoutSider: typeof import('naive-ui')['NLayoutSider'] NMenu: typeof import('naive-ui')['NMenu'] + NModal: typeof import('naive-ui')['NModal'] + NP: typeof import('naive-ui')['NP'] + NRadio: typeof import('naive-ui')['NRadio'] + NRadioGroup: typeof import('naive-ui')['NRadioGroup'] + NScrollbar: typeof import('naive-ui')['NScrollbar'] + NSpace: typeof import('naive-ui')['NSpace'] NTable: typeof import('naive-ui')['NTable'] + NTag: typeof import('naive-ui')['NTag'] + NTimePicker: typeof import('naive-ui')['NTimePicker'] NumberInput: typeof import('./src/tools/pomodoro-timer/app/components/NumberInput.vue')['default'] NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default'] OcrImage: typeof import('./src/tools/ocr-image/ocr-image.vue')['default'] diff --git a/package.json b/package.json index 312b2e2d..0275c2e1 100644 --- a/package.json +++ b/package.json @@ -219,7 +219,7 @@ "netstack.js": "^2.1.1", "nginx-config-formatter": "^1.4.5", "node-forge": "^1.3.1", - "openpgp": "^6.1.0", + "openpgp": "^6.1.1", "oui-data": "^1.1.281", "parse-duration": "^2.1.2", "parse-torrent": "^11.0.18", @@ -288,6 +288,7 @@ "vuex": "^4.1.0", "w-websocket-client": "^1.0.29", "webcrack": "^2.15.0", + "webcrypto-liner-shim": "^1.4.8", "webp-converter-browser": "^1.0.4", "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz", "xml-formatter": "^3.6.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5e9bfdbc..8921fd8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -555,8 +555,8 @@ dependencies: specifier: ^1.3.1 version: 1.3.1 openpgp: - specifier: ^6.1.0 - version: 6.1.0 + specifier: ^6.1.1 + version: 6.1.1 oui-data: specifier: ^1.1.281 version: 1.1.281 @@ -761,6 +761,9 @@ dependencies: webcrack: specifier: ^2.15.0 version: 2.15.0 + webcrypto-liner-shim: + specifier: ^1.4.8 + version: 1.4.8 webp-converter-browser: specifier: ^1.0.4 version: 1.0.4 @@ -5404,6 +5407,21 @@ packages: dev: false optional: true + /@peculiar/asn1-schema@2.3.15: + resolution: {integrity: sha512-QPeD8UA8axQREpgR5UTAfu2mqQmm97oUqahDtNdBcfj3qAnoXzFdQW+aNf/tD2WVXF8Fhmftxoj0eMIT++gX2w==} + dependencies: + asn1js: 3.0.6 + pvtsutils: 1.3.6 + tslib: 2.8.1 + dev: false + + /@peculiar/json-schema@1.1.12: + resolution: {integrity: sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==} + engines: {node: '>=8.0.0'} + dependencies: + tslib: 2.8.1 + dev: false + /@pkgjs/parseargs@0.11.0: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -5716,6 +5734,12 @@ packages: resolution: {integrity: sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw==} dev: false + /@stablelib/binary@1.0.1: + resolution: {integrity: sha512-ClJWvmL6UBM/wjkvv/7m5VP3GMr9t0osr4yVgLZsLCOz4hGN9gIAFEqnJ0TsSMAN+n840nf2cHZnA5/KFqHC7Q==} + dependencies: + '@stablelib/int': 1.0.1 + dev: false + /@stablelib/binary@2.0.1: resolution: {integrity: sha512-U9iAO8lXgEDONsA0zPPSgcf3HUBNAqHiJmSHgZz62OvC3Hi2Bhc5kTnQ3S1/L+sthDTHtCMhcEiklmIly6uQ3w==} dependencies: @@ -5745,10 +5769,18 @@ packages: '@stablelib/wipe': 2.0.1 dev: false + /@stablelib/hash@1.0.1: + resolution: {integrity: sha512-eTPJc/stDkdtOcrNMZ6mcMK1e6yBbqRBaNW55XA1jU8w/7QdnCF0CmMmOD1m7VSkBR44PWrMHU2l6r8YEQHMgg==} + dev: false + /@stablelib/hash@2.0.0: resolution: {integrity: sha512-u3WPSqGido8lwJuMcrBgM5K54LrPGhkWAdtsyccf7dGsLixAZUds77zOAbu7bvKPwQlmoByH0txBi5rTmEKuHg==} dev: false + /@stablelib/int@1.0.1: + resolution: {integrity: sha512-byr69X/sDtDiIjIV6m4roLVWnNNlRGzsvxw+agj8CIEazqWGOQp2dTYgQhtyVXV9wpO6WyXRQUzLV/JRNumT2w==} + dev: false + /@stablelib/int@2.0.1: resolution: {integrity: sha512-Ht63fQp3wz/F8U4AlXEPb7hfJOIILs8Lq55jgtD7KueWtyjhVuzcsGLSTAWtZs3XJDZYdF1WcSKn+kBtbzupww==} dev: false @@ -5760,6 +5792,14 @@ packages: '@stablelib/wipe': 2.0.1 dev: false + /@stablelib/sha3@1.0.1: + resolution: {integrity: sha512-82OHZcxWsJAS34L64VItIbqZdcdYgBJmeToYaou9lUA+iMjajdfOVZDDrditfV8C8yXUDrlS3BuMRWmKf9NQhQ==} + dependencies: + '@stablelib/binary': 1.0.1 + '@stablelib/hash': 1.0.1 + '@stablelib/wipe': 1.0.1 + dev: false + /@stablelib/sha512@2.0.1: resolution: {integrity: sha512-DUNe5cbnoH3sSIN+MG04RvTCLXtkbyy/SnQxiNO+GgF/KSXkkUSlF6mUVvCUdZBZ2X3NgogR+tAvaRSn8wxnLw==} dependencies: @@ -5768,6 +5808,10 @@ packages: '@stablelib/wipe': 2.0.1 dev: false + /@stablelib/wipe@1.0.1: + resolution: {integrity: sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==} + dev: false + /@stablelib/wipe@2.0.1: resolution: {integrity: sha512-1eU2K9EgOcV4qc9jcP6G72xxZxEm5PfeI5H55l08W95b4oRJaqhmlWRc4xZAm6IVSKhVNxMi66V67hCzzuMTAg==} dev: false @@ -6971,7 +7015,7 @@ packages: dependencies: '@unhead/dom': 0.5.1 '@unhead/schema': 0.5.1 - '@vueuse/shared': 13.2.0(vue@3.3.4) + '@vueuse/shared': 13.3.0(vue@3.3.4) unhead: 0.5.1 vue: 3.3.4 dev: false @@ -7643,8 +7687,8 @@ packages: - vue dev: false - /@vueuse/shared@13.2.0(vue@3.3.4): - resolution: {integrity: sha512-vx9ZPDF5HcU9up3Jgt3G62dMUfZEdk6tLyBAHYAG4F4n73vpaA7J5hdncDI/lS9Vm7GA/FPlbOmh9TrDZROTpg==} + /@vueuse/shared@13.3.0(vue@3.3.4): + resolution: {integrity: sha512-L1QKsF0Eg9tiZSFXTgodYnu0Rsa2P0En2LuLrIs/jgrkyiDuJSsPZK+tx+wU0mMsYHUYEjNsuE41uqqkuR8VhA==} peerDependencies: vue: ^3.5.0 dependencies: @@ -7956,6 +8000,10 @@ packages: get-intrinsic: 1.3.0 is-array-buffer: 3.0.5 + /asmcrypto.js@2.3.2: + resolution: {integrity: sha512-3FgFARf7RupsZETQ1nHnhLUUvpcttcCq1iZCaVAbJZbCZ5VNRrNyvpDyHTOb0KC3llFcsyOT/a99NZcCbeiEsA==} + dev: false + /asn1.js@4.10.1: resolution: {integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==} dependencies: @@ -7970,6 +8018,15 @@ packages: safer-buffer: 2.1.2 dev: false + /asn1js@3.0.6: + resolution: {integrity: sha512-UOCGPYbl0tv8+006qks/dTgV9ajs97X2p0FAbyS2iyCRrmLSRolDaHdp+v/CLgnzHc3fVB+CwYiUmei7ndFcgA==} + engines: {node: '>=12.0.0'} + dependencies: + pvtsutils: 1.3.6 + pvutils: 1.1.3 + tslib: 2.8.1 + dev: false + /assert-plus@1.0.0: resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==} engines: {node: '>=0.8'} @@ -8169,7 +8226,6 @@ packages: /bn.js@4.12.1: resolution: {integrity: sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==} - dev: true /bn.js@5.2.1: resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} @@ -8197,7 +8253,6 @@ packages: /brorand@1.1.0: resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} - dev: true /browser-or-node@3.0.0: resolution: {integrity: sha512-iczIdVJzGEYhP5DqQxYM9Hh7Ztpqqi+CXZpSmX8ALFs9ecXkQIeqRyM6TfxEfMVpwhl3dSuDvxdzzo9sUOIVBQ==} @@ -8953,6 +9008,11 @@ packages: requiresBuild: true dev: false + /core-js@3.42.0: + resolution: {integrity: sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==} + requiresBuild: true + dev: false + /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -9848,7 +9908,6 @@ packages: dependencies: inherits: 2.0.4 minimalistic-assert: 1.0.1 - dev: true /destr@2.0.3: resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==} @@ -11939,7 +11998,6 @@ packages: hash.js: 1.1.7 minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 - dev: true /homedir-polyfill@1.0.3: resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==} @@ -13936,7 +13994,6 @@ packages: /minimalistic-crypto-utils@1.0.1: resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==} - dev: true /minimatch@10.0.1: resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} @@ -14551,8 +14608,8 @@ packages: hasBin: true dev: false - /openpgp@6.1.0: - resolution: {integrity: sha512-fRTeitP+hoGJD3kbdUlAI++wE6MvfvXw1rBqHwmBMxIpLjowatJ2zb5ThkORpIkSz5F12wO+xCYRSTbT7M4qKA==} + /openpgp@6.1.1: + resolution: {integrity: sha512-V/DXZ5AGCz3q4X8psUSc3q4SxnH/bfICaTSpNcla7wvBFhrxa9/ajm31rtMwZ1qj7Fu2oMpfX6ZcxKmTBlb6Yg==} engines: {node: '>= 18.0.0'} dev: false @@ -15482,6 +15539,17 @@ packages: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} + /pvtsutils@1.3.6: + resolution: {integrity: sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==} + dependencies: + tslib: 2.8.1 + dev: false + + /pvutils@1.1.3: + resolution: {integrity: sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==} + engines: {node: '>=6.0.0'} + dev: false + /pyodide@0.24.1: resolution: {integrity: sha512-fkNolNwiv41E2KKCP2bgW+dwr95B+0KSC/WG9WCmlWM9MNFbRVX0rF9i4OikRM78bGeVUvLdVJw8jY17wxKoRQ==} dependencies: @@ -18637,6 +18705,32 @@ packages: - supports-color dev: false + /webcrypto-core@1.8.1: + resolution: {integrity: sha512-P+x1MvlNCXlKbLSOY4cYrdreqPG5hbzkmawbcXLKN/mf6DZW0SdNNkZ+sjwsqVkI4A4Ko2sPZmkZtCKY58w83A==} + dependencies: + '@peculiar/asn1-schema': 2.3.15 + '@peculiar/json-schema': 1.1.12 + asn1js: 3.0.6 + pvtsutils: 1.3.6 + tslib: 2.8.1 + dev: false + + /webcrypto-liner-shim@1.4.8: + resolution: {integrity: sha512-ZTHoyFySHpagRM79LODyRZPxZWp022jaECgVpEHZSX4Y0dcMKlQ0Che9R/EgTypAnds6li7qe8Corc1dNgvnxg==} + dependencies: + '@peculiar/asn1-schema': 2.3.15 + '@peculiar/json-schema': 1.1.12 + '@stablelib/sha3': 1.0.1 + asmcrypto.js: 2.3.2 + asn1js: 3.0.6 + core-js: 3.42.0 + des.js: 1.1.0 + elliptic: github.com/mahrud/elliptic/75637c76678e83c31682fd967c2fa9ff4761b3fc + pvtsutils: 1.3.6 + tslib: 2.8.1 + webcrypto-core: 1.8.1 + dev: false + /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} dev: false @@ -19295,3 +19389,17 @@ packages: engines: {node: '>=0.8'} hasBin: true dev: false + + github.com/mahrud/elliptic/75637c76678e83c31682fd967c2fa9ff4761b3fc: + resolution: {tarball: https://codeload.github.com/mahrud/elliptic/tar.gz/75637c76678e83c31682fd967c2fa9ff4761b3fc} + name: elliptic + version: 6.5.0 + dependencies: + bn.js: 4.12.1 + brorand: 1.1.0 + hash.js: 1.1.7 + hmac-drbg: 1.0.1 + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + minimalistic-crypto-utils: 1.0.1 + dev: false diff --git a/src/tools/certificate-key-parser/certificate-key-parser.infos.ts b/src/tools/certificate-key-parser/certificate-key-parser.infos.ts index 5adbf062..ec402888 100644 --- a/src/tools/certificate-key-parser/certificate-key-parser.infos.ts +++ b/src/tools/certificate-key-parser/certificate-key-parser.infos.ts @@ -5,6 +5,7 @@ import type { Key, PrivateKey, Signature, } from 'sshpk'; +import 'webcrypto-liner-shim'; import type * as openpgp from 'openpgp'; import * as forge from 'node-forge'; import oids from './oids.json'; diff --git a/src/tools/certificate-key-parser/certificate-key-parser.service.ts b/src/tools/certificate-key-parser/certificate-key-parser.service.ts index a31ab641..1fd8f261 100644 --- a/src/tools/certificate-key-parser/certificate-key-parser.service.ts +++ b/src/tools/certificate-key-parser/certificate-key-parser.service.ts @@ -14,6 +14,7 @@ import type { PrivateKey, Signature, SignatureFormatType, } from 'sshpk'; import { Base64 } from 'js-base64'; +import 'webcrypto-liner-shim'; import * as openpgp from 'openpgp'; import * as forge from 'node-forge'; import { type LabelValue, getCSRLabelValues, getCertificateLabelValues, getFingerprintLabelValues, getPGPPrivateKeyLabelValuesAsync, getPGPPublicKeyLabelValuesAsync, getPrivateKeyLabelValues, getPublicKeyLabelValues, getSignatureLabelValues } from './certificate-key-parser.infos'; diff --git a/src/tools/certificate-key-parser/certificate-key-parser.vue b/src/tools/certificate-key-parser/certificate-key-parser.vue index 67610a4c..c50febce 100644 --- a/src/tools/certificate-key-parser/certificate-key-parser.vue +++ b/src/tools/certificate-key-parser/certificate-key-parser.vue @@ -47,14 +47,21 @@ const parsedSections = computedAsync(async () => { else if (inputType.value === 'content' && inputContent) { inputKeyOrCertificateValue = inputContent; } - const parsed = await getKeysOrCertificatesInfosAsync(inputKeyOrCertificateValue, passphrase.value); - if (parsed.length === 1) { - const { values, certificateX509DER: certPEM } = parsed[0]; - certificateX509DER.value = certPEM || ''; - return [values]; + try { + const parsed = await getKeysOrCertificatesInfosAsync(inputKeyOrCertificateValue, passphrase.value); + if (parsed.length === 1) { + const { values, certificateX509DER: certPEM } = parsed[0]; + certificateX509DER.value = certPEM || ''; + return [values]; + } + else { + return parsed.map(p => p.values); + } } - else { - return parsed.map(p => p.values); + catch (e: any) { + return [ + [{ label: 'Parsing Error', value: e.toString() }], + ]; } }); diff --git a/src/tools/pgp-encryption/pgp-encryption.vue b/src/tools/pgp-encryption/pgp-encryption.vue index 3d85a8f4..4a0d557b 100644 --- a/src/tools/pgp-encryption/pgp-encryption.vue +++ b/src/tools/pgp-encryption/pgp-encryption.vue @@ -1,7 +1,10 @@