From 279968360b96cf2f43dddcd682be6cf025bb606b Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 14 Aug 2013 18:57:06 +0000
Subject: [PATCH] Fix incorrect file attachment if filetype is rejected
If an attachment is submitted via the API and the filetype is rejected, the
file would be attached anyway. However, if the file was encoded base64, the
content would not be decoded.
---
include/api.tickets.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/api.tickets.php b/include/api.tickets.php
index f7b8ce357..6bb212c68 100644
--- a/include/api.tickets.php
+++ b/include/api.tickets.php
@@ -42,7 +42,7 @@ class TicketApiController extends ApiController {
if($data['attachments'] && is_array($data['attachments'])) {
foreach($data['attachments'] as &$attachment) {
if(!$ost->isFileTypeAllowed($attachment))
- $data['error'] = 'Invalid file type (ext) for '.Format::htmlchars($attachment['name']);
+ $attachment['error'] = 'Invalid file type (ext) for '.Format::htmlchars($attachment['name']);
elseif ($attachment['encoding'] && !strcasecmp($attachment['encoding'], 'base64')) {
if(!($attachment['data'] = base64_decode($attachment['data'], true)))
$attachment['error'] = sprintf('%s: Poorly encoded base64 data', Format::htmlchars($attachment['name']));
--
GitLab