Skip to content

Fix transliteration handling for uploaded file basenames #387

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
yama merged 3 commits into from
Feb 4, 2026
Merged

Fix transliteration handling for uploaded file basenames #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c187595
Fix transliteration handling for uploaded file basenames
yama Jan 22, 2026
75866b6
Fix upload filename sanitization via DocumentParser
yama Jan 22, 2026
ca5c3aa
Fix duplicate fallback in upload filename sanitizing
yama Jan 22, 2026
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
16 changes: 9 additions & 7 deletions manager/includes/document.parser.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5852,7 +5852,7 @@ public function move_uploaded_file($tmp_path, $target_path)
* @param string $filepath フルパス
* @return string サニタイズされたフルパス
*/
private function sanitizeUploadedFilename($filepath)
public function sanitizeUploadedFilename($filepath)
{
$dir = dirname($filepath);
$filename = basename($filepath);
Expand All @@ -5867,17 +5867,19 @@ private function sanitizeUploadedFilename($filepath)
$ext = '';
}

// ASCII文字以外を含む場合のみ処理
if (preg_match('/[^\x20-\x7E]/', $name)) {
// タイムスタンプベースの安全なファイル名を生成
$timestamp = date('Y-md');
$random = substr(md5(uniqid(mt_rand(), true)), 0, 8);
$name = sprintf('%s-%s', $timestamp, $random);
if ($this->config('clean_uploaded_filename') == 1) {
$name = $this->stripAlias($name, ['file_manager']);
}

// 安全でない文字を除去
$name = preg_replace('/[^a-zA-Z0-9._-]/', '_', $name);

if ($name === '') {
$timestamp = date('Ymd');
$random = substr(md5(uniqid(mt_rand(), true)), 0, 8);
$name = sprintf('%s-%s', $timestamp, $random);
}

return $dir . '/' . $name . $ext;
}

Expand Down
15 changes: 7 additions & 8 deletions manager/media/browser/mcpuk/connectors/Commands/FileUpload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,6 @@ function run()
}
}

if ($modx->config['clean_uploaded_filename'] == 1 && isset($ext)) {
$originalFilename = $filename;
$filename = $modx->stripAlias($filename, ['file_manager']);
if ($filename !== $originalFilename) {
$disp = "201,'ファイル名に使えない文字が含まれているため変更しました。'";
}
}

if (!array_key_exists('NewFile', $_FILES)) $disp = "202,'Unable to find uploaded file.'"; //No file uploaded with field name NewFile
elseif ($_FILES['NewFile']['error'] || ($typeconfig['MaxSize']) < $_FILES['NewFile']['size']) {
$disp = "202,'ファイル容量オーバーです。'";//Too big
Expand Down Expand Up @@ -130,6 +122,13 @@ function run()
$tmp_name = $_FILES['NewFile']['tmp_name'];
$filename = "{$basename}.{$ext}";
$target = "{$this->real_cwd}/{$filename}";
$originalFilename = $filename;
$target = $modx->sanitizeUploadedFilename($target);
$filename = basename($target);
$basename = substr($filename, 0, strrpos($filename, '.'));
if ($filename !== $originalFilename) {
$disp = "201,'ファイル名に使えない文字が含まれているため変更しました。'";
}
if (!is_file($target)) {
//Upload file
$rs = $this->file_upload($tmp_name, $target);
Expand Down