From 8bcca2269449d3c63d609df0c83102c00bde68f1 Mon Sep 17 00:00:00 2001 From: Corentin Thomasset Date: Sun, 16 Apr 2023 13:55:15 +0200 Subject: [PATCH 1/4] feat(new tool): argon2 password hashing and verification --- package.json | 1 + pnpm-lock.yaml | 7 ++ .../argon2-hash-generator.e2e.spec.ts | 37 ++++++ .../argon2-hash-generator.vue | 107 ++++++++++++++++++ src/tools/argon2-hash-generator/index.ts | 12 ++ src/tools/bcrypt/bcrypt.vue | 20 +--- src/tools/index.ts | 13 ++- 7 files changed, 179 insertions(+), 18 deletions(-) create mode 100644 src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts create mode 100644 src/tools/argon2-hash-generator/argon2-hash-generator.vue create mode 100644 src/tools/argon2-hash-generator/index.ts diff --git a/package.json b/package.json index f708199a..85e9e956 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "date-fns": "^2.29.3", "figue": "^1.2.0", "fuse.js": "^6.6.2", + "hash-wasm": "^4.9.0", "highlight.js": "^11.7.0", "json5": "^2.2.3", "jwt-decode": "^3.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e1b8715..b1c5a0ec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,6 +64,9 @@ dependencies: fuse.js: specifier: ^6.6.2 version: 6.6.2 + hash-wasm: + specifier: ^4.9.0 + version: 4.9.0 highlight.js: specifier: ^11.7.0 version: 11.7.0 @@ -5012,6 +5015,10 @@ packages: resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==} dev: true + /hash-wasm@4.9.0: + resolution: {integrity: sha512-7SW7ejyfnRxuOc7ptQHSf4LDoZaWOivfzqw+5rpcQku0nHfmicPKE51ra9BiRLAmT8+gGLestr1XroUkqdjL6w==} + dev: false + /header-case@2.0.4: resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==} dependencies: diff --git a/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts b/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts new file mode 100644 index 00000000..4492c1ea --- /dev/null +++ b/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts @@ -0,0 +1,37 @@ +import { test, expect } from '@playwright/test'; + +test.describe('Tool - Argon2 hash generator', () => { + test.beforeEach(async ({ page }) => { + await page.goto('/argon2-hash-generator'); + }); + + test('Has correct title', async ({ page }) => { + await expect(page).toHaveTitle('Argon2 hash generator - IT Tools'); + }); + + test('hash a string a verify that the result match', async ({ page }) => { + await page.getByTestId('input').fill('azerty'); + + await new Promise((resolve) => setTimeout(resolve, 500)); + const hash = await page.getByTestId('hash').inputValue(); + + await page.getByTestId('compare-string').fill('azerty'); + await page.getByTestId('compare-hash').fill(hash); + + await new Promise((resolve) => setTimeout(resolve, 500)); + const doTheyMatch = await page.getByTestId('do-they-match').innerText(); + + expect(doTheyMatch.trim()).toEqual('Yes'); + }); + + test('hash a string a verify that the does not result match another string', async ({ page }) => { + await page.getByTestId('input').fill('azerty'); + const hash = await page.getByTestId('hash').inputValue(); + + await page.getByTestId('compare-string').fill('NOT AZERTY'); + await page.getByTestId('compare-hash').fill(hash); + const doTheyMatch = await page.getByTestId('do-they-match').innerText(); + + expect(doTheyMatch.trim()).toEqual('No'); + }); +}); diff --git a/src/tools/argon2-hash-generator/argon2-hash-generator.vue b/src/tools/argon2-hash-generator/argon2-hash-generator.vue new file mode 100644 index 00000000..3f210202 --- /dev/null +++ b/src/tools/argon2-hash-generator/argon2-hash-generator.vue @@ -0,0 +1,107 @@ + + + diff --git a/src/tools/argon2-hash-generator/index.ts b/src/tools/argon2-hash-generator/index.ts new file mode 100644 index 00000000..26b12321 --- /dev/null +++ b/src/tools/argon2-hash-generator/index.ts @@ -0,0 +1,12 @@ +import { Lock } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'Argon2 hash generator', + path: '/argon2-hash-generator', + description: 'Hash and compare string (password) using Argon2', + keywords: ['argon2', 'hash', 'generator', 'password', 'salt', 'crypto', 'security'], + component: () => import('./argon2-hash-generator.vue'), + icon: Lock, + createdAt: new Date('2023-04-16'), +}); diff --git a/src/tools/bcrypt/bcrypt.vue b/src/tools/bcrypt/bcrypt.vue index 4104c744..b0df627d 100644 --- a/src/tools/bcrypt/bcrypt.vue +++ b/src/tools/bcrypt/bcrypt.vue @@ -37,7 +37,7 @@ -
- {{ compareMatch ? 'Yes' : 'No' }} -
+ Yes + No
@@ -57,9 +56,6 @@ import { computed, ref } from 'vue'; import { hashSync, compareSync } from 'bcryptjs'; import { useCopy } from '@/composable/copy'; -import { useThemeVars } from 'naive-ui'; - -const themeVars = useThemeVars(); const input = ref(''); const saltCount = ref(10); @@ -70,13 +66,3 @@ const compareString = ref(''); const compareHash = ref(''); const compareMatch = computed(() => compareSync(compareString.value, compareHash.value)); - - diff --git a/src/tools/index.ts b/src/tools/index.ts index ad6167e1..dcd2fe3b 100644 --- a/src/tools/index.ts +++ b/src/tools/index.ts @@ -1,6 +1,7 @@ import { tool as base64FileConverter } from './base64-file-converter'; import { tool as base64StringConverter } from './base64-string-converter'; import { tool as basicAuthGenerator } from './basic-auth-generator'; +import { tool as argon2HashGenerator } from './argon2-hash-generator'; import { tool as httpStatusCodes } from './http-status-codes'; import { tool as yamlToJson } from './yaml-to-json-converter'; import { tool as jsonToYaml } from './json-to-yaml-converter'; @@ -56,7 +57,17 @@ import { tool as macAddressLookup } from './mac-address-lookup'; export const toolsByCategory: ToolCategory[] = [ { name: 'Crypto', - components: [tokenGenerator, hashText, bcrypt, uuidGenerator, cypher, bip39, hmacGenerator, rsaKeyPairGenerator], + components: [ + tokenGenerator, + hashText, + bcrypt, + argon2HashGenerator, + uuidGenerator, + cypher, + bip39, + hmacGenerator, + rsaKeyPairGenerator, + ], }, { name: 'Converter', From 08aa02c115793177dbbc1f745355bba79e266efb Mon Sep 17 00:00:00 2001 From: sunnydanu Date: Mon, 28 Oct 2024 19:59:09 +0530 Subject: [PATCH 2/4] fix(lint): lint issue fixed --- .../argon2-hash-generator.e2e.spec.ts | 6 +- .../argon2-hash-generator.vue | 70 ++++++++++--------- src/tools/bcrypt/bcrypt.vue | 43 +++++++----- src/tools/index.ts | 7 +- 4 files changed, 68 insertions(+), 58 deletions(-) diff --git a/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts b/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts index 4492c1ea..fbabcc9b 100644 --- a/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts +++ b/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts @@ -1,4 +1,4 @@ -import { test, expect } from '@playwright/test'; +import { expect, test } from '@playwright/test'; test.describe('Tool - Argon2 hash generator', () => { test.beforeEach(async ({ page }) => { @@ -12,13 +12,13 @@ test.describe('Tool - Argon2 hash generator', () => { test('hash a string a verify that the result match', async ({ page }) => { await page.getByTestId('input').fill('azerty'); - await new Promise((resolve) => setTimeout(resolve, 500)); + await new Promise(resolve => setTimeout(resolve, 500)); const hash = await page.getByTestId('hash').inputValue(); await page.getByTestId('compare-string').fill('azerty'); await page.getByTestId('compare-hash').fill(hash); - await new Promise((resolve) => setTimeout(resolve, 500)); + await new Promise(resolve => setTimeout(resolve, 500)); const doTheyMatch = await page.getByTestId('do-they-match').innerText(); expect(doTheyMatch.trim()).toEqual('Yes'); diff --git a/src/tools/argon2-hash-generator/argon2-hash-generator.vue b/src/tools/argon2-hash-generator/argon2-hash-generator.vue index 3f210202..ea809d6e 100644 --- a/src/tools/argon2-hash-generator/argon2-hash-generator.vue +++ b/src/tools/argon2-hash-generator/argon2-hash-generator.vue @@ -1,3 +1,35 @@ + + - - diff --git a/src/tools/bcrypt/bcrypt.vue b/src/tools/bcrypt/bcrypt.vue index db1fc01f..6791ef0b 100644 --- a/src/tools/bcrypt/bcrypt.vue +++ b/src/tools/bcrypt/bcrypt.vue @@ -1,3 +1,17 @@ + + - - diff --git a/src/tools/index.ts b/src/tools/index.ts index 3677ad6d..1070da26 100644 --- a/src/tools/index.ts +++ b/src/tools/index.ts @@ -102,11 +102,14 @@ export const toolsByCategory: ToolCategory[] = [ bcrypt, argon2HashGenerator, uuidGenerator, - ulidGenerator, cypher, + ulidGenerator, + cypher, bip39, hmacGenerator, rsaKeyPairGenerator, - , passwordStrengthAnalyser, pdfSignatureChecker], + passwordStrengthAnalyser, + pdfSignatureChecker, + ], }, { name: 'Converter', From d14f3e645a8f24bfb188c39b08176fea5449dd7b Mon Sep 17 00:00:00 2001 From: sunnydanu Date: Mon, 28 Oct 2024 21:34:26 +0530 Subject: [PATCH 3/4] fix(argon2): import updated --- components.d.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components.d.ts b/components.d.ts index 25b76cd6..f4172cea 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,6 +12,7 @@ declare module '@vue/runtime-core' { '404.page': typeof import('./src/pages/404.page.vue')['default'] About: typeof import('./src/pages/About.vue')['default'] App: typeof import('./src/App.vue')['default'] + Argon2HashGenerator: typeof import('./src/tools/argon2-hash-generator/argon2-hash-generator.vue')['default'] AsciiTextDrawer: typeof import('./src/tools/ascii-text-drawer/ascii-text-drawer.vue')['default'] 'Base.layout': typeof import('./src/layouts/base.layout.vue')['default'] Base64FileConverter: typeof import('./src/tools/base64-file-converter/base64-file-converter.vue')['default'] @@ -69,6 +70,7 @@ declare module '@vue/runtime-core' { DemoWrapper: typeof import('./src/ui/demo/demo-wrapper.vue')['default'] DeviceInformation: typeof import('./src/tools/device-information/device-information.vue')['default'] DiffViewer: typeof import('./src/tools/json-diff/diff-viewer/diff-viewer.vue')['default'] + DnsQueries: typeof import('./src/tools/dns-queries/dns-queries.vue')['default'] DockerRunToDockerComposeConverter: typeof import('./src/tools/docker-run-to-docker-compose-converter/docker-run-to-docker-compose-converter.vue')['default'] DynamicValues: typeof import('./src/tools/benchmark-builder/dynamic-values.vue')['default'] Editor: typeof import('./src/tools/html-wysiwyg-editor/editor/editor.vue')['default'] @@ -112,8 +114,8 @@ declare module '@vue/runtime-core' { IconMdiSearch: typeof import('~icons/mdi/search')['default'] IconMdiTranslate: typeof import('~icons/mdi/translate')['default'] IconMdiTriangleDown: typeof import('~icons/mdi/triangle-down')['default'] - ImageResizer: typeof import('./src/tools/image-resizer/image-resizer.vue')['default'] IconMdiVideo: typeof import('~icons/mdi/video')['default'] + ImageResizer: typeof import('./src/tools/image-resizer/image-resizer.vue')['default'] InputCopyable: typeof import('./src/components/InputCopyable.vue')['default'] IntegerBaseConverter: typeof import('./src/tools/integer-base-converter/integer-base-converter.vue')['default'] Ipv4AddressConverter: typeof import('./src/tools/ipv4-address-converter/ipv4-address-converter.vue')['default'] @@ -147,6 +149,7 @@ declare module '@vue/runtime-core' { NAlert: typeof import('naive-ui')['NAlert'] 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'] NCode: typeof import('naive-ui')['NCode'] NCollapseTransition: typeof import('naive-ui')['NCollapseTransition'] @@ -163,6 +166,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'] NInputNumber: typeof import('naive-ui')['NInputNumber'] NLayout: typeof import('naive-ui')['NLayout'] NLayoutSider: typeof import('naive-ui')['NLayoutSider'] From d3c850d0bfe3ccafda09824afa4cbc310c9a1adc Mon Sep 17 00:00:00 2001 From: sunnydanu Date: Mon, 28 Oct 2024 22:31:22 +0530 Subject: [PATCH 4/4] fix(argon2): fixed broken test case --- .../argon2-hash-generator/argon2-hash-generator.e2e.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts b/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts index fbabcc9b..b4cb5be4 100644 --- a/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts +++ b/src/tools/argon2-hash-generator/argon2-hash-generator.e2e.spec.ts @@ -6,7 +6,7 @@ test.describe('Tool - Argon2 hash generator', () => { }); test('Has correct title', async ({ page }) => { - await expect(page).toHaveTitle('Argon2 hash generator - IT Tools'); + await expect(page).toHaveTitle('GoDev.Run - Argon2 hash generator'); }); test('hash a string a verify that the result match', async ({ page }) => {