Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tidy-forms-redact.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: redact nested and typed underscore-prefixed remote form fields after invalid submissions
12 changes: 7 additions & 5 deletions packages/kit/src/runtime/app/server/remote/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { get_request_store } from '@sveltejs/kit/internal/server';
import {
create_field_proxy,
set_nested_value,
split_path,
deep_set,
normalize_issue,
flatten_issues,
Expand Down Expand Up @@ -286,15 +286,17 @@ function handle_issues(output, issues, form_data, form_id) {
output.input = {};

for (const field_name of form_data.keys()) {
const field = parse_form_key(form_id, field_name);
const path = split_path(field.name);

// redact sensitive fields
if (/^[.\]]?_/.test(field_name)) continue;
if (path.some((part) => part.startsWith('_'))) continue;

const values = form_data.getAll(field_name).filter((value) => typeof value === 'string');
const field = parse_form_key(form_id, field_name);

set_nested_value(
deep_set(
/** @type {Record<string, any>} */ (output.input),
field,
path,
field.is_array ? values : values[0]
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<form {...register}>
<input {...register.fields.username.as('text')} />
<input {...register.fields._password.as('password')} />
<input {...register.fields._pin.as('number')} />
<input {...register.fields.user._password.as('password')} />

<button>submit</button>
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import * as v from 'valibot';
export const register = form(
v.object({
username: v.pipe(v.string(), v.minLength(8)),
_password: v.pipe(v.string(), v.minLength(8))
_password: v.pipe(v.string(), v.minLength(8)),
_pin: v.number(),
user: v.object({ _password: v.string() })
}),
async (data) => {}
);
4 changes: 4 additions & 0 deletions packages/kit/test/apps/async/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -801,10 +801,14 @@ test.describe('remote functions', () => {

await page.fill('input[name^="username"]', 'abcdefg');
await page.fill('input[name^="_password"]', 'pqrstuv');
await page.fill('input[name^="n:_pin"]', '1234');
await page.fill('input[name^="user._password"]', 'nested-secret');
await page.locator('button').click();

await expect(page.locator('input[name^="username"]')).toHaveValue('abcdefg');
await expect(page.locator('input[name^="_password"]')).toHaveValue('');
await expect(page.locator('input[name^="n:_pin"]')).toHaveValue('');
await expect(page.locator('input[name^="user._password"]')).toHaveValue('');
});

test('prerendered entries not called in prod', async ({ page, clicknav }) => {
Expand Down
Loading