Skip to content

From Library button on Windows generates the correct URL #2422

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
bobdenotter merged 3 commits into from
Feb 24, 2021
Merged

From Library button on Windows generates the correct URL #2422

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cc27e9
From Library button on Windows generates the correct URL
I-Valchev Feb 24, 2021
9aa3896
From Library button on Windows generates the correct URL
I-Valchev Feb 24, 2021
b2cbf5b
Merge branch 'bugfix/media-paths-on-windows' of https://github.com/bo…
I-Valchev Feb 24, 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
19 changes: 15 additions & 4 deletions src/Controller/Backend/Async/FileListingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
namespace Bolt\Controller\Backend\Async;

use Bolt\Configuration\Config;
use Bolt\Utils\PathCanonicalize;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\Finder\Finder;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Routing\Annotation\Route;
use Tightenco\Collect\Support\Collection;
use Webmozart\PathUtil\Path;

/**
* @Security("is_granted('ROLE_ADMIN')")
Expand All @@ -24,10 +26,14 @@ class FileListingController implements AsyncZoneInterface
/** @var Request */
private $request;

public function __construct(Config $config, RequestStack $requestStack)
/** @var string */
private $publicPath;

public function __construct(Config $config, RequestStack $requestStack, string $projectDir, string $publicFolder)
{
$this->config = $config;
$this->request = $requestStack->getCurrentRequest();
$this->publicPath = $projectDir . DIRECTORY_SEPARATOR . $publicFolder;
}

/**
Expand All @@ -38,7 +44,12 @@ public function index(): JsonResponse
$locationName = $this->request->query->get('location', 'files');
$type = $this->request->query->get('type', '');

$path = $this->config->getPath($locationName, true);
// @todo: config->getPath does not return the correct relative URL.
// Hence, we use the Path::makeRelative. Fix this once config generates the correct relative path.
$relativeLocation = Path::makeRelative($this->config->getPath($locationName, false), $this->publicPath);

// Do not allow any path outside of the public directory.
$path = PathCanonicalize::canonicalize($this->publicPath, $relativeLocation);

$files = $this->getFilesIndex($path, $type);

Expand All @@ -57,8 +68,8 @@ private function getFilesIndex(string $path, string $type): Collection

foreach ($this->findFiles($path, $glob) as $file) {
$files[] = [
'group' => $file->getRelativePath(),
'value' => $file->getRelativePathname(),
'group' => Path::canonicalize($file->getRelativePath()),
'value' => Path::canonicalize($file->getRelativePathname()),
'text' => $file->getFilename(),
];
}
Expand Down