QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-07-19 15:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(security): block ORDER BY SQL injection via orderByField (GHSA-cp8p) (#670)

Browse Source 
v3 port. orderByField/orderBy were passed straight into Eloquent's orderBy()
in every model's scopeWhereOrder (and Invoice::scopeApplyFilters), allowing
arbitrary SQL in the ORDER BY clause.

Adds App\Support\SafeOrderBy::apply() (plain/table-qualified column identifier
only, asc/desc clamp) and routes all 10 model sort sinks through it. Aliased
sorts (e.g. estimates by customers.name) stay valid.

Adds unit tests for injection rejection, plain + aliased columns, direction clamp.
This commit is contained in:
Darko Gjorgjijoski
2026-06-12 11:02:15 +02:00
committed by GitHub
parent e56b6b4fe5
commit ca6dd57bf9
12 changed files with 85 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Customer.php
View File

@@ -3,6 +3,7 @@
namespace App\Models;
use App\Notifications\CustomerMailResetPasswordNotification;
use App\Support\SafeOrderBy;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -161,7 +162,7 @@ class Customer extends Authenticatable implements HasMedia
public function scopeWhereOrder($query, $orderByField, $orderBy)
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWhereSearch($query, $search)

3
app/Models/Estimate.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\Services\Document\EstimateService;
use App\Support\Pdf\PdfHtmlSanitizer;
use App\Support\Pdf\PdfTemplateUtils;
use App\Support\SafeOrderBy;
use App\Traits\GeneratesPdfTrait;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
@@ -191,7 +192,7 @@ class Estimate extends Model implements HasMedia
public function scopeWhereOrder($query, $orderByField, $orderBy)
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWhereCompany($query)

3
app/Models/Expense.php
View File

@@ -2,6 +2,7 @@
namespace App\Models;
use App\Support\SafeOrderBy;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
@@ -212,7 +213,7 @@ class Expense extends Model implements HasMedia
public function scopeWhereOrder(Builder $query, string $orderByField, string $orderBy): void
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWhereCompany(Builder $query): void

3
app/Models/FileDisk.php
View File

@@ -3,6 +3,7 @@
namespace App\Models;
use App\Services\Storage\FileDiskService;
use App\Support\SafeOrderBy;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@@ -49,7 +50,7 @@ class FileDisk extends Model
public function scopeWhereOrder($query, $orderByField, $orderBy)
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeFileDisksBetween($query, $start, $end)

6
app/Models/Invoice.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\Services\Document\InvoiceService;
use App\Support\Pdf\PdfHtmlSanitizer;
use App\Support\Pdf\PdfTemplateUtils;
use App\Support\SafeOrderBy;
use App\Traits\GeneratesPdfTrait;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
@@ -257,7 +258,7 @@ class Invoice extends Model implements HasMedia
public function scopeWhereOrder($query, $orderByField, $orderBy)
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeApplyFilters($query, array $filters)
@@ -286,7 +287,8 @@ class Invoice extends Model implements HasMedia
$query->where('customer_id', $customerId);
})->when($filters['orderByField'] ?? null, function ($query, $orderByField) use ($filters) {
$orderBy = $filters['orderBy'] ?? 'desc';
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}, function ($query) {
$query->orderBy('sequence_number', 'desc');
});

3
app/Models/Item.php
View File

@@ -2,6 +2,7 @@
namespace App\Models;
use App\Support\SafeOrderBy;
use Carbon\Carbon;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Database\Eloquent\Builder;
@@ -65,7 +66,7 @@ class Item extends Model
public function scopeWhereOrder(Builder $query, string $orderByField, string $orderBy): void
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWhereItem(Builder $query, int $item_id): void

3
app/Models/Payment.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\Jobs\GeneratePaymentPdfJob;
use App\Services\Document\PaymentService;
use App\Support\Pdf\PdfHtmlSanitizer;
use App\Support\SafeOrderBy;
use App\Traits\GeneratesPdfTrait;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
@@ -194,7 +195,7 @@ class Payment extends Model implements HasMedia
public function scopeWhereOrder($query, $orderByField, $orderBy)
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWherePayment($query, $payment_id)

3
app/Models/RecurringInvoice.php
View File

@@ -2,6 +2,7 @@
namespace App\Models;
use App\Support\SafeOrderBy;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
use Cron;
@@ -129,7 +130,7 @@ class RecurringInvoice extends Model
public function scopeWhereOrder($query, $orderByField, $orderBy)
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWhereStatus($query, $status)

3
app/Models/TaxType.php
View File

@@ -2,6 +2,7 @@
namespace App\Models;
use App\Support\SafeOrderBy;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
@@ -76,7 +77,7 @@ class TaxType extends Model
public function scopeWhereOrder(Builder $query, string $orderByField, string $orderBy): void
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWhereSearch(Builder $query, string $search): void

3
app/Models/User.php
View File

@@ -3,6 +3,7 @@
namespace App\Models;
use App\Notifications\MailResetPasswordNotification;
use App\Support\SafeOrderBy;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -194,7 +195,7 @@ class User extends Authenticatable implements HasMedia
public function scopeWhereOrder($query, $orderByField, $orderBy)
{
$query->orderBy($orderByField, $orderBy);
SafeOrderBy::apply($query, $orderByField, $orderBy);
}
public function scopeWhereSearch($query, $search)