Skip to content

Takes care of attachment headers #40

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
NickSdot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Takes care of attachment headers #40

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
37 changes: 34 additions & 3 deletions getpart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

require 'common.php';

function sanitise_header_value($value)
{
// Values must not contain control bytes; stripping them
// prevents rejected or injected response headers.

return trim(preg_replace('/[\x00-\x1F\x7F]/', '', (string) $value));
}

if (isset($_GET['group'])) {
$group = preg_replace('@[^A-Za-z0-9.-]@', '', $_GET['group']);
} else {
Expand Down Expand Up @@ -43,14 +51,37 @@
$contentdisposition = 'attachment';

if (!empty($attachment['filename'])) {
$contentdisposition .= '; filename="' . $attachment['filename'] . '"';

// Use a simple download name; attachment filenames
// are not trusted message content.

$filename = basename(str_replace('\\', '/', sanitise_header_value($attachment['filename'])));
} else {
$filename = '';
}

if ($filename === '') {
$filename = 'attachment';
}

$contentdisposition .= '; filename="' . addcslashes($filename, '\\"') . '"';

$mimetype = sanitise_header_value($attachment['mimetype']);

// Only send a bare type/subtype MIME value; parameters
// and malformed values fall back safely.

if (!preg_match('#^[a-z0-9!#$&^_.+-]+/[a-z0-9!#$&^_.+-]+$#i', $mimetype)) {
$mimetype = 'application/octet-stream';
}

header('Content-Type: ' . $attachment['mimetype']);
header('X-Content-Type-Options: nosniff');
header('Content-Security-Policy: sandbox');
header('Content-Type: ' . $mimetype);
header('Content-Disposition: ' . $contentdisposition);

if (isset($attachment['description'])) {
header('Content-Description: ' . $attachment['description']);
header('Content-Description: ' . sanitise_header_value($attachment['description']));
}

echo $attachment['data'];
Expand Down