fix(connection): safely copy and redact connection credentials
This commit is contained in:
8 files changed
+450
-59
No files matched your search
@@ -78,6 +78,7 @@ import { isTableVGroupGroupableRowType, selectedTableVGroupMoveTargets, tableVGr
|
||||
import { findTreeNodeById } from "@/lib/sql/newQueryContext";
|
||||
import { resolveTableVGroupDropTarget, setTableVGroupDropTargetNodeId, tableVGroupDropTargetNodeId } from "@/lib/sidebar/sidebarTableVGroupDrag";
|
||||
import { connectionDisplayUrlScheme } from "@/lib/connection/connectionPresentation";
|
||||
import { redactConnectionStringSecrets } from "@/lib/connection/connectionStringRedaction";
|
||||
import { isFocusSearchShortcut } from "@/lib/editor/keyboardShortcuts";
|
||||
import { encodeSpannerResourcePath } from "@/lib/connection/spannerResourcePath";
|
||||
import { hexToRgba } from "@/lib/common/color";
|
||||
@@ -516,10 +517,6 @@ function isLocalFileConnection(config: Pick<ConnectionConfig, "db_type" | "port"
|
||||
return config.db_type === "sqlite" || config.db_type === "duckdb" || config.db_type === "access" || (config.db_type === "h2" && config.port === 0);
|
||||
}
|
||||
|
||||
function redactedConnectionString(value: string): string {
|
||||
return value.replace(/(:\/\/[^/\s:@?#;]+):([^@\s/?#;]+)@/g, "$1:***@").replace(/([?&;](?:password|pwd|pass|token|secret|key)=)[^&;]*/gi, "$1***");
|
||||
}
|
||||
|
||||
function hostForDisplay(host: string): string {
|
||||
if (!host.includes(":") || host.startsWith("[") || host.includes("://") || host.includes(",")) return host;
|
||||
return `[${host}]`;
|
||||
@@ -534,11 +531,11 @@ function tooltipDatabaseValue(config: ConnectionConfig): string {
|
||||
|
||||
function connectionTooltipUrl(config: ConnectionConfig): string {
|
||||
const explicit = cleanTooltipValue(config.connection_string);
|
||||
if (explicit) return redactedConnectionString(explicit);
|
||||
if (explicit) return redactConnectionStringSecrets(explicit);
|
||||
|
||||
const host = cleanTooltipValue(config.host);
|
||||
if (!host) return "";
|
||||
if (host.includes("://")) return redactedConnectionString(host);
|
||||
if (host.includes("://")) return redactConnectionStringSecrets(host);
|
||||
|
||||
if (isLocalFileConnection(config)) {
|
||||
if (config.db_type === "access") return `jdbc:ucanaccess://${host}`;
|
||||
@@ -554,7 +551,7 @@ function connectionTooltipUrl(config: ConnectionConfig): string {
|
||||
const path = database ? `/${encodedDatabase}` : "";
|
||||
const params = cleanTooltipValue(config.url_params);
|
||||
const query = params ? (params.startsWith("?") ? params : `?${params}`) : "";
|
||||
return redactedConnectionString(`${scheme}://${userInfo}${hostForDisplay(host)}${port}${path}${query}`);
|
||||
return redactConnectionStringSecrets(`${scheme}://${userInfo}${hostForDisplay(host)}${port}${path}${query}`);
|
||||
}
|
||||
|
||||
const detailTooltip = computed(() => {
|
||||
|
||||
Reference in new issue
Block a user