Merge 97544530c9 into e1b4f9aafe

package.json

@@ -47,6 +47,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/head": "^1.0.0",
     "@vueuse/router": "^10.0.0",
+    "apache-md5": "^1.1.8",
     "bcryptjs": "^2.4.3",
     "change-case": "^4.1.2",
     "colord": "^2.9.3",
@@ -82,6 +83,7 @@
     "plausible-tracker": "^0.3.8",
     "qrcode": "^1.5.1",
     "sql-formatter": "^13.0.0",
+    "sshpk": "^1.18.0",
     "ua-parser-js": "^1.0.35",
     "ulid": "^2.3.0",
     "unicode-emoji-json": "^0.4.0",
@@ -111,6 +113,7 @@
     "@types/node": "^18.15.11",
     "@types/node-forge": "^1.3.2",
     "@types/qrcode": "^1.5.0",
+    "@types/sshpk": "^1.17.4",
     "@types/ua-parser-js": "^0.7.36",
     "@types/uuid": "^9.0.0",
     "@unocss/eslint-config": "^0.57.0",
@@ -132,6 +135,7 @@
     "unplugin-icons": "^0.17.0",
     "unplugin-vue-components": "^0.25.0",
     "vite": "^4.4.9",
+    "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-pwa": "^0.16.0",
     "vite-plugin-vue-markdown": "^0.23.5",
     "vite-svg-loader": "^4.0.0",

src/components/TextareaCopyable.vue

@@ -16,6 +16,7 @@ const props = withDefaults(
     language?: string
     copyPlacement?: 'top-right' | 'bottom-right' | 'outside' | 'none'
     copyMessage?: string
+    wordWrap?: boolean
   }>(),
   {
     followHeightOf: null,
@@ -47,7 +48,7 @@ const tooltipText = computed(() => isJustCopied.value ? 'Copied!' : copyMessage.
         :style="height ? `min-height: ${height - 40 /* card padding */ + 10 /* negative margin compensation */}px` : ''"
       >
         <n-config-provider :hljs="hljs">
-          <n-code :code="value" :language="language" :trim="false" data-test-id="area-content" />
+          <n-code :code="value" :language="language" :word-wrap="wordWrap" :trim="false" data-test-id="area-content" />
         </n-config-provider>
       </n-scrollbar>
       <div absolute right-10px top-10px>

src/tools/htpasswd-generator/htpasswd-generator.vue

@@ -0,0 +1,60 @@
+<script setup lang="ts">
+import { hashSync } from 'bcryptjs';
+import md5 from 'apache-md5';
+import TextareaCopyable from '@/components/TextareaCopyable.vue';
+
+const username = ref('');
+const password = ref('');
+const hashMethod = ref('bcrypt');
+const saltCount = ref(10);
+
+const htpasswd = computed(() => {
+  if (username.value === '' || password.value === '') {
+    return '# username and password must not be empty';
+  }
+  let hash;
+  if (hashMethod.value === 'md5') {
+    hash = md5(password.value);
+  }
+  else {
+    hash = hashSync(password.value, saltCount.value);
+  }
+  return `${username.value}:${hash}`;
+});
+</script>
+
+<template>
+  <div>
+    <c-input-text
+      v-model:value="username"
+      label="Username"
+      placeholder="Your username..."
+      clearable raw-text mb-5
+    />
+    <c-input-text
+      v-model:value="password"
+      label="Password"
+      placeholder="Your password..."
+      clearable
+      raw-text
+      mb-2
+      type="password"
+    />
+
+    <c-select
+      v-model:value="hashMethod"
+      label="Hash method:"
+      :options="['bcrypt', 'md5']"
+    />
+
+    <n-form-item v-if="hashMethod === 'bcrypt'" label="Salt count: " label-placement="left" label-width="120">
+      <n-input-number v-model:value="saltCount" placeholder="Salt rounds..." :max="100" :min="0" w-full />
+    </n-form-item>
+
+    <n-divider />
+
+    <n-form-item label="htpasswd content:">
+      <TextareaCopyable :value="htpasswd" />
+    </n-form-item>
+  </div>
+</template>

src/tools/htpasswd-generator/index.ts

@@ -0,0 +1,12 @@
+import { PasswordRound } from '@vicons/material';
+import { defineTool } from '../tool';
+
+export const tool = defineTool({
+  name: 'Htpasswd/htaccess generator',
+  path: '/htpasswd-generator',
+  description: 'htpassword/htaccess user/password generator',
+  keywords: ['htpasswd', 'htaccess', 'bcrypt', 'password'],
+  component: () => import('./htpasswd-generator.vue'),
+  icon: PasswordRound,
+  createdAt: new Date('2024-02-20'),
+});

src/tools/index.ts

@@ -5,6 +5,7 @@ import { tool as basicAuthGenerator } from './basic-auth-generator';
 import { tool as asciiTextDrawer } from './ascii-text-drawer';
 
 import { tool as textToUnicode } from './text-to-unicode';
+import { tool as htpasswdGenerator } from './htpasswd-generator';
 import { tool as safelinkDecoder } from './safelink-decoder';
 import { tool as pdfSignatureChecker } from './pdf-signature-checker';
 import { tool as numeronymGenerator } from './numeronym-generator';
@@ -117,6 +118,7 @@ export const toolsByCategory: ToolCategory[] = [
       urlParser,
       deviceInformation,
       basicAuthGenerator,
+      htpasswdGenerator,
       metaTagGenerator,
       otpCodeGeneratorAndValidator,
       mimeTypes,

vite.config.ts

@@ -1,5 +1,6 @@
 import { resolve } from 'node:path';
 import { URL, fileURLToPath } from 'node:url';
+import { nodePolyfills } from 'vite-plugin-node-polyfills';
 
 import VueI18n from '@intlify/unplugin-vue-i18n/vite';
 import vue from '@vitejs/plugin-vue';
@@ -97,6 +98,7 @@ export default defineConfig({
       resolvers: [NaiveUiResolver(), IconsResolver({ prefix: 'icon' })],
     }),
     Unocss(),
+    nodePolyfills(),
   ],
   base: baseUrl,
   resolve: {