From 4313ce9215fd27fe43ddab6c62d37d83ba4a227e Mon Sep 17 00:00:00 2001 From: ShareVB Date: Sat, 31 May 2025 12:20:34 +0200 Subject: [PATCH] feat(Htpasswd Generator): add md5, apr1, sha256 and sha512 Fix #1578 --- package.json | 3 +- pnpm-lock.yaml | 211 +++++------------- .../htpasswd-generator.service.test.ts | 26 +++ .../htpasswd-generator.service.ts | 56 +++++ .../htpasswd-generator/htpasswd-generator.vue | 31 ++- src/utils/random.ts | 3 + 6 files changed, 167 insertions(+), 163 deletions(-) create mode 100644 src/tools/htpasswd-generator/htpasswd-generator.service.test.ts create mode 100644 src/tools/htpasswd-generator/htpasswd-generator.service.ts diff --git a/package.json b/package.json index 0275c2e1..ed83b2fa 100644 --- a/package.json +++ b/package.json @@ -270,6 +270,7 @@ "ulid": "^2.3.0", "unicode-emoji-json": "^0.4.0", "unique-random": "^4.0.0", + "unixcrypt-browser": "^2.0.4", "unplugin-auto-import": "^0.16.4", "utf8": "^3.0.0", "uuid": "^11.0.5", @@ -363,7 +364,7 @@ "unplugin-icons": "^0.17.0", "unplugin-vue-components": "^0.25.0", "vite": "^4.4.9", - "vite-plugin-node-polyfills": "^0.22.0", + "vite-plugin-node-polyfills": "^0.23.0", "vite-plugin-pwa": "^1.0.0", "vite-plugin-vue-markdown": "^0.23.5", "vite-plugin-wasm": "^3.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8921fd8f..7b158c6c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -707,6 +707,9 @@ dependencies: unique-random: specifier: ^4.0.0 version: 4.0.0 + unixcrypt-browser: + specifier: ^2.0.4 + version: 2.0.4 unplugin-auto-import: specifier: ^0.16.4 version: 0.16.4(@vueuse/core@10.11.1)(rollup@2.79.2) @@ -983,8 +986,8 @@ devDependencies: specifier: ^4.4.9 version: 4.4.9(@types/node@18.19.75)(less@4.2.2) vite-plugin-node-polyfills: - specifier: ^0.22.0 - version: 0.22.0(rollup@2.79.2)(vite@4.4.9) + specifier: ^0.23.0 + version: 0.23.0(rollup@2.79.2)(vite@4.4.9) vite-plugin-pwa: specifier: ^1.0.0 version: 1.0.0(vite@4.4.9)(workbox-build@7.3.0)(workbox-window@7.3.0) @@ -5642,7 +5645,6 @@ packages: estree-walker: 2.0.2 picomatch: 4.0.2 rollup: 2.79.2 - dev: true /@rushstack/eslint-patch@1.2.0: resolution: {integrity: sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==} @@ -8035,10 +8037,10 @@ packages: /assert@2.1.0: resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.8 is-nan: 1.3.2 object-is: 1.1.6 - object.assign: 4.1.4 + object.assign: 4.1.7 util: 0.12.5 dev: true @@ -8091,10 +8093,6 @@ packages: engines: {node: '>= 4.0.0'} dev: true - /available-typed-arrays@1.0.5: - resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} - engines: {node: '>= 0.4'} - /available-typed-arrays@1.0.7: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} @@ -8420,13 +8418,6 @@ packages: moment-timezone: 0.5.47 dev: false - /call-bind-apply-helpers@1.0.1: - resolution: {integrity: sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==} - engines: {node: '>= 0.4'} - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - /call-bind-apply-helpers@1.0.2: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} engines: {node: '>= 0.4'} @@ -8434,13 +8425,6 @@ packages: es-errors: 1.3.0 function-bind: 1.1.2 - /call-bind@1.0.5: - resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==} - dependencies: - function-bind: 1.1.2 - get-intrinsic: 1.2.2 - set-function-length: 1.1.1 - /call-bind@1.0.8: resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==} engines: {node: '>= 0.4'} @@ -8450,13 +8434,6 @@ packages: get-intrinsic: 1.3.0 set-function-length: 1.2.2 - /call-bound@1.0.3: - resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==} - engines: {node: '>= 0.4'} - dependencies: - call-bind-apply-helpers: 1.0.1 - get-intrinsic: 1.2.7 - /call-bound@1.0.4: resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==} engines: {node: '>= 0.4'} @@ -9845,14 +9822,6 @@ packages: clone: 1.0.4 dev: true - /define-data-property@1.1.1: - resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==} - engines: {node: '>= 0.4'} - dependencies: - get-intrinsic: 1.3.0 - gopd: 1.2.0 - has-property-descriptors: 1.0.2 - /define-data-property@1.1.4: resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} @@ -9870,8 +9839,8 @@ packages: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.1 - has-property-descriptors: 1.0.1 + define-data-property: 1.1.4 + has-property-descriptors: 1.0.2 object-keys: 1.1.1 /defined@1.0.1: @@ -10253,18 +10222,18 @@ packages: dependencies: array-buffer-byte-length: 1.0.0 arraybuffer.prototype.slice: 1.0.2 - available-typed-arrays: 1.0.5 + available-typed-arrays: 1.0.7 call-bind: 1.0.8 es-set-tostringtag: 2.0.2 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.2 + get-intrinsic: 1.3.0 get-symbol-description: 1.0.0 globalthis: 1.0.3 - gopd: 1.0.1 - has-property-descriptors: 1.0.1 + gopd: 1.2.0 + has-property-descriptors: 1.0.2 has-proto: 1.0.1 - has-symbols: 1.0.3 + has-symbols: 1.1.0 hasown: 2.0.2 internal-slot: 1.0.6 is-array-buffer: 3.0.2 @@ -10273,14 +10242,14 @@ packages: is-regex: 1.2.1 is-shared-array-buffer: 1.0.2 is-string: 1.0.7 - is-typed-array: 1.1.12 + is-typed-array: 1.1.15 is-weakref: 1.0.2 object-inspect: 1.13.3 object-keys: 1.1.1 - object.assign: 4.1.4 + object.assign: 4.1.7 regexp.prototype.flags: 1.5.1 safe-array-concat: 1.0.1 - safe-regex-test: 1.0.0 + safe-regex-test: 1.1.0 string.prototype.trim: 1.2.10 string.prototype.trimend: 1.0.7 string.prototype.trimstart: 1.0.7 @@ -10289,7 +10258,7 @@ packages: typed-array-byte-offset: 1.0.0 typed-array-length: 1.0.4 unbox-primitive: 1.0.2 - which-typed-array: 1.1.13 + which-typed-array: 1.1.18 dev: false /es-abstract@1.23.9: @@ -10300,7 +10269,7 @@ packages: arraybuffer.prototype.slice: 1.0.4 available-typed-arrays: 1.0.7 call-bind: 1.0.8 - call-bound: 1.0.3 + call-bound: 1.0.4 data-view-buffer: 1.0.2 data-view-byte-length: 1.0.2 data-view-byte-offset: 1.0.1 @@ -10310,7 +10279,7 @@ packages: es-set-tostringtag: 2.1.0 es-to-primitive: 1.3.0 function.prototype.name: 1.1.8 - get-intrinsic: 1.2.7 + get-intrinsic: 1.3.0 get-proto: 1.0.1 get-symbol-description: 1.1.0 globalthis: 1.0.4 @@ -11478,19 +11447,11 @@ packages: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} dev: true - /get-intrinsic@1.2.2: - resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==} - dependencies: - function-bind: 1.1.2 - has-proto: 1.0.1 - has-symbols: 1.1.0 - hasown: 2.0.2 - /get-intrinsic@1.2.7: resolution: {integrity: sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==} engines: {node: '>= 0.4'} dependencies: - call-bind-apply-helpers: 1.0.1 + call-bind-apply-helpers: 1.0.2 es-define-property: 1.0.1 es-errors: 1.3.0 es-object-atoms: 1.1.1 @@ -11500,6 +11461,7 @@ packages: has-symbols: 1.1.0 hasown: 2.0.2 math-intrinsics: 1.1.0 + dev: false /get-intrinsic@1.3.0: resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} @@ -11762,7 +11724,8 @@ packages: /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: - get-intrinsic: 1.2.2 + get-intrinsic: 1.3.0 + dev: false /gopd@1.2.0: resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} @@ -11860,11 +11823,6 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - /has-property-descriptors@1.0.1: - resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==} - dependencies: - get-intrinsic: 1.3.0 - /has-property-descriptors@1.0.2: resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} dependencies: @@ -11873,6 +11831,7 @@ packages: /has-proto@1.0.1: resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} engines: {node: '>= 0.4'} + dev: false /has-proto@1.2.0: resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==} @@ -11880,20 +11839,10 @@ packages: dependencies: dunder-proto: 1.0.1 - /has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - /has-symbols@1.1.0: resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} - /has-tostringtag@1.0.0: - resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} - engines: {node: '>= 0.4'} - dependencies: - has-symbols: 1.1.0 - /has-tostringtag@1.0.2: resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} engines: {node: '>= 0.4'} @@ -12277,7 +12226,7 @@ packages: dependencies: get-intrinsic: 1.3.0 hasown: 2.0.2 - side-channel: 1.0.4 + side-channel: 1.1.0 dev: false /internal-slot@1.1.0: @@ -12371,7 +12320,7 @@ packages: resolution: {integrity: sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==} engines: {node: '>= 0.4'} dependencies: - call-bound: 1.0.3 + call-bound: 1.0.4 has-tostringtag: 1.0.2 /is-array-buffer@3.0.2: @@ -12379,7 +12328,7 @@ packages: dependencies: call-bind: 1.0.8 get-intrinsic: 1.3.0 - is-typed-array: 1.1.12 + is-typed-array: 1.1.15 dev: false /is-array-buffer@3.0.5: @@ -12533,7 +12482,7 @@ packages: resolution: {integrity: sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==} engines: {node: '>= 0.4'} dependencies: - call-bound: 1.0.3 + call-bound: 1.0.4 get-proto: 1.0.1 has-tostringtag: 1.0.2 safe-regex-test: 1.1.0 @@ -12708,7 +12657,7 @@ packages: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: false /is-string@1.1.1: @@ -12732,12 +12681,6 @@ packages: has-symbols: 1.1.0 safe-regex-test: 1.1.0 - /is-typed-array@1.1.12: - resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==} - engines: {node: '>= 0.4'} - dependencies: - which-typed-array: 1.1.13 - /is-typed-array@1.1.15: resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==} engines: {node: '>= 0.4'} @@ -14462,15 +14405,6 @@ packages: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} engines: {node: '>= 0.4'} - /object.assign@4.1.4: - resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - has-symbols: 1.0.3 - object-keys: 1.1.1 - /object.assign@4.1.7: resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==} engines: {node: '>= 0.4'} @@ -14526,7 +14460,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.8 - call-bound: 1.0.3 + call-bound: 1.0.4 define-properties: 1.2.1 es-object-atoms: 1.1.1 dev: false @@ -15039,7 +14973,6 @@ packages: /picomatch@4.0.2: resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} engines: {node: '>=12'} - dev: true /pify@4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} @@ -15664,6 +15597,11 @@ packages: ret: 0.2.2 dev: false + /random-int@3.0.0: + resolution: {integrity: sha512-QvewnOwigesW2WFyTHiQzR6XUUcSQO/BqmfgRz5N5GpGrKQnTf7ebMz8UtuwaET8IfO1n0wLx8/fHsI8E0Jpow==} + engines: {node: '>=12'} + dev: false + /random-js@2.1.0: resolution: {integrity: sha512-CRUyWmnzmZBA7RZSVGq0xMqmgCyPPxbiKNLFA5ud7KenojVX2s7Gv+V7eB52beKTPGxWRnVZ7D/tCIgYJJ8vNQ==} dev: false @@ -16087,8 +16025,8 @@ packages: engines: {node: '>=0.4'} dependencies: call-bind: 1.0.8 - call-bound: 1.0.3 - get-intrinsic: 1.2.7 + call-bound: 1.0.4 + get-intrinsic: 1.3.0 has-symbols: 1.1.0 isarray: 2.0.5 @@ -16109,14 +16047,6 @@ packages: es-errors: 1.3.0 isarray: 2.0.5 - /safe-regex-test@1.0.0: - resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==} - dependencies: - call-bind: 1.0.8 - get-intrinsic: 1.3.0 - is-regex: 1.2.1 - dev: false - /safe-regex-test@1.1.0: resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==} engines: {node: '>= 0.4'} @@ -16250,15 +16180,6 @@ packages: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: false - /set-function-length@1.1.1: - resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==} - engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - get-intrinsic: 1.3.0 - gopd: 1.2.0 - has-property-descriptors: 1.0.2 - /set-function-length@1.2.2: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} @@ -16296,7 +16217,6 @@ packages: dependencies: inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /sharp@0.33.5: resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==} @@ -16375,14 +16295,6 @@ packages: object-inspect: 1.13.3 side-channel-map: 1.0.1 - /side-channel@1.0.4: - resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} - dependencies: - call-bind: 1.0.8 - get-intrinsic: 1.3.0 - object-inspect: 1.13.3 - dev: false - /side-channel@1.1.0: resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==} engines: {node: '>= 0.4'} @@ -16764,7 +16676,7 @@ packages: resolution: {integrity: sha512-699Ibssmj/awVzvdNk4g83/Iu8U9vDohzmA/ly2BrQWGhamuY4Tlvs5XKmKliDt3ky6SKbE1bzPhASKCFlx9Sg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.8 define-properties: 1.2.1 string.prototype.trimstart: 1.0.7 dev: false @@ -16773,7 +16685,7 @@ packages: resolution: {integrity: sha512-hoOq56oRFnnfDuXNy2lGHiwT77MehHv9d0zGfRZ8QdC+4zjrkFB9vd5i/zYTd/ymFBd4YxtbdgHt3U6ksGeuBw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.8 define-properties: 1.2.1 string.prototype.trimend: 1.0.7 dev: false @@ -17472,7 +17384,7 @@ packages: dependencies: call-bind: 1.0.8 get-intrinsic: 1.3.0 - is-typed-array: 1.1.12 + is-typed-array: 1.1.15 dev: false /typed-array-buffer@1.0.3: @@ -17490,7 +17402,7 @@ packages: call-bind: 1.0.8 for-each: 0.3.3 has-proto: 1.0.1 - is-typed-array: 1.1.12 + is-typed-array: 1.1.15 dev: false /typed-array-byte-length@1.0.3: @@ -17507,11 +17419,11 @@ packages: resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==} engines: {node: '>= 0.4'} dependencies: - available-typed-arrays: 1.0.5 + available-typed-arrays: 1.0.7 call-bind: 1.0.8 for-each: 0.3.3 has-proto: 1.0.1 - is-typed-array: 1.1.12 + is-typed-array: 1.1.15 dev: false /typed-array-byte-offset@1.0.4: @@ -17531,7 +17443,7 @@ packages: dependencies: call-bind: 1.0.8 for-each: 0.3.3 - is-typed-array: 1.1.12 + is-typed-array: 1.1.15 dev: false /typed-array-length@1.0.7: @@ -17723,11 +17635,11 @@ packages: /unimport@3.0.8(rollup@2.79.2): resolution: {integrity: sha512-AOt6xj3QMwqcTZRPB+NhFkyVEjCKnpTVoPm5x6424zz2NYYtCfym2bpJofzPHIJKPNIh5ko2/t2q46ZIMgdmbw==} dependencies: - '@rollup/pluginutils': 5.0.2(rollup@2.79.2) + '@rollup/pluginutils': 5.1.4(rollup@2.79.2) escape-string-regexp: 5.0.0 fast-glob: 3.3.1 local-pkg: 0.4.3 - magic-string: 0.30.2 + magic-string: 0.30.17 mlly: 1.4.0 pathe: 1.1.1 pkg-types: 1.0.3 @@ -17804,6 +17716,15 @@ packages: engines: {node: '>= 10.0.0'} dev: true + /unixcrypt-browser@2.0.4: + resolution: {integrity: sha512-c1Onql8IVzUjQVW0jra39VEa4f8iIr1XAlZ2oOa0U094gM77rcbDbkcWMQux+j2Qqr7wFXByIcvL6CoL0DkkmQ==} + engines: {node: '>=18.0.0'} + dependencies: + buffer: 6.0.3 + random-int: 3.0.0 + sha.js: 2.4.11 + dev: false + /unocss-preset-scrollbar@0.2.1(unocss@0.57.7): resolution: {integrity: sha512-7ubHdOaUwr7xBn1glPpICNNsM2SZGjvWK5uRPNiQYsrZ9YFjsCGHk9x5S2R8pTkuMDQeiaSa/UQbYhjC8Fra5g==} peerDependencies: @@ -18067,8 +17988,8 @@ packages: inherits: 2.0.4 is-arguments: 1.2.0 is-generator-function: 1.1.0 - is-typed-array: 1.1.12 - which-typed-array: 1.1.13 + is-typed-array: 1.1.15 + which-typed-array: 1.1.18 dev: true /uuid-random@1.3.2: @@ -18243,10 +18164,10 @@ packages: - terser dev: true - /vite-plugin-node-polyfills@0.22.0(rollup@2.79.2)(vite@4.4.9): - resolution: {integrity: sha512-F+G3LjiGbG8QpbH9bZ//GSBr9i1InSTkaulfUHFa9jkLqVGORFBoqc2A/Yu5Mmh1kNAbiAeKeK+6aaQUf3x0JA==} + /vite-plugin-node-polyfills@0.23.0(rollup@2.79.2)(vite@4.4.9): + resolution: {integrity: sha512-4n+Ys+2bKHQohPBKigFlndwWQ5fFKwaGY6muNDMTb0fSQLyBzS+jjUNRZG9sKF0S/Go4ApG6LFnUGopjkILg3w==} peerDependencies: - vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 + vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 dependencies: '@rollup/plugin-inject': 5.0.5(rollup@2.79.2) node-stdlib-browser: 1.3.0 @@ -18852,16 +18773,6 @@ packages: resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==} dev: false - /which-typed-array@1.1.13: - resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==} - engines: {node: '>= 0.4'} - dependencies: - available-typed-arrays: 1.0.5 - call-bind: 1.0.8 - for-each: 0.3.3 - gopd: 1.0.1 - has-tostringtag: 1.0.0 - /which-typed-array@1.1.18: resolution: {integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==} engines: {node: '>= 0.4'} diff --git a/src/tools/htpasswd-generator/htpasswd-generator.service.test.ts b/src/tools/htpasswd-generator/htpasswd-generator.service.test.ts new file mode 100644 index 00000000..bc097ea6 --- /dev/null +++ b/src/tools/htpasswd-generator/htpasswd-generator.service.test.ts @@ -0,0 +1,26 @@ +import { describe, expect, it } from 'vitest'; +import { generateHtpasswd } from './htpasswd-generator.service'; + +describe('htpasswd-generator', () => { + it('generate correct entries', () => { + const commonValues = { username: 'a', password: 'a' }; + + expect(generateHtpasswd({ ...commonValues, saltRounds: 10, algorithm: 'bcrypt' })).toContain('a:$2a$10$'); + expect(generateHtpasswd({ ...commonValues, salt: 'k9azwE5H', algorithm: 'apr1' })).toBe('a:$apr1$k9azwE5H$zIyj4gqCWXiwB2Iof6jHf1'); + expect(generateHtpasswd({ ...commonValues, salt: 'xs4x6VWJ', algorithm: 'md5' })).toBe('a:$1$xs4x6VWJ$lOH0fBF6QyWdTOEeqcFnP/'); + expect(generateHtpasswd({ ...commonValues, salt: 'grEPbuEp', algorithm: 'sha256' })).toBe('a:$5$grEPbuEp$DUmEMT5C4TRgZCs9ZFKOJZ/IgR5FJIOUH0dasQFPw57'); + expect(generateHtpasswd({ ...commonValues, salt: 'ud.q0DEx', algorithm: 'sha512' })).toBe('a:$6$ud.q0DEx$qEMZW6k/1q3ABm4af1WrFdUj1Mc2vCFxnVNHy/pDyk1L8JjoNwzRABgAHnpRON/xrdD/f9Neo6HNIU1z1LQk9.'); + expect(generateHtpasswd({ ...commonValues, salt: 'Uk8SVGLsBuSmD75R', algorithm: 'sha512' })).toBe('a:$6$Uk8SVGLsBuSmD75R$GKnMHXxioi7K97EOtIypnjBLQQVLRyMzF1FTjNhvULyuEDOWdYngkgNTxxAdYchQ9Q0BRC3gka/NSA5RoOFzY.'); + }); + + it('generate correct entries (unicode)', () => { + const commonValues = { username: 'a', password: 'àùé' }; + + expect(generateHtpasswd({ ...commonValues, saltRounds: 10, algorithm: 'bcrypt' })).toContain('a:$2a$10$'); + expect(() => generateHtpasswd({ ...commonValues, salt: 'mL016JCr', algorithm: 'apr1' })).toThrow(); + expect(() => generateHtpasswd({ ...commonValues, salt: 'YshCU1p1', algorithm: 'md5' })).toThrow(); + expect(generateHtpasswd({ ...commonValues, salt: 'Rojf48Kp', algorithm: 'sha256' })).toBe('a:$5$Rojf48Kp$/dY3S.yDqW2ZH/YKrF85q6JszyP.bhIF/Qu31Q49Oa5'); + expect(generateHtpasswd({ ...commonValues, salt: '1BPDHHko', algorithm: 'sha512' })).toBe('a:$6$1BPDHHko$jKZNRvgloMD2eAyyPRZt59hOifLwCK0FCSNr35eVgQd0tK0LJQWIp1IsmomVjHWUjiSWjSiP9AGO.G8FbkV3a.'); + expect(generateHtpasswd({ ...commonValues, salt: 'Uk8SVGLsBuSmD75R', algorithm: 'sha512' })).toBe('a:$6$Uk8SVGLsBuSmD75R$j7tejonAnUpOkwVTzTwQnfmq14SDJsGaFvW67m2pLCeaCjy.IT0aniZaRFnx3Azh9x5Lui60F76F9K6mZRbma.'); + }); +}); diff --git a/src/tools/htpasswd-generator/htpasswd-generator.service.ts b/src/tools/htpasswd-generator/htpasswd-generator.service.ts new file mode 100644 index 00000000..3d09ff3a --- /dev/null +++ b/src/tools/htpasswd-generator/htpasswd-generator.service.ts @@ -0,0 +1,56 @@ +import { hashSync } from 'bcryptjs'; +import { encrypt } from 'unixcrypt-browser'; +import md5 from 'apache-md5'; +import { multiRandFromArray } from '@/utils/random'; + +const itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; + +export function generateHtpasswd({ + username, + password, + algorithm, + salt = null, + saltRounds = 10, +}: { + username: string + password: string + algorithm: 'bcrypt' | 'md5' | 'apr1' | 'sha256' | 'sha512' + salt?: string | null + saltRounds?: number +}): string { + const generateSalt = (length: number) => multiRandFromArray([...itoa64], length).join(''); + let hash: string; + const finalSalt = salt || generateSalt(algorithm === 'sha512' ? 16 : 8); + // eslint-disable-next-line no-control-regex + const non_ascii = /[^\x00-\x7F]/; + + switch (algorithm) { + case 'bcrypt': + hash = hashSync(password, saltRounds); + break; + case 'md5': + + if (non_ascii.test(password)) { + throw new Error('MD5 does not currently support non ASCII characters'); + } + hash = md5(password, `$1$${finalSalt}`); + break; + case 'apr1': + + if (non_ascii.test(password)) { + throw new Error('MD5 does not currently support non ASCII characters'); + } + hash = md5(password, `$apr1$${finalSalt}`); + break; + case 'sha256': + hash = encrypt(password, `$5$${finalSalt}`); + break; + case 'sha512': + hash = encrypt(password, `$6$${finalSalt}`); + break; + default: + throw new Error('Unsupported algorithm'); + } + + return `${username}:${hash}`; +} diff --git a/src/tools/htpasswd-generator/htpasswd-generator.vue b/src/tools/htpasswd-generator/htpasswd-generator.vue index 6d947ca6..fed42566 100644 --- a/src/tools/htpasswd-generator/htpasswd-generator.vue +++ b/src/tools/htpasswd-generator/htpasswd-generator.vue @@ -1,6 +1,5 @@ @@ -44,10 +50,11 @@ const htpasswd = computed(() => { - + diff --git a/src/utils/random.ts b/src/utils/random.ts index 02df9479..9d3c4772 100644 --- a/src/utils/random.ts +++ b/src/utils/random.ts @@ -2,6 +2,8 @@ const random = () => Math.random(); const randFromArray = (array: unknown[]) => array[Math.floor(random() * array.length)]; +const multiRandFromArray = (array: unknown[], length: number) => Array.from({ length }, () => array[Math.floor(random() * array.length)]); + const randIntFromInterval = (min: number, max: number) => Math.floor(random() * (max - min) + min); // Durstenfeld shuffle @@ -22,6 +24,7 @@ const generateRandomId = () => `id-${random().toString(36).substring(2, 12)}`; export { randFromArray, + multiRandFromArray, randIntFromInterval, random, shuffleArray,