Skip to content

[stable22] Check if SVG path is valid #28734

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.

Sign up for GitHub

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

Merged
LukasReschke merged 3 commits into from
Sep 7, 2021
Merged

[stable22] Check if SVG path is valid #28734

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3061f8a
Check if SVG path is valid
LukasReschke Sep 6, 2021
b87649b
Fix codestyle
LukasReschke Sep 6, 2021
1d5bcdf
Resolve absolute path in tests
LukasReschke Sep 6, 2021
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
Next Next commit
Check if SVG path is valid 
Signed-off-by: Lukas Reschke <[email protected]>
  • Loading branch information
@LukasReschke @backportbot
LukasReschke authored and backportbot[bot] committed Sep 7, 2021
commit 3061f8a5299e872a88e4f35e9366cee84045d354
5 changes: 5 additions & 0 deletions core/Controller/SvgController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*/
namespace OC\Core\Controller;

use OC\Files\Filesystem;
use OC\Template\IconsCacher;
use OCP\App\AppPathNotFoundException;
use OCP\App\IAppManager;
Expand Down Expand Up @@ -117,6 +118,10 @@ public function getSvgFromApp(string $app, string $fileName, string $color = 'ff
* @return DataDisplayResponse|NotFoundResponse
*/
private function getSvg(string $path, string $color, string $fileName) {
if(!Filesystem::isValidPath($path)) {
return new NotFoundResponse();
}

if (!file_exists($path)) {
return new NotFoundResponse();
}
Expand Down