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

Prevent accepting relayed posts from blocked servers

src/Protocol/Diaspora.php

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

src/Util/Network.php

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