X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOembed%2FOembedPlugin.php;h=b5646ab6fc9c4bece6ce17bfe24d5b0de5630fcc;hb=88f7bb1ed5faded5563eeb1d75d5fb44126b0712;hp=8820b3c505ebf3616d0919ba50981a881e28a46e;hpb=d1755e4363ecebdc1cc4685619eaa8c525f25658;p=quix0rs-gnu-social.git diff --git a/plugins/Oembed/OembedPlugin.php b/plugins/Oembed/OembedPlugin.php index 8820b3c505..b5646ab6fc 100644 --- a/plugins/Oembed/OembedPlugin.php +++ b/plugins/Oembed/OembedPlugin.php @@ -1,7 +1,28 @@ 'value', ...)); + // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings + public $domain_whitelist = array( // hostname => service provider + '^i\d*\.ytimg\.com$' => 'YouTube', + '^i\d*\.vimeocdn\.com$' => 'Vimeo', + ); + public $append_whitelist = array(); // fill this array as domain_whitelist to add more trusted sources + public $check_whitelist = false; // security/abuse precaution + + protected $imgData = array(); + + // these should be declared protected everywhere + public function initialize() + { + parent::initialize(); + + $this->domain_whitelist = array_merge($this->domain_whitelist, $this->append_whitelist); + } + public function onCheckSchema() { $schema = Schema::get(); @@ -38,20 +59,25 @@ class OembedPlugin extends Plugin 'title'=>'oEmbed'),null); break; case 'shownotice': - $action->element('link',array('rel'=>'alternate', - 'type'=>'application/json+oembed', - 'href'=>common_local_url( - 'oembed', - array(), - array('format'=>'json','url'=>$action->notice->getUrl())), - 'title'=>'oEmbed'),null); - $action->element('link',array('rel'=>'alternate', - 'type'=>'text/xml+oembed', - 'href'=>common_local_url( - 'oembed', - array(), - array('format'=>'xml','url'=>$action->notice->getUrl())), - 'title'=>'oEmbed'),null); + try { + $action->element('link',array('rel'=>'alternate', + 'type'=>'application/json+oembed', + 'href'=>common_local_url( + 'oembed', + array(), + array('format'=>'json','url'=>$action->notice->getUrl())), + 'title'=>'oEmbed'),null); + $action->element('link',array('rel'=>'alternate', + 'type'=>'text/xml+oembed', + 'href'=>common_local_url( + 'oembed', + array(), + array('format'=>'xml','url'=>$action->notice->getUrl())), + 'title'=>'oEmbed'),null); + } catch (InvalidUrlException $e) { + // The notice is probably a share or similar, which don't + // have a representational URL of their own. + } break; } @@ -73,8 +99,8 @@ class OembedPlugin extends Plugin { $fo = File_oembed::getKV('file_id', $file->id); if ($fo instanceof File_oembed) { - common_log(LOG_WARNING, "Strangely, a File_oembed object exists for new file $file_id", __FILE__); - return true; + common_log(LOG_WARNING, "Strangely, a File_oembed object exists for new file {$file->id}", __FILE__); + return true; } if (isset($redir_data['oembed']['json']) @@ -104,7 +130,7 @@ class OembedPlugin extends Plugin if (empty($oembed->author_name) && empty($oembed->provider)) { return true; } - $out->elementStart('div', array('id'=>'oembed_info', 'class'=>'entry-content')); + $out->elementStart('div', array('id'=>'oembed_info', 'class'=>'e-content')); if (!empty($oembed->author_name)) { $out->elementStart('div', 'fn vcard author'); if (empty($oembed->author_url)) { @@ -147,15 +173,18 @@ class OembedPlugin extends Plugin public function onStartShowAttachmentRepresentation(HTMLOutputter $out, File $file) { - $oembed = File_oembed::getKV('file_id', $file->id); - if (empty($oembed->type)) { + try { + $oembed = File_oembed::getByFile($file); + } catch (NoResultException $e) { return true; } + switch ($oembed->type) { case 'rich': case 'video': case 'link': - if (!empty($oembed->html)) { + if (!empty($oembed->html) + && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) { require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; $config = array( 'safe'=>1, @@ -173,6 +202,99 @@ class OembedPlugin extends Plugin } } + public function onCreateFileImageThumbnailSource(File $file, &$imgPath, $media=null) + { + // If we are on a private node, we won't do any remote calls (just as a precaution until + // we can configure this from config.php for the private nodes) + if (common_config('site', 'private')) { + return true; + } + + // All our remote Oembed images lack a local filename property in the File object + if (!is_null($file->filename)) { + return true; + } + + try { + // If we have proper oEmbed data, there should be an entry in the File_oembed + // and File_thumbnail tables respectively. If not, we're not going to do anything. + $file_oembed = File_oembed::getByFile($file); + $thumbnail = File_thumbnail::byFile($file); + } catch (Exception $e) { + // Not Oembed data, or at least nothing we either can or want to use. + return true; + } + + try { + $this->storeRemoteFileThumbnail($thumbnail); + } catch (AlreadyFulfilledException $e) { + // aw yiss! + } + + $imgPath = $thumbnail->getPath(); + + return false; + } + + /** + * @return boolean false on no check made, provider name on success + * @throws ServerException if check is made but fails + */ + protected function checkWhitelist($url) + { + if (!$this->check_whitelist) { + return false; // indicates "no check made" + } + + $host = parse_url($url, PHP_URL_HOST); + foreach ($this->domain_whitelist as $regex => $provider) { + if (preg_match("/$regex/", $host)) { + return $provider; // we trust this source, return provider name + } + } + + throw new ServerException(sprintf(_('Domain not in remote thumbnail source whitelist: %s'), $host)); + } + + protected function storeRemoteFileThumbnail(File_thumbnail $thumbnail) + { + if (!empty($thumbnail->filename) && file_exists($thumbnail->getPath())) { + throw new AlreadyFulfilledException(sprintf('A thumbnail seems to already exist for remote file with id==%u', $thumbnail->file_id)); + } + + $url = $thumbnail->getUrl(); + $this->checkWhitelist($url); + + // First we download the file to memory and test whether it's actually an image file + // FIXME: To support remote video/whatever files, this needs reworking. + common_debug(sprintf('Downloading remote thumbnail for file id==%u with thumbnail URL: %s', $thumbnail->file_id, $url)); + $imgData = HTTPClient::quickGet($url); + $info = @getimagesizefromstring($imgData); + if ($info === false) { + throw new UnsupportedMediaException(_('Remote file format was not identified as an image.'), $url); + } elseif (!$info[0] || !$info[1]) { + throw new UnsupportedMediaException(_('Image file had impossible geometry (0 width or height)')); + } + + // We'll trust sha256 (File::FILEHASH_ALG) not to have collision issues any time soon :) + $filename = hash(File::FILEHASH_ALG, $imgData) . '.' . common_supported_mime_to_ext($info['mime']); + $fullpath = File_thumbnail::path($filename); + // Write the file to disk. Throw Exception on failure + if (!file_exists($fullpath) && file_put_contents($fullpath, $imgData) === false) { + throw new ServerException(_('Could not write downloaded file to disk.')); + } + // Get rid of the file from memory + unset($imgData); + + // Updated our database for the file record + $orig = clone($thumbnail); + $thumbnail->filename = $filename; + $thumbnail->width = $info[0]; // array indexes documented on php.net: + $thumbnail->height = $info[1]; // https://php.net/manual/en/function.getimagesize.php + // Throws exception on failure. + $thumbnail->updateWithKeys($orig, 'file_id'); + } + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Oembed',