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

Don't accept posts from unknown owners

This commit is contained in:
Michael 2018-07-16 05:48:51 +00:00
parent d3a2ed85fe
commit 78c9e29aa8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Protocol/DFRN.php
View File

@ -1556,6 +1556,7 @@ class DFRN
logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG); logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG);
} }
$author["contact-unknown"] = true;
$author["contact-id"] = $importer["id"]; $author["contact-id"] = $importer["id"];
$author["network"] = $importer["network"]; $author["network"] = $importer["network"];
$onlyfetch = true; $onlyfetch = true;
@ -2431,6 +2432,8 @@ class DFRN
// Fetch the owner // Fetch the owner
$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true); $owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true);
$owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]);
$item["owner-link"] = $owner["link"]; $item["owner-link"] = $owner["link"];
$item["owner-id"] = Contact::getIdForURL($owner["link"], 0); $item["owner-id"] = Contact::getIdForURL($owner["link"], 0);
@ -2621,6 +2624,11 @@ class DFRN
$item["type"] = "remote-comment"; $item["type"] = "remote-comment";
$item["wall"] = 1; $item["wall"] = 1;
} elseif ($entrytype == DFRN::TOP_LEVEL) { } elseif ($entrytype == DFRN::TOP_LEVEL) {
if ($owner_unknown) {
logger("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", LOGGER_DEBUG);
return;
}
if (!isset($item["object-type"])) { if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_NOTE; $item["object-type"] = ACTIVITY_OBJ_NOTE;
} }