diff --git a/components.d.ts b/components.d.ts index fabbe793..18828739 100644 --- a/components.d.ts +++ b/components.d.ts @@ -156,6 +156,7 @@ declare module '@vue/runtime-core' { NH3: typeof import('naive-ui')['NH3'] NIcon: typeof import('naive-ui')['NIcon'] NImage: typeof import('naive-ui')['NImage'] + NInput: typeof import('naive-ui')['NInput'] NInputGroup: typeof import('naive-ui')['NInputGroup'] NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel'] NInputNumber: typeof import('naive-ui')['NInputNumber'] @@ -165,6 +166,7 @@ declare module '@vue/runtime-core' { NProgress: typeof import('naive-ui')['NProgress'] NScrollbar: typeof import('naive-ui')['NScrollbar'] NSlider: typeof import('naive-ui')['NSlider'] + NSpace: typeof import('naive-ui')['NSpace'] NStatistic: typeof import('naive-ui')['NStatistic'] NSwitch: typeof import('naive-ui')['NSwitch'] NTable: typeof import('naive-ui')['NTable'] diff --git a/src/tools/rsa-key-pair-generator/index.ts b/src/tools/rsa-key-pair-generator/index.ts index 3d034e5b..4c844707 100644 --- a/src/tools/rsa-key-pair-generator/index.ts +++ b/src/tools/rsa-key-pair-generator/index.ts @@ -5,8 +5,8 @@ import { translate } from '@/plugins/i18n.plugin'; export const tool = defineTool({ name: translate('tools.rsa-key-pair-generator.title'), path: '/rsa-key-pair-generator', - description: translate('tools.rsa-key-pair-generator.description'), - keywords: ['rsa', 'key', 'pair', 'generator', 'public', 'private', 'secret', 'ssh', 'pem'], + description: 'Generate new random RSA private and public keys (with or without passphrase).', + keywords: ['rsa', 'key', 'pair', 'generator', 'public', 'private', 'secret', 'ssh', 'pem', 'passphrase', 'password'], component: () => import('./rsa-key-pair-generator.vue'), icon: Certificate, }); diff --git a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts index 1cb1f1ae..34b06f26 100644 --- a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts +++ b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts @@ -1,5 +1,6 @@ import { pki } from 'node-forge'; import workerScript from 'node-forge/dist/prime.worker.min?url'; +import sshpk from 'sshpk'; export { generateKeyPair }; @@ -16,11 +17,39 @@ function generateRawPairs({ bits = 2048 }) { ); } -async function generateKeyPair(config: { bits?: number } = {}) { +async function generateKeyPair(config: { + bits?: number + password?: string + format?: sshpk.PrivateKeyFormatType + comment?: string +} = {}) { const { privateKey, publicKey } = await generateRawPairs(config); + const privateUnencryptedKeyPem = pki.privateKeyToPem(privateKey); + + if (config?.format === 'pem') { + return { + publicKey: pki.publicKeyToPem(publicKey), + privateKey: config?.password + ? pki.encryptRsaPrivateKey(privateKey, config?.password) + : privateUnencryptedKeyPem, + }; + } + + const privKey = sshpk.parsePrivateKey(privateUnencryptedKeyPem); + privKey.comment = config?.comment; + const pubFormat = config.format ?? 'ssh'; + let privFormat = config.format ?? 'ssh'; + if (privFormat === 'ssh') { + privFormat = 'ssh-private'; + } + const pubKey = privKey.toPublic(); return { - publicKeyPem: pki.publicKeyToPem(publicKey), - privateKeyPem: pki.privateKeyToPem(privateKey), + publicKey: pubKey.toString(pubFormat), + privateKey: config?.password + ? privKey.toString(privFormat, + { passphrase: config?.password, comment: config?.comment }, + ) + : privKey.toString(privFormat, { comment: config?.comment }), }; } diff --git a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue index 7f972464..3ca9f7bd 100644 --- a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue +++ b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue @@ -1,4 +1,5 @@