fix(connection): copy raw password from the edit dialog field
This commit is contained in:
5 files changed
+139
-4
No files matched your search
@@ -1,7 +1,7 @@
|
||||
// @vitest-environment happy-dom
|
||||
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { preventDialogDocumentSelectAll } from "../dialogTextSelection";
|
||||
import { copyDialogPasswordFieldValue, preventDialogDocumentSelectAll } from "../dialogTextSelection";
|
||||
|
||||
function keyboardEvent(target: EventTarget, options: { key?: string; metaKey?: boolean; ctrlKey?: boolean; altKey?: boolean } = {}) {
|
||||
return {
|
||||
@@ -47,3 +47,60 @@ describe("preventDialogDocumentSelectAll", () => {
|
||||
expect(event.preventDefault).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
function clipboardEvent(target: EventTarget) {
|
||||
return {
|
||||
target,
|
||||
preventDefault: vi.fn(),
|
||||
clipboardData: { setData: vi.fn() },
|
||||
} as unknown as ClipboardEvent;
|
||||
}
|
||||
|
||||
function passwordInput(value: string, options: { masked?: boolean; marker?: boolean; selection?: [number, number] } = {}) {
|
||||
const input = document.createElement("input");
|
||||
input.type = options.masked === false ? "text" : "password";
|
||||
if (options.marker !== false) input.setAttribute("data-password-input", "");
|
||||
input.value = value;
|
||||
const [start, end] = options.selection ?? [value.length, value.length];
|
||||
input.setSelectionRange(start, end);
|
||||
return input;
|
||||
}
|
||||
|
||||
describe("copyDialogPasswordFieldValue", () => {
|
||||
it("copies the whole revealed password when only the caret sits in the field", () => {
|
||||
const input = passwordInput("p^ss%40@x#y", { masked: false });
|
||||
const event = clipboardEvent(input);
|
||||
|
||||
expect(copyDialogPasswordFieldValue(event)).toBe(true);
|
||||
expect(event.preventDefault).toHaveBeenCalledOnce();
|
||||
expect((event.clipboardData as unknown as { setData: ReturnType<typeof vi.fn> }).setData).toHaveBeenCalledWith("text/plain", "p^ss%40@x#y");
|
||||
});
|
||||
|
||||
it("copies the whole password while the field is still masked", () => {
|
||||
const input = passwordInput("p^ss%40@x#y", { masked: true });
|
||||
const event = clipboardEvent(input);
|
||||
|
||||
expect(copyDialogPasswordFieldValue(event)).toBe(true);
|
||||
expect(event.preventDefault).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it("keeps the native substring copy when text is selected", () => {
|
||||
const input = passwordInput("p^ss%40@x#y", { masked: false, selection: [0, 4] });
|
||||
const event = clipboardEvent(input);
|
||||
|
||||
expect(copyDialogPasswordFieldValue(event)).toBe(false);
|
||||
expect(event.preventDefault).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("leaves other inputs and empty passwords alone", () => {
|
||||
const plain = passwordInput("app_user", { masked: false, marker: false });
|
||||
const plainEvent = clipboardEvent(plain);
|
||||
const empty = passwordInput("", { masked: false });
|
||||
const emptyEvent = clipboardEvent(empty);
|
||||
|
||||
expect(copyDialogPasswordFieldValue(plainEvent)).toBe(false);
|
||||
expect(copyDialogPasswordFieldValue(emptyEvent)).toBe(false);
|
||||
expect(plainEvent.preventDefault).not.toHaveBeenCalled();
|
||||
expect(emptyEvent.preventDefault).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -9,3 +9,33 @@ export function preventDialogDocumentSelectAll(event: KeyboardEvent): boolean {
|
||||
event.preventDefault();
|
||||
return true;
|
||||
}
|
||||
|
||||
function isPasswordFieldTarget(target: EventTarget | null): target is HTMLInputElement {
|
||||
if (!(target instanceof HTMLInputElement)) return false;
|
||||
// A revealed password is a plain text input, so the reveal toggle marks it
|
||||
// explicitly; a masked one is recognizable from its type alone.
|
||||
return target.type === "password" || target.hasAttribute("data-password-input");
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy the whole password value when a copy shortcut runs without a selection.
|
||||
*
|
||||
* A password input only copies its selection, so pressing Ctrl/Cmd+C with just
|
||||
* a caret writes nothing and leaves the previous clipboard content in place.
|
||||
* Users who reveal a stored password and copy it that way would then paste
|
||||
* whatever they copied earlier - typically the percent-encoded connection URL -
|
||||
* which looks like the password itself was escaped. Writing the field value
|
||||
* keeps the clipboard identical to what the field shows; an explicit selection
|
||||
* still copies the native substring.
|
||||
*/
|
||||
export function copyDialogPasswordFieldValue(event: ClipboardEvent): boolean {
|
||||
const input = event.target;
|
||||
if (!isPasswordFieldTarget(input)) return false;
|
||||
if ((input.selectionStart ?? 0) !== (input.selectionEnd ?? 0)) return false;
|
||||
if (!input.value) return false;
|
||||
const clipboard = event.clipboardData;
|
||||
if (!clipboard) return false;
|
||||
event.preventDefault();
|
||||
clipboard.setData("text/plain", input.value);
|
||||
return true;
|
||||
}
|
||||
Reference in new issue
Block a user