makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15687] Force supplied filename to be correct and modify route

Browse source 
PHPBB3-15687
This commit is contained in:
Marc Alexander 2023-06-28 10:51:22 +02:00
parent 5cb0b267d3
commit 4e9cf239ed
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
9 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/config/default/routing/storage.yml
View file

@ -4,9 +4,9 @@ phpbb_storage_avatar:
_controller: storage.controller.avatar:handle _controller: storage.controller.avatar:handle
phpbb_storage_attachment: phpbb_storage_attachment:
path: /attachment/{file}/{filename} path: /attachment/{id}/{filename}
defaults: defaults:
filename: '' filename: ''
_controller: storage.controller.attachment:handle _controller: storage.controller.attachment:handle_attachment
requirements: requirements:
file: \d+ id: \d+

2
phpBB/download/file.php
View file

@ -47,7 +47,7 @@ $thumbnail = $request->variable('t', false);
$response = new RedirectResponse( $response = new RedirectResponse(
$controller_helper->route('phpbb_storage_attachment', array( $controller_helper->route('phpbb_storage_attachment', array(
'file' => $attach_id, 'id' => $attach_id,
't' => $thumbnail, 't' => $thumbnail,
), false), ), false),
301 301

4
phpBB/includes/acp/acp_attachments.php
View file

@ -1115,7 +1115,7 @@ class acp_attachments
'U_FILE' => $this->controller_helper->route( 'U_FILE' => $this->controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $row['attach_id'], 'id' => (int) $row['attach_id'],
'filename' => $row['real_filename'], 'filename' => $row['real_filename'],
] ]
), ),
@ -1311,7 +1311,7 @@ class acp_attachments
'U_FILE' => $this->controller_helper->route( 'U_FILE' => $this->controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => $row['attach_id'], 'id' => $row['attach_id'],
'filename' => $row['real_filename'], 'filename' => $row['real_filename'],
] ]
) )

2
phpBB/includes/acp/acp_users.php
View file

@ -2309,7 +2309,7 @@ class acp_users
'U_DOWNLOAD' => $controller_helper->route( 'U_DOWNLOAD' => $controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $row['attach_id'], 'id' => (int) $row['attach_id'],
'filename' => $row['real_filename'], 'filename' => $row['real_filename'],
] ]
), ),

6
phpBB/includes/functions_content.php
View file

@ -1288,7 +1288,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
$download_link = $controller_helper->route( $download_link = $controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $attachment['attach_id'], 'id' => (int) $attachment['attach_id'],
'filename' => $attachment['real_filename'], 'filename' => $attachment['real_filename'],
] ]
); );
@ -1301,7 +1301,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
$inline_link = $controller_helper->route( $inline_link = $controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $attachment['attach_id'], 'id' => (int) $attachment['attach_id'],
'filename' => $attachment['real_filename'], 'filename' => $attachment['real_filename'],
] ]
); );
@ -1319,7 +1319,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
$thumbnail_link = $controller_helper->route( $thumbnail_link = $controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $attachment['attach_id'], 'id' => (int) $attachment['attach_id'],
'filename' => $attachment['real_filename'], 'filename' => $attachment['real_filename'],
't' => 1, 't' => 1,
] ]

2
phpBB/includes/functions_posting.php
View file

@ -872,7 +872,7 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_a
->route( ->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $attach_row['attach_id'], 'id' => (int) $attach_row['attach_id'],
'filename' => $attach_row['real_filename'], 'filename' => $attach_row['real_filename'],
] ]
); );

2
phpBB/includes/message_parser.php
View file

@ -1719,7 +1719,7 @@ class parse_message extends bbcode_firstpass
$download_url = $controller_helper->route( $download_url = $controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $new_entry['attach_id'], 'id' => (int) $new_entry['attach_id'],
'filename' => $new_entry['real_filename'], 'filename' => $new_entry['real_filename'],
] ]
); );

2
phpBB/includes/ucp/ucp_attachments.php
View file

@ -188,7 +188,7 @@ class ucp_attachments
'U_VIEW_ATTACHMENT' => $controller_helper->route( 'U_VIEW_ATTACHMENT' => $controller_helper->route(
'phpbb_storage_attachment', 'phpbb_storage_attachment',
[ [
'file' => (int) $row['attach_id'], 'id' => (int) $row['attach_id'],
'filename' => $row['real_filename'], 'filename' => $row['real_filename'],
] ]
), ),

12
phpBB/phpbb/storage/controller/attachment.php
View file

@ -86,11 +86,14 @@ class attachment extends controller
} }
/** /**
* {@inheritdoc} * Handle attachments
*
* @param int $id File ID
* @param string $filename Filename
*/ */
public function handle(string $file): Response public function handle_attachment(int $id, string $filename): Response
{ {
$attach_id = (int) $file; $attach_id = $id;
$thumbnail = $this->request->variable('t', false); $thumbnail = $this->request->variable('t', false);
$this->language->add_lang('viewtopic'); $this->language->add_lang('viewtopic');
@ -109,7 +112,8 @@ class attachment extends controller
is_orphan, physical_filename, real_filename, extension, mimetype, is_orphan, physical_filename, real_filename, extension, mimetype,
filesize, filetime filesize, filetime
FROM ' . ATTACHMENTS_TABLE . " FROM ' . ATTACHMENTS_TABLE . "
WHERE attach_id = $attach_id"; WHERE attach_id = $attach_id" .
(($filename) ? " AND real_filename = '" . $this->db->sql_escape($filename) . "'" : '');
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$attachment = $this->db->sql_fetchrow($result); $attachment = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);