friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6834 from MrPetovan/bug/6819-prevent-blocked-server-relay 

Prevent accepting relayed posts from blocked servers
This commit is contained in:
Tobias Diekershoff 2019-03-09 09:10:28 +01:00 committed by GitHub
parent f55c287f06 704cb052ca
commit c4bfc6e86e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Protocol/Diaspora.php
View File

@ -1135,8 +1135,11 @@ class Diaspora
// Logger::log("defining user ".$contact["nick"]." as friend"); // Logger::log("defining user ".$contact["nick"]." as friend");
//} //}
// We don't seem to like that person // Contact server is blocked
if ($contact["blocked"]) { if (Network::isUrlBlocked($contact['url'])) {
return false;
// We don't seem to like that person
} elseif ($contact["blocked"]) {
// Maybe blocked, don't accept. // Maybe blocked, don't accept.
return false; return false;
// We are following this person? // We are following this person?

1
src/Util/Network.php
View File

@ -459,7 +459,6 @@ class Network
* @param string $url The url to check the domain from * @param string $url The url to check the domain from
* *
* @return boolean * @return boolean
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function isUrlBlocked($url) public static function isUrlBlocked($url)
{ {