Skip to content

Update the delete_post, delete_page, and delete_comment functions #1039

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

Open
KuJoe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update the delete_post, delete_page, and delete_comment functions #1039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 53 additions & 19 deletions system/admin/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,39 +1129,52 @@ function delete_post($file, $destination)
{
if (!login())
return null;
$deleted_content = $file;
$user = $_SESSION[site_url()]['user'];
$role = user('role', $user);
$arr = explode('/', $file);

// realpath resolves all traversal operations like ../

// Resolve user-supplied path and content root to canonical paths.
$realFilePath = realpath($file);
$realContentDir = realpath('content');
if ($realFilePath === false || $realContentDir === false) {
return;
}

// realpath returns an empty string if the file does not exist
if ($realFilePath == '') {
// Ensure file is inside content/ (with directory boundary protection).
$contentDir = rtrim($realContentDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
if (strpos($realFilePath, $contentDir) !== 0) {
return;
}

// get the current project working directory
$cwd = getcwd();
if (strtolower(pathinfo($realFilePath, PATHINFO_EXTENSION)) !== 'md') {
return;
}

// content directory relative to the current project working directory
$contentDir = $cwd . DIRECTORY_SEPARATOR . 'content';
$deleted_content = $realFilePath;
$relativePath = str_replace('\\', '/', substr($realFilePath, strlen($contentDir)));
$pathParts = explode('/', $relativePath);
$postOwner = isset($pathParts[0]) ? $pathParts[0] : null;

// if the file path does not start with $contentDir, it means its accessing
// files in folders other than content
if (strpos($realFilePath, $contentDir) !== 0) {
if (count($pathParts) < 5 || $pathParts[1] !== 'blog') {
return;
}

// Get cache file
$info = pathinfo($file);
$info = pathinfo($relativePath);
$fn = explode('_', $info['basename']);
$dr = explode('/', $info['dirname']);
clear_post_cache($fn[0], $fn[1], str_replace('.md', '', $fn[2]), $file, $dr[3], $dr[4]);
if (count($fn) < 3) {
return;
}

$category = isset($pathParts[2]) ? $pathParts[2] : null;
$type = isset($pathParts[3]) ? $pathParts[3] : null;
if ($category === null || $type === null) {
return;
}

clear_post_cache($fn[0], $fn[1], str_replace('.md', '', $fn[2]), $deleted_content, $category, $type);

if (!empty($deleted_content)) {
if ($user === $arr[1] || $role === 'editor' || $role === 'admin') {
if ($user === $postOwner || $role === 'editor' || $role === 'admin') {
unlink($deleted_content);
delete_comments($deleted_content);
rebuilt_cache('all');
Expand All @@ -1181,7 +1194,6 @@ function delete_page($file, $destination)
{
if (!login())
return null;
$deleted_content = $file;
$user = $_SESSION[site_url()]['user'];
$role = user('role', $user);

Expand All @@ -1205,6 +1217,12 @@ function delete_page($file, $destination)
return;
}

if (strtolower(pathinfo($realFilePath, PATHINFO_EXTENSION)) !== 'md') {
return;
}

$deleted_content = $realFilePath;

if (!empty($menu)) {
foreach (glob('cache/page/*.cache', GLOB_NOSORT) as $file) {
unlink($file);
Expand Down Expand Up @@ -2012,7 +2030,23 @@ function rename_comments($oldfile, $newfile) {


function delete_comments($mdfile) {
$file_comments = get_comments_file_from_md($mdfile);
if (strtolower(pathinfo($mdfile, PATHINFO_EXTENSION)) !== 'md') {
return false;
}

$realContentDir = realpath('content');
$realTargetDir = realpath(dirname($mdfile));
if ($realContentDir === false || $realTargetDir === false) {
return false;
}

$targetFile = $realTargetDir . DIRECTORY_SEPARATOR . basename($mdfile);
$contentDir = rtrim($realContentDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
if (strpos($targetFile, $contentDir) !== 0) {
return false;
}

$file_comments = get_comments_file_from_md($targetFile);
if (is_file($file_comments)) {
unlink($file_comments);
return true;
Expand Down