dsh-db-tool 1.4.0 → 1.4.1

package/client/client.js

@@ -34,6 +34,8 @@ window.__ModuleLoader__.load({
 			urlMode: "URL 方式",
 			fieldsMode: "分字段方式",
 			url: "连接 URL（密码将自动拆入密钥存储）",
+			urlUser: "用户名（可选，自动注入 URL）",
+			urlPassword: "密码（可选，自动注入 URL；留空保持已存）",
 			fieldsHost: "主机地址",
 			fieldsPort: "端口",
 			fieldsUser: "用户名",
@@ -123,6 +125,8 @@ window.__ModuleLoader__.load({
 			urlMode: "URL",
 			fieldsMode: "Fields",
 			url: "Connection URL (password moved to secrets automatically)",
+			urlUser: "Username (optional, injected into URL)",
+			urlPassword: "Password (optional, injected into URL; blank keeps saved)",
 			fieldsHost: "Host",
 			fieldsPort: "Port",
 			fieldsUser: "User",
@@ -375,7 +379,7 @@ window.__ModuleLoader__.load({
 		}
 
 		/* ---------------- 连接管理 ---------------- */
-		const EMPTY_FORM = { id: "", kind: "mysql", name: "", mode: "url", url: "", host: "", port: "", user: "", password: "", database: "", ssl: false };
+		const EMPTY_FORM = { id: "", kind: "mysql", name: "", mode: "url", url: "", urlUser: "", urlPassword: "", host: "", port: "", user: "", password: "", database: "", ssl: false };
 
 		// 通用表格渲染：columns + rows（审计列表与查询结果共用）
 		function resultTable(columns, rows, cellTitles) {
@@ -457,6 +461,7 @@ window.__ModuleLoader__.load({
 				...EMPTY_FORM,
 				id: c.id, kind: c.kind, name: c.name || "", mode,
 				url: c.safeUrl || "",
+				urlUser: "", urlPassword: "",
 				host: c.host || "", port: c.port != null ? String(c.port) : "",
 				user: c.user || "", database: c.database || "",
 				ssl: !!c.ssl,
@@ -496,6 +501,11 @@ window.__ModuleLoader__.load({
 					if (form.url && form.url !== origUrl) body.url = form.url;
 					// 新建 url 连接必须发
 					if (!props.initial && form.url) body.url = form.url;
+					// URL 模式独立凭据：trim 后非空才发（服务端注入 userinfo；url 未发时以已存 URL 为基底）
+					const uu = (form.urlUser || "").trim();
+					const up = (form.urlPassword || "").trim();
+					if (uu) body.urlUser = uu;
+					if (up) body.urlPassword = up;
 				} else {
 					body.fields = { host: form.host, user: form.user, database: form.database || undefined };
 					if (form.port) body.fields.port = Number(form.port);
@@ -541,7 +551,14 @@ window.__ModuleLoader__.load({
 					React.createElement("button", { className: form.mode === "fields" ? "active" : "", onClick: reenterFields }, t("fieldsMode")),
 				),
 				form.mode === "url"
-					? React.createElement("input", { placeholder: t("url"), value: form.url, onChange: (e) => patch({ url: e.target.value }) })
+					? React.createElement(
+						"div",
+						{ style: { display: "flex", flexDirection: "column", gap: 6 } },
+						React.createElement("input", { placeholder: t("url"), value: form.url, onChange: (e) => patch({ url: e.target.value }) }),
+						React.createElement("div", { className: "dbt-row" },
+							React.createElement("input", { placeholder: t("urlUser"), value: form.urlUser, onChange: (e) => patch({ urlUser: e.target.value }) }),
+							React.createElement("input", { type: "password", placeholder: t("urlPassword"), value: form.urlPassword, onChange: (e) => patch({ urlPassword: e.target.value }) })),
+					)
 					: React.createElement(
 						"div",
 						{ style: { display: "flex", flexDirection: "column", gap: 6 } },

package/dist/adapters/mongodb/index.js

@@ -166,7 +166,9 @@ export async function createMongoAdapter(conn, opts) {
     }
     const dbName = typeof conn.meta.database === 'string' && conn.meta.database !== ''
         ? conn.meta.database
-        : defaultDbName(conn.fields);
+        : conn.url
+            ? urlDbName(conn.url)
+            : defaultDbName(conn.fields);
     const db = client.db(dbName);
     function wrap(e) {
         const M = vendorOrNull();
@@ -524,15 +526,30 @@ function inferBsonType(v) {
         return 'object';
     return typeof v;
 }
-function buildUri(fields, ssl) {
+export function buildUri(fields, ssl) {
     const host = typeof fields?.host === 'string' && fields.host !== '' ? fields.host : '127.0.0.1';
     const port = typeof fields?.port === 'number' ? fields.port : 27017;
     const user = typeof fields?.user === 'string' ? encodeURIComponent(fields.user) : '';
     const pass = typeof fields?.password === 'string' ? `:${encodeURIComponent(fields.password)}` : '';
     const auth = user !== '' ? `${user}${pass}@` : '';
-    const scheme = ssl || fields?.ssl === true || fields?.tls === true ? 'mongodb+srv' : 'mongodb';
-    const authDb = typeof fields?.authDatabase === 'string' ? `?authSource=${fields.authDatabase}` : '';
-    return `${scheme}://${auth}${host}:${port}${authDb}`;
+    // tls 用查询参数表达：mongodb+srv 是 DNS seedlist 形态（禁止显式端口），与 TLS 无关，不可混用
+    const params = [];
+    if (typeof fields?.authDatabase === 'string' && fields.authDatabase !== '') {
+        params.push(`authSource=${fields.authDatabase}`);
+    }
+    if (ssl || fields?.ssl === true || fields?.tls === true)
+        params.push('tls=true');
+    const qs = params.length > 0 ? `?${params.join('&')}` : '';
+    return `mongodb://${auth}${host}:${port}${qs}`;
+}
+/** URL 模式库名：取 URL path 首段（percent 解码），无则 'test' 兜底（与 pg-like mainDb 同口径） */
+function urlDbName(url) {
+    try {
+        return decodeURIComponent(new URL(url).pathname.replace(/^\//, '')) || 'test';
+    }
+    catch {
+        return 'test';
+    }
 }
 function defaultDbName(fields) {
     return typeof fields?.database === 'string' && fields.database !== '' ? fields.database : 'test';

package/dist/http/index.js

@@ -141,6 +141,8 @@ async function route(req, res, service, path, q, opts) {
                 id, kind: kind,
                 ...(b['name'] !== undefined ? { name: str(b['name']) } : {}),
                 ...(b['url'] !== undefined ? { url: str(b['url']) } : {}),
+                ...(b['urlUser'] !== undefined ? { urlUser: str(b['urlUser']) } : {}),
+                ...(b['urlPassword'] !== undefined ? { urlPassword: str(b['urlPassword']) } : {}),
                 ...(b['fields'] !== undefined ? { fields: b['fields'] } : {}),
                 ...(ssl !== undefined ? { ssl } : {}),
             }));
@@ -158,6 +160,8 @@ async function route(req, res, service, path, q, opts) {
         return sendMaybeConfirm(res, service.testDraft({
             kind: kind,
             ...(b['url'] !== undefined ? { url: str(b['url']) } : {}),
+            ...(b['urlUser'] !== undefined ? { urlUser: str(b['urlUser']) } : {}),
+            ...(b['urlPassword'] !== undefined ? { urlPassword: str(b['urlPassword']) } : {}),
             ...(b['fields'] !== undefined ? { fields: b['fields'] } : {}),
             ...(ssl !== undefined ? { ssl } : {}),
             // 编辑已有连接时透传：服务端拼回已存机密（留空密码/url 未改动的测试语义）
@@ -178,6 +182,8 @@ async function route(req, res, service, path, q, opts) {
             return sendOk(res, service.updateConnection(id, {
                 ...(b['name'] !== undefined ? { name: str(b['name']) } : {}),
                 ...(b['url'] !== undefined ? { url: str(b['url']) } : {}),
+                ...(b['urlUser'] !== undefined ? { urlUser: str(b['urlUser']) } : {}),
+                ...(b['urlPassword'] !== undefined ? { urlPassword: str(b['urlPassword']) } : {}),
                 ...(b['fields'] !== undefined ? { fields: b['fields'] } : {}),
                 ...(b['clearUrl'] === true ? { clearUrl: true } : {}),
                 ...(ssl !== undefined ? { ssl } : {}),

package/dist/manager.js

@@ -1,6 +1,6 @@
 import { getAdapter } from './adapters/index.js';
 import { ChallengeStore, classifyStatement, } from './guard/index.js';
-import { normalizeProjectKey, } from './store/index.js';
+import { mergeUrlCredentials, normalizeProjectKey, } from './store/index.js';
 import { runScriptInChild } from './script/runner.js';
 /* ---------------- 错误与结果类型 ---------------- */
 /** 携带机器可读 code 的业务错误（HTTP 层直接映射 {ok:false,error,code}） */
@@ -84,15 +84,24 @@ export class DbToolService {
         };
         let url = input.url;
         let fields = input.fields !== undefined ? { ...input.fields } : undefined;
+        let secretsUrl;
         if (input.connId) {
             // 已存连接：编辑时客户端不发旧机密（留空语义），这里从 secrets 拼回
             const sec = this.store.secrets.get(input.connId);
-            if (url === undefined && sec?.url !== undefined)
-                url = sec.url;
+            secretsUrl = sec?.url;
+            if (url === undefined && secretsUrl !== undefined)
+                url = secretsUrl;
             if (fields !== undefined && sec?.password !== undefined && fields.password === undefined) {
                 fields.password = sec.password;
             }
         }
+        // URL 模式独立凭据注入（拼回已存 URL 之后；无凭据字段时 helper 原样返回，?? 保持不变）
+        url = mergeUrlCredentials({
+            url,
+            urlUser: input.urlUser,
+            urlPassword: input.urlPassword,
+            secretsUrl,
+        }) ?? url;
         if (url !== undefined)
             rc.url = url;
         if (fields !== undefined)

package/dist/store/connections.js

@@ -28,6 +28,45 @@ export function redactUrl(url) {
     const redacted = m[1] + userinfo.slice(0, colon + 1) + '***@' + authority.slice(at + 1);
     return redacted + url.slice(m[0].length);
 }
+/** URL 模式独立凭据注入：把 urlUser/urlPassword 合并进 URL userinfo（8 库 scheme 均为标准 URL 形态）。
+ *  - 两者均空 → 原样返回（url 可为 undefined，现状语义不变）；
+ *  - url 为 undefined → 有 secretsUrl（编辑场景已存真实 URL）以其为基底注入，否则凭据忽略返回 undefined；
+ *  - url 含脱敏标记 ':***@'（编辑回填值）→ 有 secretsUrl 以其为基底整体替换，否则报错；
+ *  - 注入用 WHATWG URL 的 username/password setter（自动 percent-encode '@:/?# ' 等特殊字符），
+ *    与适配器侧 decodeURIComponent / 驱动 RFC 3986 解码严格互逆；只填一项只覆盖一项
+ *    （redis 'redis://:pass@host' 无用户名形态、oracle 必填用户名校验均兼容）。 */
+export function mergeUrlCredentials(opts) {
+    const { url, urlUser, urlPassword, secretsUrl } = opts;
+    if (urlUser === undefined && urlPassword === undefined)
+        return url;
+    let base;
+    if (url === undefined) {
+        if (secretsUrl === undefined)
+            return undefined; // 无 URL 可注入，凭据忽略
+        base = secretsUrl;
+    }
+    else if (url.includes(':***@')) {
+        if (secretsUrl === undefined) {
+            throw new Error('URL 中含脱敏占位（***）且无已存真实 URL 可回退，请重新输入完整 URL 或清空用户名/密码框');
+        }
+        base = secretsUrl;
+    }
+    else {
+        base = url;
+    }
+    let u;
+    try {
+        u = new URL(base);
+    }
+    catch {
+        throw new Error('连接 URL 无效，无法注入用户名/密码');
+    }
+    if (urlUser !== undefined && urlUser !== '')
+        u.username = urlUser;
+    if (urlPassword !== undefined && urlPassword !== '')
+        u.password = urlPassword;
+    return u.toString();
+}
 function splitPassword(fields) {
     if (!fields || typeof fields[PASSWORD_KEY] !== 'string') {
         return { clean: fields, password: undefined };
@@ -107,9 +146,15 @@ export class ConnectionStore {
         if (clean !== undefined)
             rec.fields = clean;
         const secretPatch = {};
-        if (input.url !== undefined) {
-            rec.urlSafe = redactUrl(input.url);
-            secretPatch.url = input.url;
+        // URL 模式独立凭据注入（无凭据字段时 mergeUrlCredentials 原样返回，现状语义不变）
+        const finalUrl = mergeUrlCredentials({
+            url: input.url,
+            urlUser: input.urlUser,
+            urlPassword: input.urlPassword,
+        });
+        if (finalUrl !== undefined) {
+            rec.urlSafe = redactUrl(finalUrl);
+            secretPatch.url = finalUrl;
         }
         if (password !== undefined)
             secretPatch.password = password;
@@ -135,9 +180,17 @@ export class ConnectionStore {
             if (password !== undefined)
                 this.secrets.set(id, { password });
         }
-        if (patch.url !== undefined) {
-            rec.urlSafe = redactUrl(patch.url);
-            this.secrets.set(id, { url: patch.url });
+        // URL 模式独立凭据注入：url 未发/发脱敏回填值时以已存 secrets.url 为基底（update 场景）；
+        // 无 url 且无凭据字段时 mergeUrlCredentials 返回 undefined，自然跳过（无需外层守卫）
+        const finalUrl = mergeUrlCredentials({
+            url: patch.url,
+            urlUser: patch.urlUser,
+            urlPassword: patch.urlPassword,
+            secretsUrl: this.secrets.get(id)?.url,
+        });
+        if (finalUrl !== undefined) {
+            rec.urlSafe = redactUrl(finalUrl);
+            this.secrets.set(id, { url: finalUrl });
         }
         if (patch.clearUrl && rec.urlSafe !== undefined) {
             delete rec.urlSafe;

package/dist/store/index.js

@@ -18,7 +18,7 @@ import { GrantStore } from './grants.js';
 import { chmodBestEffort } from './io.js';
 import { SecretsBox } from './secrets.js';
 export { normalizeProjectKey } from './normalize.js';
-export { redactUrl } from './connections.js';
+export { mergeUrlCredentials, redactUrl } from './connections.js';
 export { AuditLog, ConnectionStore, GrantStore, SecretsBox };
 export class DbToolStore {
     /** 数据目录：$DSH_HOME/db-tool */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-db-tool",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "DSH community plugin: chat-operated multi-database admin tool with sidebar management, project-scoped grants, ro/rw modes and dangerous-operation confirmation",
   "type": "module",
   "license": "MIT",