Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(connection): trim whitespace in host, username, database

ordinary beinga5c1ed6ce01b
diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue
index 6f72191377..98afa3b6b5 100644
--- a/apps/desktop/src/components/connection/ConnectionDialog.vue
+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue
@@ -174,7 +174,7 @@ import { buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatab
import { resolveVisibleDatabaseSaveAction, visibleDatabasePatternsWithoutMatchAll } from "@/components/sidebar/visibleDatabasesDialogState";
import { MATCH_ALL_VISIBLE_DATABASE_PATTERN, canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, buildDraftVisibleSchemasConnectionId, normalizeVisibleSchemaSelection } from "@/lib/database/visibleDatabases";
import { isSchemaAware, isSingleDatabase, supportsDataDictionary, supportsTransaction } from "@/lib/database/databaseFeatureSupport";
-import { normalizeConnectionScope, normalizeConnectionTimeouts } from "@/lib/connection/connectionSubmitNormalization";
+import { normalizeConnectionIdentityFields, normalizeConnectionScope, normalizeConnectionTimeouts } from "@/lib/connection/connectionSubmitNormalization";
import { databaseConnectionFormKind, databaseManifestEntry } from "@/lib/database/databaseDriverManifest";
import VisibleSchemasDialog from "@/components/sidebar/VisibleSchemasDialog.vue";
import CloudflareD1ConnectionFields from "@/components/connection/CloudflareD1ConnectionFields.vue";
@@ -4947,6 +4947,9 @@ function connectionConfigForSubmit(id: string, generatedName = "", validatePlugi
}
config.database_info = undefined;
config.database = normalizeStoredConnectionDatabase(config.db_type, config.database);
+ // Plugin providers own their field semantics; trim only the built-in form where a
+ // hostname/user name/database can never carry meaningful surrounding whitespace.
+ if (!isPluginConnection.value) normalizeConnectionIdentityFields(config);
config.note = config.note?.trim() || undefined;
if (selectedType.value === "oceanbase" && (config.driver_profile === "oceanbase" || config.driver_profile === "oceanbase-oracle")) {
Object.assign(config, oceanbaseModeConnectionPatch(oceanbaseSubMode.value));
diff --git a/apps/desktop/src/lib/connection/__tests__/connectionSubmitNormalization.spec.ts b/apps/desktop/src/lib/connection/__tests__/connectionSubmitNormalization.spec.ts
index 4f292065e3..1dff4877cb 100644
--- a/apps/desktop/src/lib/connection/__tests__/connectionSubmitNormalization.spec.ts
+++ b/apps/desktop/src/lib/connection/__tests__/connectionSubmitNormalization.spec.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
-import { normalizeConnectionScope, normalizeConnectionTimeouts } from "../connectionSubmitNormalization";
+import { normalizeConnectionIdentityFields, normalizeConnectionScope, normalizeConnectionTimeouts } from "../connectionSubmitNormalization";
import type { ConnectionConfig } from "@/types/database";
function config(overrides: Partial<ConnectionConfig> = {}): ConnectionConfig {
@@ -67,4 +67,25 @@ describe("connection submit normalization", () => {
normalizeConnectionScope(value);
expect(value).toMatchObject({ one_time: undefined, read_only: undefined, save_password: true, production_databases: ["app"] });
});
+
+ it("trims host, username and database but never the password (#12884)", () => {
+ const value = config({ host: " db.internal ", username: " app ", database: " appdb ", password: " pass " });
+ normalizeConnectionIdentityFields(value);
+ expect(value).toMatchObject({ host: "db.internal", username: "app", database: "appdb", password: " pass " });
+ });
+
+ it("treats a whitespace-only database as unset (#12884)", () => {
+ const value = config({ database: " " });
+ normalizeConnectionIdentityFields(value);
+ expect(value.database).toBeUndefined();
+ });
+
+ it("keeps file-path hosts byte-exact for local-file engines (#12884)", () => {
+ for (const dbType of ["sqlite", "duckdb", "access"] as const) {
+ const value = config({ db_type: dbType, host: " /tmp/report.db ", username: " user " });
+ normalizeConnectionIdentityFields(value);
+ expect(value.host).toBe(" /tmp/report.db ");
+ expect(value.username).toBe("user");
+ }
+ });
});
diff --git a/apps/desktop/src/lib/connection/connectionFile.ts b/apps/desktop/src/lib/connection/connectionFile.ts
index affd2c264e..2ac2ccc200 100644
--- a/apps/desktop/src/lib/connection/connectionFile.ts
+++ b/apps/desktop/src/lib/connection/connectionFile.ts
@@ -26,9 +26,19 @@ export function isLocalFileTypeDb(dbType: DatabaseType | string): boolean {
* Returns `null` for in-memory (`:memory:`), empty paths, H2 server/mem mode,
* and any DB type that isn't local-file.
*/
+/**
+ * Whether `host` carries an on-disk file path instead of a network hostname.
+ *
+ * SQLite, DuckDB and Access store their database file in `host`; whitespace there can
+ * be part of the path, so submit normalization must leave the field byte-exact.
+ */
+export function connectionHostIsFilePath(dbType: DatabaseType): boolean {
+ return dbType === "sqlite" || dbType === "duckdb" || dbType === "access";
+}
+
export function connectionFilePath(config: Pick<ConnectionConfig, "db_type" | "host" | "connection_string">): string | null {
const dbType = config.db_type;
- if (dbType === "sqlite" || dbType === "duckdb" || dbType === "access") {
+ if (connectionHostIsFilePath(dbType)) {
const host = (config.host ?? "").trim();
if (!host || host === ":memory:") return null;
return host;
diff --git a/apps/desktop/src/lib/connection/connectionSubmitNormalization.ts b/apps/desktop/src/lib/connection/connectionSubmitNormalization.ts
index a381f08fe0..c1e4c52386 100644
--- a/apps/desktop/src/lib/connection/connectionSubmitNormalization.ts
+++ b/apps/desktop/src/lib/connection/connectionSubmitNormalization.ts
@@ -1,3 +1,4 @@
+import { connectionHostIsFilePath } from "@/lib/connection/connectionFile";
import { sidebarProductionBadgeScope } from "@/lib/sidebar/sidebarProductionBadge";
import { normalizeIdleDisconnectSecs, normalizeIdleTimeoutSecs, normalizeManualTransactionTimeoutSecs } from "@/lib/connection/timeoutLimits";
import { isSingleDatabase } from "@/lib/database/databaseFeatureSupport";
@@ -15,6 +16,27 @@ export function normalizeConnectionTimeouts(config: ConnectionConfig, connectTim
config.keepalive_interval_secs = Number.isFinite(keepaliveInterval) && keepaliveInterval >= 0 ? keepaliveInterval : 30;
}
+/**
+ * Trim whitespace that can never be meaningful in connection identity fields.
+ *
+ * A copy-pasted hostname often carries a stray leading/trailing space; the driver then
+ * fails with a "hostname resolve" error that hides the space, which makes the failure
+ * very hard to diagnose (#12884). Hostnames, user names and database names tolerate no
+ * surrounding whitespace.
+ *
+ * Two deliberate exceptions:
+ * - `password` is never trimmed: surrounding spaces can be part of the credential.
+ * - `host` carries the on-disk path for SQLite/DuckDB/Access, so those types keep it
+ * byte-exact.
+ *
+ * `port` is numeric on `ConnectionConfig`, so form whitespace is already parsed away.
+ */
+export function normalizeConnectionIdentityFields(config: ConnectionConfig): void {
+ if (!connectionHostIsFilePath(config.db_type)) config.host = config.host.trim();
+ config.username = config.username.trim();
+ config.database = config.database?.trim() || undefined;
+}
+
export function normalizeConnectionScope(config: ConnectionConfig): void {
config.production_badge_scope = sidebarProductionBadgeScope(config);
if (!config.one_time) config.one_time = undefined;