clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace remaining instances with "allowlist", "denylist" and "blocklist"

This commit is contained in:
Hypolite Petovan 2020-06-06 16:44:39 -04:00
parent 530ff51898
commit 8eeb7807d3
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -61,7 +61,7 @@ Version 2020.03 "Red Hot Poker" (2020-03-30)
Update to the translations (CS, DE, FR, PL, RU, ZH-CN) [translation teams] Update to the translations (CS, DE, FR, PL, RU, ZH-CN) [translation teams]
General code refactoring and enhancements [AndyHee, annando, MrPetovan, nupplaphil] General code refactoring and enhancements [AndyHee, annando, MrPetovan, nupplaphil]
blockbot: blockbot:
Ensure that good agents are whitelisted [valvin1] Ensure that good agents are allowlisted [valvin1]
markdown: markdown:
Addon to use Markdown while composing a posting was added [annando] Addon to use Markdown while composing a posting was added [annando]
showmore: showmore:
@ -911,7 +911,7 @@ Version 3.5.3 (2017-10-05)
Updates to the documentation [tobiasd] Updates to the documentation [tobiasd]
Code revision and refactoring [Hypolite] Code revision and refactoring [Hypolite]
pumpio, twitter bridges adopted to new background mechanism [annando] pumpio, twitter bridges adopted to new background mechanism [annando]
Leistungsschutzrecht has a new source list, and a whitelist [annando] Leistungsschutzrecht has a new source list, and an allowlist [annando]
retriever marked unsupported due to unwanted side-effects [annando] retriever marked unsupported due to unwanted side-effects [annando]
Unicode emoji added [annando] Unicode emoji added [annando]
Enhancement to the general content filter [annando] Enhancement to the general content filter [annando]
@ -1373,7 +1373,7 @@ Version 3.3.1 (2014-11-06)
Set default location to empty for new users. Suppress warning on user creation (issue #1193) (fabrixxm) Set default location to empty for new users. Suppress warning on user creation (issue #1193) (fabrixxm)
Correctly build urls with queries (issue #1190) (fabrixxm) Correctly build urls with queries (issue #1190) (fabrixxm)
Optionally use keywords in feed as post tags with "remote self" (annando) Optionally use keywords in feed as post tags with "remote self" (annando)
A blacklist of keywords to not use can be defined (annando) A denylist of keywords to not use can be defined (annando)
"remote self" works also with Friendica and Diaspora contacts (annando) "remote self" works also with Friendica and Diaspora contacts (annando)
Show exact post time after 12 hours (FX7) Show exact post time after 12 hours (FX7)
Optionally redirect from non-SSL to SSL (annando) Optionally redirect from non-SSL to SSL (annando)

2
doc/Install.md
View File

@ -435,7 +435,7 @@ provided by one of our members.
> >
> This is obvious as soon as you notice that the friendica-cron uses `proc_open` > This is obvious as soon as you notice that the friendica-cron uses `proc_open`
> to execute PHP scripts that also use `proc_open`, but it took me quite some time to find that out. > to execute PHP scripts that also use `proc_open`, but it took me quite some time to find that out.
> I hope this saves some time for other people using suhosin with function blacklists. > I hope this saves some time for other people using suhosin with function blocklists.
### Unable to create all mysql tables on MySQL 5.7.17 or newer ### Unable to create all mysql tables on MySQL 5.7.17 or newer

14
include/items.php
View File

@ -111,7 +111,7 @@ function add_page_info_data(array $data, $no_photos = false)
return "\n".$text.$hashtags; return "\n".$text.$hashtags;
} }
function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklist = "") function query_page_info($url, $photo = "", $keywords = false, $keyword_denylist = "")
{ {
$data = ParseUrl::getSiteinfoCached($url, true); $data = ParseUrl::getSiteinfoCached($url, true);
@ -125,8 +125,8 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
unset($data["keywords"]); unset($data["keywords"]);
} }
if (($keyword_blacklist != "") && isset($data["keywords"])) { if (($keyword_denylist != "") && isset($data["keywords"])) {
$list = explode(", ", $keyword_blacklist); $list = explode(", ", $keyword_denylist);
foreach ($list as $keyword) { foreach ($list as $keyword) {
$keyword = trim($keyword); $keyword = trim($keyword);
@ -141,9 +141,9 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
return $data; return $data;
} }
function get_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "") function get_page_keywords($url, $photo = "", $keywords = false, $keyword_denylist = "")
{ {
$data = query_page_info($url, $photo, $keywords, $keyword_blacklist); $data = query_page_info($url, $photo, $keywords, $keyword_denylist);
if (empty($data["keywords"]) || !is_array($data["keywords"])) { if (empty($data["keywords"]) || !is_array($data["keywords"])) {
return []; return [];
} }
@ -159,9 +159,9 @@ function get_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
return $taglist; return $taglist;
} }
function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_denylist = "")
{ {
$data = query_page_info($url, $photo, $keywords, $keyword_blacklist); $data = query_page_info($url, $photo, $keywords, $keyword_denylist);
$text = ''; $text = '';

2
src/Content/Text/BBCode.php
View File

@ -1859,7 +1859,7 @@ class BBCode
$text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism', $text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
'<$1$2=""$4 data-original-src="$3" class="invalid-src" title="' . DI::l10n()->t('Invalid source protocol') . '">', $text); '<$1$2=""$4 data-original-src="$3" class="invalid-src" title="' . DI::l10n()->t('Invalid source protocol') . '">', $text);
// sanitize href attributes (only whitelisted protocols URLs) // sanitize href attributes (only allowlisted protocols URLs)
// default value for backward compatibility // default value for backward compatibility
$allowed_link_protocols = DI::config()->get('system', 'allowed_link_protocols', []); $allowed_link_protocols = DI::config()->get('system', 'allowed_link_protocols', []);

2
src/Database/Database.php
View File

@ -349,7 +349,7 @@ class Database
} }
/** /**
* Removes every not whitelisted character from the identifier string * Removes every not allowlisted character from the identifier string
* *
* @param string $identifier * @param string $identifier
* *

2
src/Module/Admin/Blocklist/Server.php
View File

@ -88,7 +88,7 @@ class Server extends BaseAdmin
return Renderer::replaceMacros($t, [ return Renderer::replaceMacros($t, [
'$title' => DI::l10n()->t('Administration'), '$title' => DI::l10n()->t('Administration'),
'$page' => DI::l10n()->t('Server Domain Pattern Blocklist'), '$page' => DI::l10n()->t('Server Domain Pattern Blocklist'),
'$intro' => DI::l10n()->t('This page can be used to define a blacklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'), '$intro' => DI::l10n()->t('This page can be used to define a blocklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'),
'$public' => DI::l10n()->t('The list of blocked server domain patterns will be made publically available on the <a href="/friendica">/friendica</a> page so that your users and people investigating communication problems can find the reason easily.'), '$public' => DI::l10n()->t('The list of blocked server domain patterns will be made publically available on the <a href="/friendica">/friendica</a> page so that your users and people investigating communication problems can find the reason easily.'),
'$syntax' => DI::l10n()->t('<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p> '$syntax' => DI::l10n()->t('<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p>
<ul> <ul>