git-push-time 1.1.2 → 1.1.4

package/lib/prompt-helpers.js

@@ -30,7 +30,7 @@ function printOpenHeader(title, hintLines = []) {
 function printCloseWithAnswer(label, value) {
   const W = getW();
   const answer = value === BACK || value === undefined
-    ? chalk.hex('#FCD34D')('« Quay lại')
+    ? chalk.hex('#FCD34D')('« Go back')
     : chalk.hex('#34D399').bold(truncateVisual(String(value ?? ''), Math.max(10, W - 14)));
   console.log(
     boxRow(
@@ -49,7 +49,7 @@ function shortChoiceName(choices, value) {
   try {
     const found = (choices || []).find((c) => c && c.value === value);
     if (!found) return String(value ?? '');
-    // name có thể chứa màu chalk -> strip bằng cách lấy raw rồi cắt
+    // The name may contain Chalk colors; strip them before displaying it.
     return String(found.short || found.name || found.value || '').replace(/\u001b\[[0-9;]*m/g, '');
   } catch {
     return String(value ?? '');
@@ -82,13 +82,12 @@ const baseSelectTheme = {
 };
 
 function promptLine(label) {
-  // Dòng nhập liệu mang viền trái │ để thị giác nằm gọn trong khung
-  // đang mở phía trên (boxTop) và sẽ đóng (boxBottom) sau khi xong.
+  // Keep the input line inside the frame opened above and closed after completion.
   return `${BORDER('│')} ${ACCENT('❯')} ${chalk.whiteBright(cleanTitle(label))}`;
 }
 
 /**
- * Select nằm TRONG khung: header mở -> choices -> footer đóng + đáp án.
+ * Render a select inside a frame: open header, choices, then close with the answer.
  */
 export async function selectBox({ message, choices, hint, pageSize, ...rest }) {
   const { clearPromptOnDone: _ignore, theme: customTheme, ...cfg } = rest;
@@ -99,7 +98,7 @@ export async function selectBox({ message, choices, hint, pageSize, ...rest }) {
   try {
     value = await select(
       {
-        message: promptLine('Chọn'),
+        message: promptLine('Select'),
         choices,
         pageSize: pageSize || Math.min(12, (choices || []).length + 2),
         theme: { ...baseSelectTheme, ...(customTheme || {}) },
@@ -116,7 +115,7 @@ export async function selectBox({ message, choices, hint, pageSize, ...rest }) {
 }
 
 /**
- * Prompt select có sẵn lựa chọn « Quay lại (nằm trong khung).
+ * Select prompt with a built-in Back option.
  */
 export async function selectWithBack({ message, choices, hint, pageSize, ...rest }) {
   const hasBack = (choices || []).some((c) => c && c.value === BACK);
@@ -124,20 +123,20 @@ export async function selectWithBack({ message, choices, hint, pageSize, ...rest
     ? choices
     : [
         ...choices,
-        { name: '« Quay lại (bước trước)', value: BACK, description: 'Về bước trước / menu chính' }
+        { name: '« Go back (previous step)', value: BACK, description: 'Return to the previous step or main menu' }
       ];
-  const backHint = hint ?? '↑↓ di chuyển · Enter chọn · chọn « Quay lại để lùi bước';
+  const backHint = hint ?? '↑↓ move · Enter select · choose « Go back to return to the previous step';
   return await selectBox({ message, choices: finalChoices, hint: backHint, pageSize, ...rest });
 }
 
 /**
- * Prompt input nằm TRONG khung: header mở -> ô gõ (│ › ...) -> footer + đáp án.
+ * Render an input prompt inside a frame with a header and answer footer.
  */
-export async function inputBox({ message, promptLabel = 'Nhập', hint, default: def, validate, ...rest }) {
+export async function inputBox({ message, promptLabel = 'Enter', hint, default: def, validate, ...rest }) {
   const { clearPromptOnDone: _ignore, theme: customTheme, ...cfg } = rest;
   const hintLines = [];
   if (hint) hintLines.push(...(Array.isArray(hint) ? hint : [hint]));
-  if (def) hintLines.push(`Mặc định: ${def}`);
+  if (def) hintLines.push(`Default: ${def}`);
   printOpenHeader(message, hintLines);
 
   const wrappedValidate = (val) => {
@@ -171,24 +170,24 @@ export async function inputBox({ message, promptLabel = 'Nhập', hint, default:
 }
 
 /**
- * Prompt input có hướng dẫn gõ ".." để quay lại (nằm trong khung).
+ * Input prompt with instructions to type ".." to go back.
  */
 export async function inputWithBack({ message, hint, validate, ...rest }) {
-  const backHint = hint ?? 'Gõ ".." để quay lại bước trước';
+  const backHint = hint ?? 'Type ".." to return to the previous step';
   return await inputBox({ message, hint: backHint, validate, ...rest });
 }
 
 /**
- * Hỏi Tiếp tục / Quay lại menu / Thoát (nằm trong khung).
+ * Ask whether to continue, return to the menu, or exit.
  */
-export async function promptContinueOrBack(message = 'Bạn muốn tiếp tục hay quay lại?') {
+export async function promptContinueOrBack(message = 'Would you like to continue or go back?') {
   return await selectBox({
     message,
-    hint: 'Chọn bước tiếp theo',
+    hint: 'Choose what to do next',
     choices: [
-      { name: 'Tiếp tục', value: 'continue', description: 'Đi tiếp bước kế tiếp' },
-      { name: 'Quay lại bảng điều khiển', value: 'back', description: 'Về màn hình chọn hành động' },
-      { name: 'Thoát', value: 'exit', description: 'Dừng, không làm gì' }
+      { name: 'Continue', value: 'continue', description: 'Proceed to the next step' },
+      { name: 'Back to dashboard', value: 'back', description: 'Return to the action menu' },
+      { name: 'Exit', value: 'exit', description: 'Stop without continuing' }
     ],
   });
 }

package/lib/secrets.js

@@ -1,92 +1,92 @@
-import { spawnSync } from 'child_process';
-
-// Pattern quét secret phổ biến. Giữ ở mức precision cao để tránh false-positive.
-export const SECRET_PATTERNS = [
-  { id: 'npm-token', label: 'npm Access Token', regex: /npm_[A-Za-z0-9]{8,}/ },
-  { id: 'npm-authtoken', label: '_authToken trong .npmrc', regex: /_authToken\s*=\s*\S+/i },
-  { id: 'github-token', label: 'GitHub Token (ghp_/gho_/github_pat_)', regex: /\b(ghp_[A-Za-z0-9]{20,}|gho_[A-Za-z0-9]{20,}|github_pat_[A-Za-z0-9_]{40,})\b/ },
-  { id: 'aws-key', label: 'AWS Access Key (AKIA...)', regex: /\bAKIA[0-9A-Z]{16}\b/ },
-  { id: 'aws-secret', label: 'AWS Secret Key', regex: /aws_secret_access_key\s*=\s*\S+/i },
-  { id: 'private-key', label: 'Private Key (PEM)', regex: /-----BEGIN (RSA |EC |OPENSSH |DSA )?PRIVATE KEY-----/ },
-  { id: 'openai-key', label: 'OpenAI API Key', regex: /\bsk-(proj-)?[A-Za-z0-9_-]{20,}\b/ },
-  { id: 'slack-token', label: 'Slack Token', regex: /\bxox[baprs]-[A-Za-z0-9-]{10,}\b/ },
-  { id: 'google-key', label: 'Google API Key', regex: /\bAIza[0-9A-Za-z_-]{30,}\b/ },
-  { id: 'generic-password', label: 'Password gán cứng', regex: /\b(password|passwd|pwd)\s*[:=]\s*['"][^'"]{4,}['"]/i },
-];
-
-const SKIP_DIRS = ['node_modules/', '.git/', 'dist/', 'build/', '.next/'];
-const SKIP_FILES = ['package-lock.json', 'yarn.lock', 'pnpm-lock.yaml'];
-const MAX_FILE_BYTES = 512 * 1024; // bỏ qua file staged > 512KB
-const MAX_MATCHES_PER_FILE = 3;
-
-function listStagedFiles(cwd) {
-  try {
-    const r = spawnSync('git', ['diff', '--cached', '--name-only', '--diff-filter=ACM'], {
-      cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore']
-    });
-    if (r.status !== 0) return [];
-    return (r.stdout || '').split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
-  } catch {
-    return [];
-  }
-}
-
-function readStagedContent(file, cwd) {
-  try {
-    // Dùng spawnSync dạng mảng args (không qua shell) để tránh injection
-    // khi tên file chứa ký tự đặc biệt (", $, ;, &, |, ...).
-    const r = spawnSync('git', ['show', `:${file}`], {
-      cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'], maxBuffer: MAX_FILE_BYTES * 2
-    });
-    if (r.status !== 0) return null;
-    const content = r.stdout || '';
-    if (content.length > MAX_FILE_BYTES) return null; // file quá lớn, bỏ qua
-    if (content.includes('\0')) return null; // file binary
-    return content;
-  } catch {
-    return null;
-  }
-}
-
-function redactPreview(line) {
-  const s = line.trim().slice(0, 120);
-  // Che giữa secret, chỉ chừa 4 ký tự đầu/cuối
-  return s.replace(/([A-Za-z0-9_.-]{4})[A-Za-z0-9_.-]{6,}([A-Za-z0-9_.-]{2})?/g, '$1•••$2');
-}
-
-/**
- * Quét nội dung các file đã stage để tìm secret.
- * @param {string} cwd
- * @returns {{ file: string, type: string, line: number, preview: string }[]}
- */
-export function scanStagedContentForSecrets(cwd = process.cwd()) {
-  const findings = [];
-  const files = listStagedFiles(cwd).filter((f) => {
-    const normalized = String(f).replace(/\\/g, '/');
-    if (SKIP_DIRS.some((d) => normalized.startsWith(d) || normalized.includes('/' + d))) return false;
-    if (SKIP_FILES.includes(normalized.split('/').pop())) return false;
-    return true;
-  });
-
-  for (const file of files.slice(0, 100)) { // giới hạn 100 file để nhanh
-    const content = readStagedContent(file, cwd);
-    if (!content) continue;
-    const lines = content.split('\n');
-    let matchesInFile = 0;
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (!line || line.length > 2000) continue;
-      // Bỏ qua comment ví dụ trong docs? vẫn báo để user tự quyết
-      for (const p of SECRET_PATTERNS) {
-        if (p.regex.test(line)) {
-          findings.push({ file, type: p.label, line: i + 1, preview: redactPreview(line) });
-          matchesInFile++;
-          break; // mỗi dòng chỉ báo 1 lần
-        }
-      }
-      if (matchesInFile >= MAX_MATCHES_PER_FILE) break;
-      if (findings.length >= 20) return findings; // chặn spam
-    }
-  }
-  return findings;
-}
+import { spawnSync } from 'child_process';
+
+// Common secret patterns, tuned for high precision to reduce false positives.
+export const SECRET_PATTERNS = [
+  { id: 'npm-token', label: 'npm Access Token', regex: /npm_[A-Za-z0-9]{8,}/ },
+  { id: 'npm-authtoken', label: '_authToken trong .npmrc', regex: /_authToken\s*=\s*\S+/i },
+  { id: 'github-token', label: 'GitHub Token (ghp_/gho_/github_pat_)', regex: /\b(ghp_[A-Za-z0-9]{20,}|gho_[A-Za-z0-9]{20,}|github_pat_[A-Za-z0-9_]{40,})\b/ },
+  { id: 'aws-key', label: 'AWS Access Key (AKIA...)', regex: /\bAKIA[0-9A-Z]{16}\b/ },
+  { id: 'aws-secret', label: 'AWS Secret Key', regex: /aws_secret_access_key\s*=\s*\S+/i },
+  { id: 'private-key', label: 'Private Key (PEM)', regex: /-----BEGIN (RSA |EC |OPENSSH |DSA )?PRIVATE KEY-----/ },
+  { id: 'openai-key', label: 'OpenAI API Key', regex: /\bsk-(proj-)?[A-Za-z0-9_-]{20,}\b/ },
+  { id: 'slack-token', label: 'Slack Token', regex: /\bxox[baprs]-[A-Za-z0-9-]{10,}\b/ },
+  { id: 'google-key', label: 'Google API Key', regex: /\bAIza[0-9A-Za-z_-]{30,}\b/ },
+  { id: 'generic-password', label: 'Hard-coded password', regex: /\b(password|passwd|pwd)\s*[:=]\s*['"][^'"]{4,}['"]/i },
+];
+
+const SKIP_DIRS = ['node_modules/', '.git/', 'dist/', 'build/', '.next/'];
+const SKIP_FILES = ['package-lock.json', 'yarn.lock', 'pnpm-lock.yaml'];
+const MAX_FILE_BYTES = 512 * 1024; // Skip staged files larger than 512 KB.
+const MAX_MATCHES_PER_FILE = 3;
+
+function listStagedFiles(cwd) {
+  try {
+    const r = spawnSync('git', ['diff', '--cached', '--name-only', '--diff-filter=ACM'], {
+      cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore']
+    });
+    if (r.status !== 0) return [];
+    return (r.stdout || '').split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+
+function readStagedContent(file, cwd) {
+  try {
+    // Pass arguments as an array instead of using a shell to avoid injection
+    // when filenames contain special characters (", $, ;, &, |, ...).
+    const r = spawnSync('git', ['show', `:${file}`], {
+      cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'], maxBuffer: MAX_FILE_BYTES * 2
+    });
+    if (r.status !== 0) return null;
+    const content = r.stdout || '';
+    if (content.length > MAX_FILE_BYTES) return null; // File is too large; skip it.
+    if (content.includes('\0')) return null; // file binary
+    return content;
+  } catch {
+    return null;
+  }
+}
+
+function redactPreview(line) {
+  const s = line.trim().slice(0, 120);
+  // Mask the secret, leaving only the first four and last two characters.
+  return s.replace(/([A-Za-z0-9_.-]{4})[A-Za-z0-9_.-]{6,}([A-Za-z0-9_.-]{2})?/g, '$1•••$2');
+}
+
+/**
+ * Scan staged file contents for secrets.
+ * @param {string} cwd
+ * @returns {{ file: string, type: string, line: number, preview: string }[]}
+ */
+export function scanStagedContentForSecrets(cwd = process.cwd()) {
+  const findings = [];
+  const files = listStagedFiles(cwd).filter((f) => {
+    const normalized = String(f).replace(/\\/g, '/');
+    if (SKIP_DIRS.some((d) => normalized.startsWith(d) || normalized.includes('/' + d))) return false;
+    if (SKIP_FILES.includes(normalized.split('/').pop())) return false;
+    return true;
+  });
+
+  for (const file of files.slice(0, 100)) { // Limit to 100 files for speed.
+    const content = readStagedContent(file, cwd);
+    if (!content) continue;
+    const lines = content.split('\n');
+    let matchesInFile = 0;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      if (!line || line.length > 2000) continue;
+      // Still report matches in documentation examples so the user can decide.
+      for (const p of SECRET_PATTERNS) {
+        if (p.regex.test(line)) {
+          findings.push({ file, type: p.label, line: i + 1, preview: redactPreview(line) });
+          matchesInFile++;
+          break; // Report at most once per line.
+        }
+      }
+      if (matchesInFile >= MAX_MATCHES_PER_FILE) break;
+      if (findings.length >= 20) return findings; // Limit output to 20 findings.
+    }
+  }
+  return findings;
+}