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

[feature/attach-dl] Added a function for checking allowed extensions

Browse source 
PHPBB3-11042
This commit is contained in:
Fyorl 2012-08-04 15:29:26 +01:00
parent 50af76da7d
commit 16ec660e76
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/download/file.php
View file

@ -318,26 +318,20 @@ else
// disallowed? // disallowed?
$extensions = $cache->obtain_attach_extensions($row['forum_id']); $extensions = $cache->obtain_attach_extensions($row['forum_id']);
if ($attachment)
if ($attachments)
{ {
// Remove attachments with disallowed extensions $ary = array($attachment);
$new_ary = array(); }
foreach ($attachments as $attach) else
{ {
if (isset($extensions['_allowed_'][$attach['extension']])) $ary = &$attachments;
{
$new_ary[] = $attach;
}
}
$attachments = $new_ary;
} }
if (($attachments && empty($attachments)) || ($attachment && !isset($extensions['_allowed_'][$attachment['extension']]))) if (!phpbb_check_attach_extensions($extensions, $ary))
{ {
send_status_line(404, 'Forbidden'); send_status_line(404, 'Forbidden');
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension'])); $ext = ($attachment) ? $attachment['extension'] : $attachments[0]['extension'];
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $ext));
} }
} }

23
phpBB/includes/functions_download.php
View file

@ -613,3 +613,26 @@ function phpbb_increment_downloads($db, $ids)
WHERE ' . $db->sql_in_set('attach_id', $ids); WHERE ' . $db->sql_in_set('attach_id', $ids);
$db->sql_query($sql); $db->sql_query($sql);
} }
/**
* Checks every attachment to see if it has an allowed extension
*
* @param array $extensions As generated by phpbb_cache_service::obtain_attach_extensions
* @param array &$attachments An array of attachments to check
*
* @return bool Whether any of the attachments had allowed extensions
*/
function phpbb_check_attach_extensions($extensions, &$attachments)
{
$new_ary = array();
foreach ($attachments as $attach)
{
if (isset($extensions['_allowed_'][$attach['extension']]))
{
$new_ary[] = $attach;
}
}
$attachments = $new_ary;
return !empty($attachments);
}