GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

LinkPreview: use a local proxy for oEmbed lookups so we use a consistent common code path, and don't open up to oohembed.com being evil

Browse Source
This commit is contained in:
Brion Vibber 2010-11-16 14:41:30 -08:00
parent b5fc71253c
commit 73f28ffabe
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/LinkPreview/LinkPreviewPlugin.php
View File

@ -53,7 +53,7 @@ class LinkPreviewPlugin extends Plugin
if ($user) {
$action->script('plugins/LinkPreview/linkpreview.js');
$data = json_encode(array(
'api' => common_config('oohembed', 'endpoint'),
'api' => common_local_url('oembedproxy'),
'width' => common_config('attachments', 'thumbwidth'),
'height' => common_config('attachments', 'thumbheight'),
));
@ -73,10 +73,11 @@ class LinkPreviewPlugin extends Plugin
*/
function onAutoload($cls)
{
switch ($cls)
$lower = strtolower($cls);
switch ($lower)
{
case 'LinkpreviewAction':
require_once dirname(__FILE__) . '/linkpreviewaction.php';
case 'oembedproxyaction':
require_once dirname(__FILE__) . '/' . $lower . '.php';
return false;
default:
return true;
@ -92,8 +93,8 @@ class LinkPreviewPlugin extends Plugin
*/
function onStartInitializeRouter($m)
{
$m->connect('main/preview/link',
array('action' => 'linkpreview'));
$m->connect('main/oembed/proxy',
array('action' => 'oembedproxy'));
return true;
}

5
plugins/LinkPreview/linkpreview.js
View File

@ -54,12 +54,11 @@
url: url,
format: 'json',
maxwidth: oEmbed.width,
maxheight: oEmbed.height,
callback: '?'
maxheight: oEmbed.height
};
$.get(oEmbed.api, params, function(data, xhr) {
callback(data);
}, 'jsonp');
}, 'json');
}
};