X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOembed%2FOembedPlugin.php;h=c51e0bfad1626e983e0a5bf8f1581b37856628bf;hb=c2ea85a5e29038569576bd521c6c6710e2159d06;hp=aa609718d1f71aa253f5ca2485d569a9d09feab9;hpb=85e644d6473b131027f83870b799db87b53d0d6f;p=quix0rs-gnu-social.git diff --git a/plugins/Oembed/OembedPlugin.php b/plugins/Oembed/OembedPlugin.php index aa609718d1..c51e0bfad1 100644 --- a/plugins/Oembed/OembedPlugin.php +++ b/plugins/Oembed/OembedPlugin.php @@ -5,11 +5,13 @@ if (!defined('GNUSOCIAL')) { exit(1); } class OembedPlugin extends Plugin { // settings which can be set in config.php with addPlugin('Oembed', array('param'=>'value', ...)); + // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings public $domain_whitelist = array( // hostname => service provider - 'i.ytimg.com' => 'YouTube', + '^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 = true; // security/abuse precaution + public $check_whitelist = false; // security/abuse precaution protected $imgData = array(); @@ -33,6 +35,24 @@ class OembedPlugin extends Plugin $m->connect('main/oembed', array('action' => 'oembed')); } + public function onGetRemoteUrlMetadataFromDom($url, DOMDocument $dom, stdClass &$metadata) + { + try { + common_log(LOG_INFO, 'Trying to discover an oEmbed endpoint using link headers.'); + $api = oEmbedHelper::oEmbedEndpointFromHTML($dom); + common_log(LOG_INFO, 'Found API endpoint ' . $api . ' for URL ' . $url); + $params = array( + 'maxwidth' => common_config('thumbnail', 'width'), + 'maxheight' => common_config('thumbnail', 'height'), + ); + $metadata = oEmbedHelper::getOembedFrom($api, $url, $params); + + } catch (Exception $e) { + common_log(LOG_INFO, 'Could not find an oEmbed endpoint using link headers.'); + // Just ignore it! + } + } + public function onEndShowHeadElements(Action $action) { switch ($action->getActionName()) { @@ -88,28 +108,23 @@ class OembedPlugin extends Plugin * Normally this event is called through File::saveNew() * * @param File $file The newly inserted File object. - * @param array $redir_data lookup data eg from File_redirection::where() - * @param string $given_url * * @return boolean success */ - public function onEndFileSaveNew(File $file, array $redir_data, $given_url) + public function onEndFileSaveNew(File $file) { $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']) - && !empty($redir_data['oembed']['json'])) { - File_oembed::saveNew($redir_data['oembed']['json'], $file->id); - } elseif (isset($redir_data['type']) - && (('text/html' === substr($redir_data['type'], 0, 9) - || 'application/xhtml+xml' === substr($redir_data['type'], 0, 21)))) { + if (isset($file->mimetype) + && (('text/html' === substr($file->mimetype, 0, 9) + || 'application/xhtml+xml' === substr($file->mimetype, 0, 21)))) { try { - $oembed_data = File_oembed::_getOembed($given_url); + $oembed_data = File_oembed::_getOembed($file->url); if ($oembed_data === false) { throw new Exception('Did not get oEmbed data from URL'); } @@ -171,16 +186,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) - && (StatusNet::isAjax() || common_config('attachments', 'show_html'))) { + && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) { require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; $config = array( 'safe'=>1, @@ -207,14 +224,14 @@ class OembedPlugin extends Plugin } // All our remote Oembed images lack a local filename property in the File object - if ($file->filename !== null) { + 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::byFile($file); + $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. @@ -233,7 +250,7 @@ class OembedPlugin extends Plugin } /** - * @return boolean false on no check made, true on success + * @return boolean false on no check made, provider name on success * @throws ServerException if check is made but fails */ protected function checkWhitelist($url) @@ -243,11 +260,13 @@ class OembedPlugin extends Plugin } $host = parse_url($url, PHP_URL_HOST); - if (!in_array($host, array_keys($this->domain_whitelist))) { - throw new ServerException(sprintf(_('Domain not in remote thumbnail source whitelist: %s'), $host)); + foreach ($this->domain_whitelist as $regex => $provider) { + if (preg_match("/$regex/", $host)) { + return $provider; // we trust this source, return provider name + } } - return true; // we trust this source + throw new ServerException(sprintf(_('Domain not in remote thumbnail source whitelist: %s'), $host)); } protected function storeRemoteFileThumbnail(File_thumbnail $thumbnail) @@ -270,8 +289,8 @@ class OembedPlugin extends Plugin throw new UnsupportedMediaException(_('Image file had impossible geometry (0 width or height)')); } - // We'll trust sha256 not to have collision issues any time soon :) - $filename = hash('sha256', $imgData) . '.' . common_supported_mime_to_ext($info['mime']); + // 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) { @@ -285,10 +304,8 @@ class OembedPlugin extends Plugin $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 - if (!$thumbnail->update($orig)) { - unlink($fullpath); // delete the file if database failed to write - throw new ServerException(_('Failed to update remotely downloaded file info in database.')); - } + // Throws exception on failure. + $thumbnail->updateWithKeys($orig, 'file_id'); } public function onPluginVersion(array &$versions)