public $domain_blacklist = array();
public $check_blacklist = false;
+ public $max_image_bytes = 10485760; // 10MiB max image size by default
+
protected $imgData = array();
// these should be declared protected everywhere
switch (common_get_mime_media($file->mimetype)) {
case 'image':
// Just to set something for now at least...
- $file->title = $file->mimetype;
+ //$file->title = $file->mimetype;
break;
}
}
try {
+ /*
$http = new HTTPClient();
common_debug(sprintf('Performing HEAD request for remote file id==%u to avoid unnecessarily downloading too large files. URL: %s', $file->getID(), $remoteUrl));
$head = $http->head($remoteUrl);
+ $remoteUrl = $head->getEffectiveUrl(); // to avoid going through redirects again
+ if (!$this->checkBlackList($remoteUrl)) {
+ common_log(LOG_WARN, sprintf('%s: Non-blacklisted URL %s redirected to blacklisted URL %s', __CLASS__, $file->getUrl(), $remoteUrl));
+ return true;
+ }
+
$headers = $head->getHeader();
- if (!isset($headers['content-length'])) {
+ $filesize = isset($headers['content-length']) ? $headers['content-length'] : null;
+ */
+ $filesize = $file->getSize();
+ if (empty($filesize)) {
// file size not specified on remote server
common_debug(sprintf('%s: Ignoring remote media because we did not get a content length for file id==%u', __CLASS__, $file->getID()));
return true;
- } elseif (intval($headers['content-length']) > common_config('attachments', 'file_quota')) {
- // file too big
- common_debug(sprintf('%s: Skipping remote media because content length (%u) is larger than file_quota (%u) for file id==%u', __CLASS__, intval($headers['content-length']), common_config('attachments', 'file_quota'), $file->getID()));
+ } elseif ($filesize > $this->max_image_bytes) {
+ //FIXME: When we perhaps start fetching videos etc. we'll need to differentiate max_image_bytes from that...
+ // file too big according to plugin configuration
+ common_debug(sprintf('%s: Skipping remote media because content length (%u) is larger than plugin configured max_image_bytes (%u) for file id==%u', __CLASS__, intval($filesize), $this->max_image_bytes, $file->getID()));
return true;
- }
-
- $remoteUrl = $head->effectiveUrl; // to avoid going through redirects again
- if (!$this->checkBlackList($remoteUrl)) {
- common_log(LOG_WARN, sprintf('%s: Non-blacklisted URL %s redirected to blacklisted URL %s', __CLASS__, $file->getUrl(), $remoteUrl));
+ } elseif ($filesize > common_config('attachments', 'file_quota')) {
+ // file too big according to site configuration
+ common_debug(sprintf('%s: Skipping remote media because content length (%u) is larger than file_quota (%u) for file id==%u', __CLASS__, intval($filesize), common_config('attachments', 'file_quota'), $file->getID()));
return true;
}
// Then we download the file to memory and test whether it's actually an image file
- common_debug(sprintf('Downloading remote file id==%u with effective URL: %s', $file->getID(), _ve($remoteUrl)));
- $imgData = $http->get($remoteUrl);
+ common_debug(sprintf('Downloading remote file id==%u (should be size %u) with effective URL: %s', $file->getID(), $filesize, _ve($remoteUrl)));
+ $imgData = HTTPClient::quickGet($remoteUrl);
} catch (HTTP_Request2_ConnectionException $e) {
- common_log(LOG_ERR, __CLASS__.': quickGet on URL: '._ve($file->getUrl()).' threw exception: '.$e->getMessage());
+ common_log(LOG_ERR, __CLASS__.': '._ve(get_class($e)).' on URL: '._ve($file->getUrl()).' threw exception: '.$e->getMessage());
return true;
}
$info = @getimagesizefromstring($imgData);