eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

add blacklist to StoreRemoteMedia plugin

Browse Source
This commit is contained in:
Saul St John 2016-03-02 15:41:17 +00:00
parent da34491c59
commit 43754c7f17
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php
View File

@ -15,6 +15,9 @@ class StoreRemoteMediaPlugin extends Plugin
public $append_whitelist = array(); // fill this array as domain_whitelist to add more trusted sources public $append_whitelist = array(); // fill this array as domain_whitelist to add more trusted sources
public $check_whitelist = false; // security/abuse precaution public $check_whitelist = false; // security/abuse precaution
public $domain_blacklist = array();
public $check_blacklist = false;
protected $imgData = array(); protected $imgData = array();
// these should be declared protected everywhere // these should be declared protected everywhere
@ -74,7 +77,10 @@ class StoreRemoteMediaPlugin extends Plugin
return true; return true;
} }
$this->checkWhitelist($file->getUrl()); if (!$this->checkWhiteList($file->getUrl()) ||
!$this->checkBlackList($file->getUrl())) {
return true;
}
// First we download the file to memory and test whether it's actually an image file // First we download the file to memory and test whether it's actually an image file
common_debug(sprintf('Downloading remote file id==%u with URL: %s', $file->getID(), _ve($file->getUrl()))); common_debug(sprintf('Downloading remote file id==%u with URL: %s', $file->getID(), _ve($file->getUrl())));
@ -124,23 +130,39 @@ class StoreRemoteMediaPlugin extends Plugin
} }
/** /**
* @return boolean false on no check made, provider name on success * @return boolean true if given url passes blacklist check
* @throws ServerException if check is made but fails
*/ */
protected function checkWhitelist($url) protected function checkBlackList($url)
{ {
if (!$this->check_whitelist) { if (!$this->check_blacklist) {
return false; // indicates "no check made" return true;
}
$host = parse_url($url, PHP_URL_HOST);
foreach ($this->domain_blacklist as $regex => $provider) {
if (preg_match("/$regex/", $host)) {
return false;
}
} }
return true;
}
/***
* @return boolean true if given url passes whitelist check
*/
protected function checkWhiteList($url)
{
if (!$this->check_whitelist) {
return true;
}
$host = parse_url($url, PHP_URL_HOST); $host = parse_url($url, PHP_URL_HOST);
foreach ($this->domain_whitelist as $regex => $provider) { foreach ($this->domain_whitelist as $regex => $provider) {
if (preg_match("/$regex/", $host)) { if (preg_match("/$regex/", $host)) {
return $provider; // we trust this source, return provider name return true;
} }
} }
throw new ServerException(sprintf(_('Domain not in remote source whitelist: %s'), $host)); return false;
} }
public function onPluginVersion(array &$versions) public function onPluginVersion(array &$versions)