| ▤
-
+
@@ -246,12 +247,12 @@ require_once __DIR__ . '/../../includes/workspace.php';
Audio
-
+
-
+
PDF
@@ -261,28 +262,28 @@ require_once __DIR__ . '/../../includes/workspace.php';
|
- stat($currentPath . '/' . $file)['size']) ?>
+ stat(rtrim($currentPath, '/') . '/' . $file)['size']) ?>
|
-
+
diff --git a/Web/content/ftp/open.php b/Web/content/ftp/open.php
index 469a5d7..4a2fe58 100644
--- a/Web/content/ftp/open.php
+++ b/Web/content/ftp/open.php
@@ -52,7 +52,7 @@ if (!empty($filePath) && $sftp->file_exists($filePath) && !$sftp->is_dir($filePa
$showLineNumbers = in_array(strtolower($extension), ['php', 'js', 'html', 'css', 'py', 'java', 'c', 'cpp', 'h', 'hpp', 'rb', 'sh', 'xml', 'json']);
-$parentDir = dirname($filePath);
+$parentDir = remoteDirname($filePath);
?>
diff --git a/Web/content/ftp/pdf.php b/Web/content/ftp/pdf.php
index 07d6c14..2e256e2 100644
--- a/Web/content/ftp/pdf.php
+++ b/Web/content/ftp/pdf.php
@@ -134,7 +134,7 @@ if (isset($_GET['stream'])) {
'title' => $fileName,
'description' => 'Browse your document without leaving the workspace.',
'connected' => true,
- 'back' => 'index.php?path=' . urlencode(dirname($filePath)),
+ 'back' => 'index.php?path=' . urlencode(remoteDirname($filePath)),
'class' => 'pdf-page',
]); ?>
diff --git a/Web/content/ftp/rename.php b/Web/content/ftp/rename.php
index a385cbe..b44d93f 100644
--- a/Web/content/ftp/rename.php
+++ b/Web/content/ftp/rename.php
@@ -26,7 +26,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
die("Missing required information for renaming.");
}
- $dirPath = dirname($oldPath);
+ $dirPath = remoteDirname($oldPath);
$oldName = basename($oldPath);
$newPath = $dirPath . '/' . $newName;
diff --git a/Web/content/ftp/upload.php b/Web/content/ftp/upload.php
index 11d6ce0..a8d37f4 100644
--- a/Web/content/ftp/upload.php
+++ b/Web/content/ftp/upload.php
@@ -20,7 +20,7 @@ function createDirectoryRecursive($sftp, $path) {
return true;
}
- $parent = dirname($path);
+ $parent = remoteDirname($path);
if ($parent != '/' && !$sftp->is_dir($parent)) {
createDirectoryRecursive($sftp, $parent);
}
@@ -91,7 +91,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!empty($relativePath)) {
$fileName = basename($relativePath);
- $dirPart = dirname($relativePath);
+ $dirPart = remoteDirname($relativePath);
if ($dirPart !== '.' && $dirPart !== '') {
$remoteDirPath = $currentPath . '/' . $dirPart;
diff --git a/Web/content/ftp/view.php b/Web/content/ftp/view.php
index b0c6a8f..bb4cc3f 100644
--- a/Web/content/ftp/view.php
+++ b/Web/content/ftp/view.php
@@ -38,7 +38,7 @@ if (isset($_POST['createShare'])) {
if ($stmt->execute()) {
$shareUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]" .
- dirname($_SERVER['PHP_SELF']) . "/shared.php?token=$token";
+ remoteDirname($_SERVER['PHP_SELF']) . "/shared.php?token=$token";
$_SESSION['shareCreated'] = true;
$_SESSION['shareUrl'] = $shareUrl;
@@ -274,7 +274,7 @@ if (isset($_GET['stream'])) {
'title' => $fileName,
'description' => 'Preview your media, download a copy or create a shared link.',
'connected' => true,
- 'back' => 'index.php?path=' . urlencode(dirname($filePath)),
+ 'back' => 'index.php?path=' . urlencode(remoteDirname($filePath)),
'class' => 'media-page',
]); ?>
diff --git a/Web/includes/remotepaths.php b/Web/includes/remotepaths.php
new file mode 100644
index 0000000..38f8cf8
--- /dev/null
+++ b/Web/includes/remotepaths.php
@@ -0,0 +1,24 @@
+ $part !== '' && $part !== '.');
+ $stack = [];
+ foreach ($parts as $part) {
+ if ($part === '..') {
+ array_pop($stack);
+ } else {
+ $stack[] = $part;
+ }
+ }
+ return '/' . implode('/', $stack);
+}
+
+/** Like dirname(), but only '/' is a separator and the root stays '/'. */
+function remoteDirname(string $path): string {
+ $path = rtrim($path, '/');
+ if ($path === '') return '/';
+ $separator = strrpos($path, '/');
+ if ($separator === false) return '.';
+ $parent = rtrim(substr($path, 0, $separator), '/');
+ return $parent === '' ? '/' : $parent;
+}
diff --git a/tests/remotepaths_test.php b/tests/remotepaths_test.php
new file mode 100644
index 0000000..4ab0811
--- /dev/null
+++ b/tests/remotepaths_test.php
@@ -0,0 +1,31 @@
+ '/',
+ '/etc' => '/',
+ '/etc/' => '/',
+ '/etc/file.txt' => '/etc',
+ '//etc//file.txt' => '//etc',
+ '/folder with spaces/item.txt' => '/folder with spaces',
+ 'folder/file.txt' => 'folder',
+ 'file.txt' => '.',
+ '/a\\b/file.txt' => '/a\\b', // Backslash is a valid POSIX filename character.
+];
+foreach ($parents as $path => $expected) {
+ if (remoteDirname($path) !== $expected) throw new RuntimeException('Incorrect parent for ' . $path);
+}
+foreach (['/' => '/', '//etc/../' => '/', '/etc/../../' => '/', '/etc/./ssh/' => '/etc/ssh'] as $path => $expected) {
+ if (normalizePath($path) !== $expected) throw new RuntimeException('Incorrect normalized path for ' . $path);
+}
+// Round trips must remain correct on both Windows/XAMPP and Linux.
+foreach (['/etc', '/mnt/raid', '/folder with spaces'] as $directory) {
+ $parent = normalizePath(remoteDirname($directory));
+ if ($parent !== ($directory === '/mnt/raid' ? '/mnt' : '/')) throw new RuntimeException('Invalid navigation round trip');
+}
+// ZIP paths keep the top-level directory name when it is directly under root.
+foreach (['/etc' => '/etc/config.txt', '/mnt/raid' => '/mnt/raid/config.txt'] as $base => $file) {
+ $relative = substr($file, strlen(rtrim(remoteDirname($base), '/')) + 1);
+ if ($relative !== ($base === '/etc' ? 'etc/config.txt' : 'raid/config.txt')) throw new RuntimeException('Incorrect ZIP member path');
+}
+echo "Remote paths: POSIX parents, normalization, root navigation and ZIP paths passed.\n";
diff --git a/tests/workspace_test.php b/tests/workspace_test.php
index 7daa995..32b93c5 100644
--- a/tests/workspace_test.php
+++ b/tests/workspace_test.php
@@ -1,5 +1,6 @@
'michal', 'admin' => $admin, 'upPer' => true, 'downPer' => true, 'delPer' => true];
- $defaultPath = '/mnt/raid'; $currentPath = '/mnt/raid/Workspace';
$filePath = $currentPath . '/Example.pdf'; $fileName = basename($filePath); $parentDir = $currentPath;
$fileExtension = 'png'; $fileSize = 245760; $mimeType = 'image/png';
$isImage = true; $isVideo = false; $isAudio = false;
@@ -75,6 +75,12 @@ foreach ($pages as $name) {
$member = renderWorkspaceFixture('index', false);
expectWorkspace(strpos($member, 'User management') === false && strpos($member, '> Server status') === false, 'Member navigation omits admin pages');
expectWorkspace(strpos($member, 'Account settings') !== false, 'Members can access account settings');
+$rootChild = renderWorkspaceFixture('index', true, '/', '/etc');
+expectWorkspace(strpos($rootChild, 'href="?path=%2F"') !== false, 'Parent link from a root child uses a POSIX slash');
+expectWorkspace(strpos($rootChild, '%5C') === false, 'No Windows separator in remote links');
+$root = renderWorkspaceFixture('index', true, '/', '/');
+expectWorkspace(strpos($root, 'Parent folder') === false, 'Root has no parent-folder link');
+expectWorkspace(strpos($root, 'href="?path=%2FDocuments"') !== false, 'Root children use a single leading slash');
if ($preview) {
// One-page PDF fixture for viewer navigation and fullscreen checks.
$stream = "BT /F1 24 Tf 60 700 Td (USB RAID workspace preview) Tj ET";
|