Release 2.58 (#5952)
* bump version * fix formatting locale reset after embedded controller sub-requests (#5944) * fix GHSA-c6w6-57jj-62vh * fix GHSA-m492-gv72-xvxj * fix GHSA-jr9p-4h4j-6c58 * make sure to only use JS logic to call API endpoints * fixes GHSA-r8vr-m544-qh4h * make sure to only use JS logic to call API endpoints * fix GHSA-rw46-qg69-vg6h * fix GHSA-pj8j-p4g4-4vw8 - prevent kimai from rendering images via markdown * fix GHSA-pj8j-p4g4-4vw8 - use a safe network client to prevent SSRF via images * fix GHSA-xv4r-4885-gwpg * fix GHSA-pgcc-vfmc-7cw5 - move GET routes to API with POST method to prevent CSRF * fix tooltip survives page reload * updated wizard images * split wizard and password reset subscriber into two classes * relax upper php limit * added zizmor workflow scans and apply findings * user permissions <name>_other_profile now respect teams * move all linting steps to new job * updated docker image version names * use .env.local for storing APP_SECRET * improve build order and use given tag as ref for checkout, not default main branch * improved APP_SECRET handling, see entrypoint.sh * use local code for building the image for more flexibility, added dockerignore
This commit is contained in:
@@ -13,6 +13,8 @@ use App\Constants;
|
||||
use App\Utils\FileHelper;
|
||||
use Mpdf\Config\ConfigVariables;
|
||||
use Mpdf\Config\FontVariables;
|
||||
use Mpdf\Container\SimpleContainer;
|
||||
use Mpdf\Http\ClientInterface;
|
||||
use Mpdf\Mpdf;
|
||||
use Mpdf\Output\Destination;
|
||||
|
||||
@@ -20,7 +22,8 @@ final class MPdfConverter implements HtmlToPdfConverter
|
||||
{
|
||||
public function __construct(
|
||||
private readonly FileHelper $fileHelper,
|
||||
private readonly string $cacheDirectory
|
||||
private readonly string $cacheDirectory,
|
||||
private readonly ?ClientInterface $httpClient = null,
|
||||
)
|
||||
{
|
||||
}
|
||||
@@ -116,7 +119,17 @@ final class MPdfConverter implements HtmlToPdfConverter
|
||||
unset($options['additional_xmp_rdf']);
|
||||
}
|
||||
|
||||
$mpdf = new Mpdf($options);
|
||||
// Inject a safe HTTP client into mPDF (via its service container) so
|
||||
// remote resources referenced from Twig templates — typically `<img
|
||||
// src="...">` for company logos — cannot be abused to probe private
|
||||
// networks. The configured Symfony client is decorated with
|
||||
// NoPrivateNetworkHttpClient at the service-container level.
|
||||
// @see https://github.com/kimai/kimai/security/advisories/GHSA-pj8j-p4g4-4vw8
|
||||
$container = $this->httpClient !== null
|
||||
? new SimpleContainer(['httpClient' => $this->httpClient])
|
||||
: null;
|
||||
|
||||
$mpdf = new Mpdf($options, $container);
|
||||
$mpdf->creator = Constants::SOFTWARE;
|
||||
|
||||
if (\count($associatedFiles) > 0) {
|
||||
|
||||
Reference in New Issue
Block a user