Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/#265201 security issues #505

Merged
merged 2 commits into from
Aug 13, 2024
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
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"psr/container": "^1.0",
"psr/link": "^1.0",
"psr/log": "^1|^2",
"qipsius/tcpdf-bundle": "^2.0",
"stof/doctrine-extensions-bundle": "^1.6",
"symfony/asset": "^6.4",
"symfony/config": "^6.4",
Expand Down
121 changes: 1 addition & 120 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
App\Mealz\MealBundle\MealzMealBundle::class => ['all' => true],
App\Mealz\UserBundle\MealzUserBundle::class => ['all' => true],
App\Mealz\AccountingBundle\MealzAccountingBundle::class => ['all' => true],
Qipsius\TCPDFBundle\QipsiusTCPDFBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true, 'staging' => true],
Expand Down
2 changes: 0 additions & 2 deletions config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,6 @@ services:
<<: *mm_service_args
$webhookURL: '%app.notifier.mattermost.weekly_menu.webhook_url%'

Qipsius\TCPDFBundle\Controller\TCPDFController: '@qipsius.tcpdf'

App\Mealz\MealBundle\Service\CombinedMealService:
arguments:
$combinedPrice: '%mealz.meal.combined.price%'
Expand Down
60 changes: 0 additions & 60 deletions src/Mealz/AccountingBundle/Controller/AccountingBookController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@
use App\Mealz\MealBundle\Controller\BaseController;
use DateTime;
use Exception;
use Qipsius\TCPDFBundle\Controller\TCPDFController;
use ReflectionException;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Contracts\Translation\TranslatorInterface;

#[IsGranted('ROLE_KITCHEN_STAFF')]
class AccountingBookController extends BaseController
Expand Down Expand Up @@ -97,61 +94,4 @@ public function listAllTransactions(?string $dateRange, TransactionRepositoryInt

return new JsonResponse($response, Response::HTTP_OK);
}

/**
* Export transaction table as PDF for finance staff.
*
* @throws ReflectionException
* @throws Exception
*/
public function exportPDF(
?string $dateRange,
TCPDFController $pdfGen,
TransactionRepositoryInterface $transactionRepo,
TranslatorInterface $translator
): Response {
// Get date range set with date range picker by user
$dateRange = str_replace('-', '/', $dateRange);
$dateRangeArray = explode('&', $dateRange);
$minDate = new DateTime($dateRangeArray[0]);
$maxDate = new DateTime($dateRangeArray[1]);

$heading = $minDate->format('d.m.') . ' - ' . $maxDate->format('d.m.Y');
$transactions = $transactionRepo->findAllTransactionsInDateRange($minDate, $maxDate);

// Create PDF file
$pdf = $pdfGen->create(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
$pdf->setHeaderData('', 0, '', '', [0, 0, 0], [255, 255, 255]);
$pdf->setPrintHeader(false);
$pdf->setPrintFooter(false);
$pdf->AddPage();

$filename = $translator->trans('payment.transaction_history.finances.pdf') . '-' . $minDate->format('d.m.Y') . '-' . $maxDate->format('d.m.Y');
$pdf->SetTitle($filename);

$cssFile = file_get_contents(__DIR__ . '/../Resources/css/transaction-export.css');

$includeCSS = '<style>' . $cssFile . '</style>';

$html = $this->renderView('MealzAccountingBundle:Accounting/Finance:print_finances.html.twig', [
'headingFirst' => null,
'heading' => $heading,
'transactionsFirst' => null,
'transactions' => $transactions,
'minDate' => $minDate->format('m/d/Y'),
'maxDate' => $maxDate->format('m/d/Y'),
]);

$pdf->writeHTML($includeCSS . $html);

$content = $pdf->Output($filename . '.pdf', 'S');
$now = gmdate('D, d M Y H:i:s') . ' GMT';

return new Response($content, Response::HTTP_OK, [
'Content-Type' => 'application/pdf',
'Expires' => $now,
'Last-Modified' => $now,
'Content-Disposition' => 'inline; filename="' . basename($filename) . '"',
]);
}
}
4 changes: 0 additions & 4 deletions src/Mealz/AccountingBundle/Resources/config/routing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ mealz_accounting_accounting_book_finance:
path: /api/accounting/book/finance/list/{dateRange}
defaults: { _controller: App\Mealz\AccountingBundle\Controller\AccountingBookController::listAllTransactions, dateRange: null }

mealz_accounting_accounting_book_finance_export:
path: /api/accounting/book/finance/export/{dateRange}
defaults: { _controller: App\Mealz\AccountingBundle\Controller\AccountingBookController::exportPDF, dateRange: null }

mealz_accounting_api_costs:
path: /api/costs
defaults: { _controller: App\Mealz\AccountingBundle\Controller\CostSheetController::list }
Expand Down
17 changes: 0 additions & 17 deletions src/Mealz/AccountingBundle/Resources/css/transaction-export.css

This file was deleted.

6 changes: 0 additions & 6 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,6 @@
"psr/log": {
"version": "1.1.4"
},
"qipsius/tcpdf-bundle": {
"version": "2.0.2"
},
"sebastian/cli-parser": {
"version": "1.0.1"
},
Expand Down Expand Up @@ -573,9 +570,6 @@
"symfony/yaml": {
"version": "v5.3.6"
},
"tecnickcom/tcpdf": {
"version": "6.2.26"
},
"twig/twig": {
"version": "v1.44.4"
},
Expand Down
Loading
Loading