Beautiful Open-Source Form Builder
Enhance workspace and form validation in controllers
JhumanJc79a8e547eaa
diff --git a/api/app/Http/Controllers/Forms/FormStatsController.php b/api/app/Http/Controllers/Forms/FormStatsController.phpindex a92db97f3..02bd8e41b 100644--- a/api/app/Http/Controllers/Forms/FormStatsController.php+++ b/api/app/Http/Controllers/Forms/FormStatsController.php@@ -21,6 +21,7 @@ class FormStatsController extends Controllerpublic function getFormStats(FormStatsRequest $request, Workspace $workspace, Form $form){+ $this->ensureFormBelongsToWorkspace($form, $workspace);$this->authorize('view', $form);$formStats = $form->statistics()->whereBetween('date', [$request->date_from, $request->date_to])->get();@@ -43,6 +44,7 @@ class FormStatsController extends Controllerpublic function getFormStatsDetails(Request $request, Workspace $workspace, Form $form){+ $this->ensureFormBelongsToWorkspace($form, $workspace);$this->authorize('view', $form);$totalViews = $form->views_count;@@ -142,4 +144,11 @@ class FormStatsController extends Controllerreturn implode(' ', $parts);}++ private function ensureFormBelongsToWorkspace(Form $form, Workspace $workspace): void+ {+ if ($form->workspace_id !== $workspace->id) {+ abort(404);+ }+ }}diff --git a/api/app/Http/Controllers/Forms/FormSubmissionController.php b/api/app/Http/Controllers/Forms/FormSubmissionController.phpindex 7cae55137..e32c7393b 100644--- a/api/app/Http/Controllers/Forms/FormSubmissionController.php+++ b/api/app/Http/Controllers/Forms/FormSubmissionController.php@@ -18,6 +18,7 @@ use App\Service\Storage\FilenameUrlEncoder;use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Cache;use Illuminate\Support\Facades\Auth;+use Illuminate\Validation\Rule;use Maatwebsite\Excel\Facades\Excel;use Illuminate\Http\Request;@@ -218,8 +219,11 @@ class FormSubmissionController extends Controller{$request->validate(['submissionIds' => 'required|array',- 'submissionIds.*' => 'required|integer',- 'submissionIds.*' => 'exists:form_submissions,id',+ 'submissionIds.*' => [+ 'required',+ 'integer',+ Rule::exists('form_submissions', 'id')->where('form_id', $form->id),+ ],]);$this->authorize('delete', $form);diff --git a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.php b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.phpindex 5404b94d0..6b6aec982 100644--- a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.php+++ b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.php@@ -51,7 +51,7 @@ class FormIntegrationsController extends Controller{$this->authorize('manageIntegrations', $form);- $formIntegration = FormIntegration::findOrFail((int)$integrationid);+ $formIntegration = $form->integrations()->findOrFail((int) $integrationid);$formIntegration->update($request->toIntegrationData());$formIntegration->load('provider.user');@@ -65,7 +65,7 @@ class FormIntegrationsController extends Controller{$this->authorize('manageIntegrations', $form);- $formIntegration = FormIntegration::findOrFail((int)$integrationid);+ $formIntegration = $form->integrations()->findOrFail((int) $integrationid);$formIntegration->delete();return $this->success([diff --git a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.php b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.phpindex 249238892..40849588b 100644--- a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.php+++ b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.php@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Forms\Integration;use App\Http\Controllers\Controller;use App\Http\Resources\FormIntegrationsEventResource;use App\Models\Forms\Form;-use App\Models\Integration\FormIntegrationsEvent;class FormIntegrationsEventController extends Controller{@@ -17,9 +16,10 @@ class FormIntegrationsEventController extends Controllerpublic function index(Form $form, string $integrationid){$this->authorize('manageIntegrations', $form);+ $formIntegration = $form->integrations()->findOrFail((int) $integrationid);return FormIntegrationsEventResource::collection(- FormIntegrationsEvent::where('integration_id', (int)$integrationid)->orderByDesc('created_at')->get()+ $formIntegration->events()->orderByDesc('created_at')->get());}}diff --git a/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.php b/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.phpindex 2b8f0ecd1..f4574401f 100644--- a/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.php+++ b/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.php@@ -32,7 +32,7 @@ class FormZapierWebhookController extends Controllerpublic function delete($id){$hook = FormZapierWebhook::findOrFail($id);- $this->authorize('store', $hook);+ $this->authorize('delete', $hook);$hook->delete();diff --git a/api/app/Http/Controllers/Settings/OidcConnectionController.php b/api/app/Http/Controllers/Settings/OidcConnectionController.phpindex ae2c952ff..05997cc4a 100644--- a/api/app/Http/Controllers/Settings/OidcConnectionController.php+++ b/api/app/Http/Controllers/Settings/OidcConnectionController.php@@ -70,6 +70,7 @@ class OidcConnectionController extends Controller*/public function show(Workspace $workspace, IdentityConnection $connection){+ $this->ensureConnectionBelongsToWorkspace($workspace, $connection);$this->authorize('view', $connection);return response()->json($this->formatConnection($connection));@@ -80,6 +81,7 @@ class OidcConnectionController extends Controller*/public function update(UpdateOidcConnectionRequest $request, Workspace $workspace, IdentityConnection $connection){+ $this->ensureConnectionBelongsToWorkspace($workspace, $connection);$this->authorize('update', $connection);$data = $request->validated();@@ -105,6 +107,7 @@ class OidcConnectionController extends Controller*/public function destroy(Workspace $workspace, IdentityConnection $connection){+ $this->ensureConnectionBelongsToWorkspace($workspace, $connection);$this->authorize('delete', $connection);$connection->delete();@@ -135,4 +138,11 @@ class OidcConnectionController extends Controller'updated_at' => $connection->updated_at,];}++ protected function ensureConnectionBelongsToWorkspace(Workspace $workspace, IdentityConnection $connection): void+ {+ if ($connection->workspace_id !== null && $connection->workspace_id !== $workspace->id) {+ abort(404);+ }+ }}diff --git a/api/app/Http/Controllers/WorkspaceUserController.php b/api/app/Http/Controllers/WorkspaceUserController.phpindex 6ea65ffe6..09dfe5d40 100644--- a/api/app/Http/Controllers/WorkspaceUserController.php+++ b/api/app/Http/Controllers/WorkspaceUserController.php@@ -91,6 +91,9 @@ class WorkspaceUserController extends Controllerpublic function updateUserRole(Request $request, Workspace $workspace, User $user){$this->authorize('adminAction', $workspace);+ if (!$workspace->users()->whereKey($user->id)->exists()) {+ abort(404);+ }$this->validate($request, ['role' => 'required|in:' . implode(',', User::ROLES),@@ -110,6 +113,9 @@ class WorkspaceUserController extends Controllerpublic function removeUser(Request $request, Workspace $workspace, User $user){$this->authorize('adminAction', $workspace);+ if (!$workspace->users()->whereKey($user->id)->exists()) {+ abort(404);+ }$workspace->users()->detach($user->id);$this->ensureUserHasWorkspace($user);diff --git a/api/app/Http/Requests/Integration/FormIntegrationsRequest.php b/api/app/Http/Requests/Integration/FormIntegrationsRequest.phpindex 70b269743..943df1749 100644--- a/api/app/Http/Requests/Integration/FormIntegrationsRequest.php+++ b/api/app/Http/Requests/Integration/FormIntegrationsRequest.php@@ -45,7 +45,16 @@ class FormIntegrationsRequest extends FormRequest'integration_id' => ['required', Rule::in(array_keys(FormIntegration::getAllIntegrations()))],'oauth_id' => [$this->isOAuthRequired() ? 'required' : 'nullable',- Rule::exists('oauth_providers', 'id')+ Rule::exists('oauth_providers', 'id')->where(function ($query) {+ if ($this->form?->workspace) {+ $query->whereIn('user_id', $this->form->workspace->users()->select('users.id'));+ return;+ }++ if ($this->user()) {+ $query->where('user_id', $this->user()->id);+ }+ }),],'data' => ['present',diff --git a/api/app/Service/Forms/FormLogicConditionChecker.php b/api/app/Service/Forms/FormLogicConditionChecker.phpindex 229243b01..500597e10 100644--- a/api/app/Service/Forms/FormLogicConditionChecker.php+++ b/api/app/Service/Forms/FormLogicConditionChecker.php@@ -3,6 +3,7 @@namespace App\Service\Forms;use App\Models\Forms\FormSubmission;+use Illuminate\Support\Facades\DB;class FormLogicConditionChecker{@@ -481,12 +482,15 @@ class FormLogicConditionCheckerreturn false;}- $dbConnection = config('database.default');+ $dbConnection = DB::connection()->getDriverName();- // Use lockForUpdate to prevent race conditions when checking for uniqueness$query = FormSubmission::where('form_id', $formId)- ->where('status', '!=', FormSubmission::STATUS_PARTIAL)- ->lockForUpdate();+ ->where('status', '!=', FormSubmission::STATUS_PARTIAL);++ // SQLite does not support row-level locking for this query path.+ if ($dbConnection !== 'sqlite') {+ $query->lockForUpdate();+ }if ($dbConnection === 'mysql') {// MySQL: Use fully parameterized JSON path query@@ -504,8 +508,8 @@ class FormLogicConditionChecker[$fieldId, $fieldValue]);}- } else {- // PostgreSQL: Already uses parameterized queries with -> operator+ } elseif ($dbConnection === 'pgsql') {+ // PostgreSQL: Use parameterized queries with -> operatorif (is_array($fieldValue)) {// For array values (multi_select, matrix)$query->whereRaw("data->? @> ?::jsonb", [@@ -516,6 +520,20 @@ class FormLogicConditionChecker// For scalar values$query->whereRaw("data->? = ?::jsonb", [$fieldId, json_encode($fieldValue)]);}+ } elseif ($dbConnection === 'sqlite') {+ // SQLite JSON1: compare extracted JSON values from submissions.+ $jsonPath = '$."' . $fieldId . '"';++ if (is_array($fieldValue)) {+ $query->whereRaw("json_extract(data, ?) = json(?)", [+ $jsonPath,+ json_encode($fieldValue),+ ]);+ } else {+ $query->whereRaw("json_extract(data, ?) = ?", [$jsonPath, $fieldValue]);+ }+ } else {+ return false;}return $query->exists();diff --git a/api/tests/Feature/Enterprise/Oidc/OidcConnectionControllerTest.php b/api/tests/Feature/Enterprise/Oidc/OidcConnectionControllerTest.phpindex 15eb10fe9..1f946ae79 100644--- a/api/tests/Feature/Enterprise/Oidc/OidcConnectionControllerTest.php+++ b/api/tests/Feature/Enterprise/Oidc/OidcConnectionControllerTest.php@@ -430,6 +430,26 @@ describe('OidcConnectionController - Update Connection', function () {expect($options['field_mappings']['email'])->toBe('email_address');expect($options['custom_field'])->toBe('custom_value'); // Should be preserved});++ it('returns 404 when workspace and connection do not match', function () {+ $user = User::factory()->create(['email' => '[email protected]']);+ $this->actingAs($user);++ $workspaceA = Workspace::factory()->create();+ $workspaceB = Workspace::factory()->create();+ $user->workspaces()->attach($workspaceA->id, ['role' => 'admin']);+ $user->workspaces()->attach($workspaceB->id, ['role' => 'admin']);++ $connection = IdentityConnection::factory()->create([+ 'workspace_id' => $workspaceA->id,+ 'domain' => 'company.com',+ ]);++ $this->patchJson(+ "/open/workspaces/{$workspaceB->id}/oidc-connections/{$connection->id}",+ ['name' => 'Cross Workspace Update Attempt']+ )->assertStatus(404);+ });});describe('OidcConnectionController - Delete Connection', function () {diff --git a/api/tests/Feature/Forms/FormIntegrationEventTest.php b/api/tests/Feature/Forms/FormIntegrationEventTest.phpindex 445f3270f..d21619ce6 100644--- a/api/tests/Feature/Forms/FormIntegrationEventTest.php+++ b/api/tests/Feature/Forms/FormIntegrationEventTest.php@@ -31,3 +31,34 @@ it('can fetch form integration events', function () {->assertSuccessful()->assertJsonCount(0);});++it('prevents fetching another form integration events via mismatched form and integration ids', function () {+ $victim = $this->actingAsProUser();+ $victimWorkspace = $this->createUserWorkspace($victim);+ $victimForm = $this->createForm($victim, $victimWorkspace);++ $victimIntegrationResponse = $this->postJson(route('open.forms.integrations.create', $victimForm), [+ 'status' => 'active',+ 'integration_id' => 'webhook',+ 'logic' => null,+ 'data' => [+ 'webhook_url' => 'https://victim.example/webhook'+ ]+ ])->assertSuccessful();++ $victimIntegrationId = $victimIntegrationResponse->json('form_integration.id');++ \App\Models\Integration\FormIntegrationsEvent::create([+ 'integration_id' => $victimIntegrationId,+ 'status' => \App\Models\Integration\FormIntegrationsEvent::STATUS_SUCCESS,+ 'data' => ['message' => 'delivered']+ ]);++ $attacker = $this->createProUser();+ $this->actingAs($attacker, 'api');+ $attackerWorkspace = $this->createUserWorkspace($attacker);+ $attackerForm = $this->createForm($attacker, $attackerWorkspace);++ $this->getJson(route('open.forms.integrations.events', [$attackerForm, $victimIntegrationId]))+ ->assertStatus(404);+});diff --git a/api/tests/Feature/Forms/FormIntegrationTest.php b/api/tests/Feature/Forms/FormIntegrationTest.phpindex e028ff248..5a5c9d73c 100644--- a/api/tests/Feature/Forms/FormIntegrationTest.php+++ b/api/tests/Feature/Forms/FormIntegrationTest.php@@ -46,6 +46,70 @@ it('can CRUD form integration', function () {]);});+it('prevents updating another form integration via mismatched form and integration ids', function () {+ $victim = $this->actingAsProUser();+ $victimWorkspace = $this->createUserWorkspace($victim);+ $victimForm = $this->createForm($victim, $victimWorkspace);++ $victimCreateResponse = $this->postJson(route('open.forms.integrations.create', $victimForm), [+ 'status' => 'active',+ 'integration_id' => 'webhook',+ 'logic' => null,+ 'data' => [+ 'webhook_url' => 'https://victim.example/webhook'+ ]+ ])->assertSuccessful();++ $victimIntegrationId = $victimCreateResponse->json('form_integration.id');++ $attacker = $this->createProUser();+ $this->actingAs($attacker, 'api');+ $attackerWorkspace = $this->createUserWorkspace($attacker);+ $attackerForm = $this->createForm($attacker, $attackerWorkspace);++ $this->putJson(route('open.forms.integrations.update', [$attackerForm, $victimIntegrationId]), [+ 'status' => 'active',+ 'integration_id' => 'webhook',+ 'logic' => null,+ 'data' => [+ 'webhook_url' => 'https://attacker.example/steal'+ ]+ ])->assertStatus(404);++ $victimIntegration = \App\Models\Integration\FormIntegration::findOrFail((int) $victimIntegrationId);+ expect($victimIntegration->data->webhook_url)->toBe('https://victim.example/webhook');+});++it('prevents deleting another form integration via mismatched form and integration ids', function () {+ $victim = $this->actingAsProUser();+ $victimWorkspace = $this->createUserWorkspace($victim);+ $victimForm = $this->createForm($victim, $victimWorkspace);++ $victimCreateResponse = $this->postJson(route('open.forms.integrations.create', $victimForm), [+ 'status' => 'active',+ 'integration_id' => 'webhook',+ 'logic' => null,+ 'data' => [+ 'webhook_url' => 'https://victim.example/webhook'+ ]+ ])->assertSuccessful();++ $victimIntegrationId = $victimCreateResponse->json('form_integration.id');++ $attacker = $this->createProUser();+ $this->actingAs($attacker, 'api');+ $attackerWorkspace = $this->createUserWorkspace($attacker);+ $attackerForm = $this->createForm($attacker, $attackerWorkspace);++ $this->deleteJson(route('open.forms.integrations.destroy', [$attackerForm, $victimIntegrationId]))+ ->assertStatus(404);++ $this->assertDatabaseHas('form_integrations', [+ 'id' => $victimIntegrationId,+ 'form_id' => $victimForm->id+ ]);+});+it('forbids non-admin users from viewing integrations and events', function () {$owner = $this->actingAsProUser();$workspace = $this->createUserWorkspace($owner);@@ -498,4 +562,32 @@ describe('Webhook Integration', function () {expect($headers['X-API-Key'])->toBe('new-key');expect($headers['X-Request-ID'])->toBe('req-123');});++ it('rejects oauth provider from outside form workspace', function () {+ $attacker = $this->actingAsProUser();+ $attackerWorkspace = $this->createUserWorkspace($attacker);+ $attackerForm = $this->createForm($attacker, $attackerWorkspace);++ $victim = $this->createProUser();+ $victimProvider = \App\Models\OAuthProvider::factory()->create([+ 'user_id' => $victim->id,+ 'provider' => 'telegram'+ ]);++ $this->postJson(route('open.forms.integrations.create', $attackerForm), [+ 'status' => 'active',+ 'integration_id' => 'telegram',+ 'oauth_id' => $victimProvider->id,+ 'logic' => null,+ 'data' => [+ 'include_submission_data' => true,+ 'include_hidden_fields_submission_data' => false,+ 'link_open_form' => true,+ 'link_edit_form' => true,+ 'views_submissions_count' => true,+ 'link_edit_submission' => true+ ]+ ])->assertStatus(422)+ ->assertJsonValidationErrors(['oauth_id']);+ });});diff --git a/api/tests/Feature/Forms/FormStatTest.php b/api/tests/Feature/Forms/FormStatTest.phpindex 4aadd0f31..406598d5e 100644--- a/api/tests/Feature/Forms/FormStatTest.php+++ b/api/tests/Feature/Forms/FormStatTest.php@@ -134,3 +134,16 @@ it('checks form stats details', function () {->etc();});});++it('returns 404 when workspace and form do not match on stats endpoints', function () {+ $user = $this->actingAsProUser();+ $workspaceA = $this->createUserWorkspace($user);+ $workspaceB = $this->createUserWorkspace($user);+ $formInWorkspaceA = $this->createForm($user, $workspaceA);++ $this->getJson(route('open.workspaces.form.stats', [$workspaceB, $formInWorkspaceA]) . '?date_from=' . now()->subDays(7)->format('Y-m-d') . '&date_to=' . now()->format('Y-m-d'))+ ->assertStatus(404);++ $this->getJson(route('open.workspaces.form.stats-details', [$workspaceB, $formInWorkspaceA]))+ ->assertStatus(404);+});diff --git a/api/tests/Feature/Forms/FormSubmissionAuthorizationTest.php b/api/tests/Feature/Forms/FormSubmissionAuthorizationTest.phpnew file mode 100644index 000000000..bee201f7a--- /dev/null+++ b/api/tests/Feature/Forms/FormSubmissionAuthorizationTest.php@@ -0,0 +1,15 @@+<?php++it('rejects destroyMulti submission ids that do not belong to the target form', function () {+ $user = $this->actingAsProUser();+ $workspace = $this->createUserWorkspace($user);+ $formA = $this->createForm($user, $workspace);+ $formB = $this->createForm($user, $workspace);++ $foreignSubmission = $formB->submissions()->create();++ $this->postJson(route('open.forms.submissions.destroy-multi', $formA), [+ 'submissionIds' => [$foreignSubmission->id],+ ])->assertStatus(422)+ ->assertJsonValidationErrors(['submissionIds.0']);+});diff --git a/api/tests/Feature/Workspaces/WorkspaceUserTest.php b/api/tests/Feature/Workspaces/WorkspaceUserTest.phpindex 15176de04..07cf905d4 100644--- a/api/tests/Feature/Workspaces/WorkspaceUserTest.php+++ b/api/tests/Feature/Workspaces/WorkspaceUserTest.php@@ -63,6 +63,19 @@ it('can update user role in a workspace', function () {]);});+it('returns 404 when updating role for a user outside the workspace', function () {+ $outsideUser = User::factory()->create();++ $this->putJson(route('open.workspaces.users.update-role', [+ 'workspace' => $this->workspace,+ 'user' => $outsideUser+ ]), [+ 'role' => 'admin',+ ])->assertStatus(404);++ expect($this->workspace->users()->whereKey($outsideUser->id)->exists())->toBeFalse();+});+it('can remove a user from a workspace', function () {$existingUser = User::factory()->create();$this->workspace->users()->attach($existingUser);@@ -79,6 +92,17 @@ it('can remove a user from a workspace', function () {expect($this->workspace->users()->count())->toBe(1);});+it('returns 404 when removing a user outside the workspace', function () {+ $outsideUser = User::factory()->create();++ $this->deleteJson(route('open.workspaces.users.remove', [+ 'workspace' => $this->workspace,+ 'user' => $outsideUser+ ]))->assertStatus(404);++ expect($this->workspace->users()->whereKey($outsideUser->id)->exists())->toBeFalse();+});+it('can leave a workspace', function () {$this->postJson(route('open.workspaces.leave', ['workspace' => $this->workspace]))->assertSuccessful()