var $short_fileurl = null;
var $mimetype = null;
- function __construct(Profile $scoped, $filename = null, $mimetype = null)
+ function __construct(Profile $scoped, $filename = null, $mimetype = null, $filehash = null)
{
$this->scoped = $scoped;
$this->filename = $filename;
$this->mimetype = $mimetype;
+ $this->filehash = $filehash;
$this->fileRecord = $this->storeFile();
$this->fileurl = common_local_url('attachment',
public function attachToNotice(Notice $notice)
{
- File_to_post::processNew($this->fileRecord->id, $notice->id);
+ File_to_post::processNew($this->fileRecord, $notice);
}
public function getPath()
return $this->short_fileurl;
}
+ function getEnclosure()
+ {
+ return $this->getFile()->getEnclosure();
+ }
+
function delete()
{
$filepath = File::path($this->filename);
protected function storeFile()
{
+ $filepath = File::path($this->filename);
+ if (!empty($this->filename) && $this->filehash === null) {
+ // Calculate if we have an older upload method somewhere (Qvitter) that
+ // doesn't do this before calling new MediaFile on its local files...
+ $this->filehash = hash_file(File::FILEHASH_ALG, $filepath);
+ if ($this->filehash === false) {
+ throw new ServerException('Could not read file for hashing');
+ }
+ }
+
+ try {
+ $file = File::getByHash($this->filehash);
+ // We're done here. Yes. Already. We assume sha256 won't collide on us anytime soon.
+ return $file;
+ } catch (NoResultException $e) {
+ // Well, let's just continue below.
+ }
+
$fileurl = File::url($this->filename);
$file = new File;
$file->filename = $this->filename;
$file->urlhash = File::hashurl($fileurl);
$file->url = $fileurl;
- $filepath = File::path($this->filename);
+ $file->filehash = $this->filehash;
$file->size = filesize($filepath);
+ if ($file->size === false) {
+ throw new ServerException('Could not read file to get its size');
+ }
$file->date = time();
$file->mimetype = $this->mimetype;
+
$file_id = $file->insert();
if ($file_id===false) {
throw new ClientException(_('System error uploading file.'));
}
- // Throws exception if additional size does not respect quota
- File::respectsQuota($scoped, $_FILES[$param]['size']);
+ // TODO: Make documentation clearer that this won't work for files >2GiB because
+ // PHP is stupid in its 32bit head. But noone accepts 2GiB files with PHP
+ // anyway... I hope.
+ $filehash = hash_file(File::FILEHASH_ALG, $_FILES[$param]['tmp_name']);
+
+ try {
+ $file = File::getByHash($filehash);
+ // If no exception is thrown the file exists locally, so we'll use that and just add redirections.
+ $filename = $file->filename;
+ $mimetype = $file->mimetype;
- $mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'],
- $_FILES[$param]['name']);
+ } catch (NoResultException $e) {
+ // We have to save the upload as a new local file. This is the normal course of action.
- $basename = basename($_FILES[$param]['name']);
- $filename = File::filename($scoped, $basename, $mimetype);
- $filepath = File::path($filename);
+ // Throws exception if additional size does not respect quota
+ // This test is only needed, of course, if we're uploading something new.
+ File::respectsQuota($scoped, $_FILES[$param]['size']);
- $result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath);
+ $mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'], $_FILES[$param]['name']);
+ $basename = basename($_FILES[$param]['name']);
- if (!$result) {
- // TRANS: Client exception thrown when a file upload operation fails because the file could
- // TRANS: not be moved from the temporary folder to the permanent file location.
- throw new ClientException(_('File could not be moved to destination directory.'));
+ switch (common_config('attachments', 'filename_base')) {
+ case 'upload':
+ $filename = File::filename($scoped, $basename, $mimetype);
+ break;
+ case 'hash':
+ default:
+ $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype, $basename);
+ }
+ $filepath = File::path($filename);
+
+ $result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath);
+
+ if (!$result) {
+ // TRANS: Client exception thrown when a file upload operation fails because the file could
+ // TRANS: not be moved from the temporary folder to the permanent file location.
+ throw new ClientException(_('File could not be moved to destination directory.'));
+ }
}
- return new MediaFile($scoped, $filename, $mimetype);
+ return new MediaFile($scoped, $filename, $mimetype, $filehash);
}
static function fromFilehandle($fh, Profile $scoped) {
-
$stream = stream_get_meta_data($fh);
+ // So far we're only handling filehandles originating from tmpfile(),
+ // so we can always do hash_file on $stream['uri'] as far as I can tell!
+ $filehash = hash_file(File::FILEHASH_ALG, $stream['uri']);
+
+ try {
+ $file = File::getByHash($filehash);
+ // Already have it, so let's reuse the locally stored File
+ // by using getPath we also check whether the file exists
+ // and throw a FileNotFoundException with the path if it doesn't.
+ $filename = basename($file->getPath());
+ $mimetype = $file->mimetype;
+ } catch (FileNotFoundException $e) {
+ // This happens if the file we have uploaded has disappeared
+ // from the local filesystem for some reason. Since we got the
+ // File object from a sha256 check in fromFilehandle, it's safe
+ // to just copy the uploaded data to disk!
+
+ fseek($fh, 0); // just to be sure, go to the beginning
+ // dump the contents of our filehandle to the path from our exception
+ // and report error if it failed.
+ if (false === file_put_contents($e->path, fread($fh, filesize($stream['uri'])))) {
+ // TRANS: Client exception thrown when a file upload operation fails because the file could
+ // TRANS: not be moved from the temporary folder to the permanent file location.
+ throw new ClientException(_('File could not be moved to destination directory.'));
+ }
+ if (!chmod($e->path, 0664)) {
+ common_log(LOG_ERR, 'Could not chmod uploaded file: '._ve($e->path));
+ }
- File::respectsQuota($scoped, filesize($stream['uri']));
+ $filename = basename($file->getPath());
+ $mimetype = $file->mimetype;
- $mimetype = self::getUploadedMimeType($stream['uri']);
+ } catch (NoResultException $e) {
+ File::respectsQuota($scoped, filesize($stream['uri']));
- $filename = File::filename($scoped, "email", $mimetype);
+ $mimetype = self::getUploadedMimeType($stream['uri']);
- $filepath = File::path($filename);
+ switch (common_config('attachments', 'filename_base')) {
+ case 'upload':
+ $filename = File::filename($scoped, "email", $mimetype);
+ break;
+ case 'hash':
+ default:
+ $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype);
+ }
+ $filepath = File::path($filename);
- $result = copy($stream['uri'], $filepath) && chmod($filepath, 0664);
+ $result = copy($stream['uri'], $filepath) && chmod($filepath, 0664);
- if (!$result) {
- // TRANS: Client exception thrown when a file upload operation fails because the file could
- // TRANS: not be moved from the temporary folder to the permanent file location.
- throw new ClientException(_('File could not be moved to destination directory.' .
- $stream['uri'] . ' ' . $filepath));
+ if (!$result) {
+ common_log(LOG_ERR, 'File could not be moved (or chmodded) from '._ve($stream['uri']) . ' to ' . _ve($filepath));
+ // TRANS: Client exception thrown when a file upload operation fails because the file could
+ // TRANS: not be moved from the temporary folder to the permanent file location.
+ throw new ClientException(_('File could not be moved to destination directory.' ));
+ }
}
- return new MediaFile($scoped, $filename, $mimetype);
+ return new MediaFile($scoped, $filename, $mimetype, $filehash);
}
/**
$unclearTypes = array('application/octet-stream',
'application/vnd.ms-office',
'application/zip',
+ 'text/html', // Ironically, Wikimedia Commons' SVG_logo.svg is identified as text/html
// TODO: for XML we could do better content-based sniffing too
'text/xml');