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(plugins): count whitespace-only passwords as form values

Jinpy7dada51e558a
diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue
index 0f185beacc..f9595fd996 100644
--- a/apps/desktop/src/components/connection/ConnectionDialog.vue
+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue
@@ -143,7 +143,7 @@ import { assertCompleteDatabaseCategories, databaseSelectionForCategory } from "
import { loadConnectionPickerView, saveConnectionPickerView, type DbPickerView } from "@/lib/connection/connectionPickerViewPreference";
import { buildRocketMqConfig, hydrateRocketMqConfig, isRocketMqConfigValid, rocketMqConnectionTarget } from "@/lib/connection/rocketmqConfig";
import { normalizeRabbitmqAddresses, parseRabbitmqAddress } from "@/lib/connection/rabbitmqAddresses";
-import { pluginFieldIsRequired, pluginFieldIsVisible } from "@/lib/plugins/pluginFieldConditions";
+import { pluginFieldHasValue as pluginFieldHasValueOf, pluginFieldIsRequired, pluginFieldIsVisible } from "@/lib/plugins/pluginFieldConditions";
import { detectMqUiAuthKind, isMqAuthKindAllowedForSystem, type MqUiAuthKind } from "@/lib/connection/mqAuth";
import { driverInstallProgressChannel, driverInstallProgressPercent, isDriverInstallProgressForOperation, requestAgentInstallCancellation, resolveAgentInstallOutcome, type DriverInstallProgress } from "@/lib/connection/driverInstallProgressUi";
import { requiresSqlServerLegacyCompatibilityComponent, setSqlServerLegacyCompatibilityConfig, sqlServerUsesLegacyCompatibility, SQLSERVER_LEGACY_COMPATIBILITY_DRIVER_KEY } from "@/lib/connection/sqlServerLegacyCompatibility";
@@ -4430,8 +4430,7 @@ function pluginFieldValue(field: PluginFormField): PluginFormFieldValue {
}
function pluginFieldHasValue(field: PluginFormField): boolean {
- const value = pluginFieldValue(field);
- return typeof value === "string" ? value.trim().length > 0 : value !== undefined;
+ return pluginFieldHasValueOf(field, pluginFieldValue(field));
}
function pluginFieldValueByKey(key: string): PluginFormFieldValue {
diff --git a/apps/desktop/src/lib/plugins/pluginFieldConditions.spec.ts b/apps/desktop/src/lib/plugins/pluginFieldConditions.spec.ts
index be193f7130..363c8f8590 100644
--- a/apps/desktop/src/lib/plugins/pluginFieldConditions.spec.ts
+++ b/apps/desktop/src/lib/plugins/pluginFieldConditions.spec.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
-import { pluginConditionValueText, pluginFieldConditionMatches, pluginFieldConditionReferencedFields, pluginFieldIsRequired, pluginFieldIsVisible } from "./pluginFieldConditions";
+import { pluginConditionValueText, pluginFieldConditionMatches, pluginFieldConditionReferencedFields, pluginFieldHasValue, pluginFieldIsRequired, pluginFieldIsVisible } from "./pluginFieldConditions";
import type { PluginFieldCondition, PluginFormField, PluginFormFieldValue } from "@/types/database";
function field(overrides: Partial<PluginFormField>): PluginFormField {
@@ -249,3 +249,26 @@ describe("pluginFieldIsVisible", () => {
).toBe(true);
});
});
+
+describe("pluginFieldHasValue", () => {
+ it("keeps treating whitespace-only text as empty", () => {
+ expect(pluginFieldHasValue(field({ type: "text" }), " ")).toBe(false);
+ expect(pluginFieldHasValue(field({ type: "text" }), "db")).toBe(true);
+ });
+
+ it("counts whitespace-only passwords as values (#215)", () => {
+ // A single space is a real password on some servers; trimming it marked
+ // the required password field permanently missing and disabled
+ // save-and-connect.
+ expect(pluginFieldHasValue(field({ type: "password" }), " ")).toBe(true);
+ expect(pluginFieldHasValue(field({ type: "password" }), "\t")).toBe(true);
+ expect(pluginFieldHasValue(field({ type: "password" }), "")).toBe(false);
+ expect(pluginFieldHasValue(field({ type: "password" }), undefined)).toBe(false);
+ });
+
+ it("treats non-string values by presence, not emptiness", () => {
+ expect(pluginFieldHasValue(field({ type: "number" }), 0)).toBe(true);
+ expect(pluginFieldHasValue(field({ type: "boolean" }), false)).toBe(true);
+ expect(pluginFieldHasValue(field({ type: "select" }), undefined)).toBe(false);
+ });
+});
diff --git a/apps/desktop/src/lib/plugins/pluginFieldConditions.ts b/apps/desktop/src/lib/plugins/pluginFieldConditions.ts
index c58275c825..e3f6505777 100644
--- a/apps/desktop/src/lib/plugins/pluginFieldConditions.ts
+++ b/apps/desktop/src/lib/plugins/pluginFieldConditions.ts
@@ -13,6 +13,19 @@ export function pluginConditionValueText(value: PluginFormFieldValue): string {
/** Reads the current value of a sibling form field by key. */
export type PluginFieldValueReader = (key: string) => PluginFormFieldValue;
+/**
+ * Whether a value counts as "filled" for required-field gating (footer
+ * buttons, required-field errors). Strings are trimmed so stray whitespace
+ * does not satisfy a required text field — except `type: "password"` inputs:
+ * whitespace is significant in secrets (a single space is a real password,
+ * jinpy666/dbx-plugin-ssh#215), so only undefined/null/"" count as missing.
+ */
+export function pluginFieldHasValue(field: Pick<PluginFormField, "type">, value: PluginFormFieldValue): boolean {
+ if (typeof value !== "string") return value !== undefined;
+ if (field.type === "password") return value.length > 0;
+ return value.trim().length > 0;
+}
+
/** A leaf clause matches when the sibling value equals one of its literals. */
function conditionClauseMatches(clause: { field: string; one_of: readonly (string | number | boolean)[] }, value: PluginFormFieldValue): boolean {
if (value === undefined || value === null || (typeof value === "string" && value.trim().length === 0)) return false;