Add Remote Flow (#43) and PHP Unit Tests from dansup (#37)

Now the code is following most of PSR
Various changes from various branches (some testing will be required)
Fixed various issues
This commit is contained in:
Diogo Cordeiro
2018-07-26 21:12:13 +00:00
parent e377b87ff7
commit eaad9423dd
45 changed files with 4723 additions and 1918 deletions

View File

@@ -25,79 +25,109 @@
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link https://www.gnu.org/software/social/
*/
if (!defined ('GNUSOCIAL')) {
exit (1);
if (!defined('GNUSOCIAL')) {
exit(1);
}
$valid_object_types = array ("Note");
$valid_object_types = array("Note");
// Validate data
if (!(isset ($data->object->type) && in_array ($data->object->type, $valid_object_types))) {
ActivityPubReturn::error ("Invalid Object type.");
if (!isset($data->id)) {
ActivityPubReturn::error("Id not specified.");
}
if (!isset ($data->object->content)) {
ActivityPubReturn::error ("Object content was not specified.");
if (!(isset($data->object->type) && in_array($data->object->type, $valid_object_types))) {
ActivityPubReturn::error("Invalid Object type.");
}
if (!isset ($data->object->url)) {
ActivityPubReturn::error ("Object url was not specified.");
} else if (!filter_var ($data->object->url, FILTER_VALIDATE_URL)) {
ActivityPubReturn::error ("Invalid Object Url.");
if (!isset($data->object->content)) {
ActivityPubReturn::error("Object content was not specified.");
}
if (!isset($data->object->url)) {
ActivityPubReturn::error("Object url was not specified.");
} elseif (!filter_var($data->object->url, FILTER_VALIDATE_URL)) {
ActivityPubReturn::error("Invalid Object Url.");
}
if (!isset($data->object->to)) {
ActivityPubReturn::error("Object To was not specified.");
}
$content = $data->object->content;
$act = new Activity ();
$act = new Activity();
$act->verb = ActivityVerb::POST;
$act->time = time ();
$act->actor = $actor_profile->asActivityObject ();
$act->time = time();
$act->actor = $actor_profile->asActivityObject();
$act->context = new ActivityContext ();
$act->context = new ActivityContext();
// Is this a reply?
if (isset ($data->object->reply_to)) {
try {
$reply_to = Notice::getByUri ($data->object->reply_to);
} catch (Exception $e) {
ActivityPubReturn::error ("Invalid Object reply_to value.");
}
$act->context->replyToID = $reply_to->getUri ();
$act->context->replyToUrl = $reply_to->getUrl ();
if (isset($data->object->reply_to)) {
try {
$reply_to = Notice::getByUri($data->object->reply_to);
} catch (Exception $e) {
ActivityPubReturn::error("Invalid Object reply_to value.");
}
$act->context->replyToID = $reply_to->getUri();
$act->context->replyToUrl = $reply_to->getUrl();
} else {
$reply_to = null;
$reply_to = null;
}
$act->context->attention = common_get_attentions ($content, $actor_profile, $reply_to);
$act->context->attention = common_get_attentions($content, $actor_profile, $reply_to);
foreach ($to_profiles as $to)
{
$act->context->attention[$to->getUri ()] = "http://activitystrea.ms/schema/1.0/person";
$discovery = new Activitypub_explorer;
if ($to_profiles == "https://www.w3.org/ns/activitystreams#Public") {
$to_profiles = array();
}
// Generate To objects
if (is_array($data->object->to)) {
// Remove duplicates from To actors set
array_unique($data->object->to);
foreach ($data->object->to as $to_url) {
try {
$to_profiles = array_merge($to_profiles, $discovery->lookup($to_url));
} catch (Exception $e) {
// XXX: Invalid actor found, not sure how we handle those
}
}
} elseif (empty($data->object->to) || in_array($data->object->to, $public_to)) {
// No need to do anything else at this point, let's just break out the if
} else {
try {
$to_profiles[]= $discovery->lookup($data->object->to);
} catch (Exception $e) {
ActivityPubReturn::error("Invalid Actor.", 404);
}
}
unset($discovery);
foreach ($to_profiles as $to) {
$act->context->attention[ActivityPubPlugin::actor_uri($to)] = "http://activitystrea.ms/schema/1.0/person";
}
// Reject notice if it is too long (without the HTML)
// This is done after MediaFile::fromUpload etc. just to act the same as the ApiStatusesUpdateAction
if (Notice::contentTooLong ($content)) {
ActivityPubReturn::error ("That's too long. Maximum notice size is %d character.");
if (Notice::contentTooLong($content)) {
ActivityPubReturn::error("That's too long. Maximum notice size is %d character.");
}
$options = array ('source' => 'ActivityPub', 'uri' => $data->id, 'url' => $data->object->url);
$options = array('source' => 'ActivityPub', 'uri' => isset($data->id) ? $data->id : $data->object->url, 'url' => $data->object->url);
// $options gets filled with possible scoping settings
ToSelector::fillActivity ($this, $act, $options);
ToSelector::fillActivity($this, $act, $options);
$actobj = new ActivityObject ();
$actobj = new ActivityObject();
$actobj->type = ActivityObject::NOTE;
$actobj->content = common_render_content ($content, $actor_profile, $reply_to);
$actobj->content = common_render_content($content, $actor_profile, $reply_to);
// Finally add the activity object to our activity
$act->objects[] = $actobj;
try {
$res = array ("@context" => "https://www.w3.org/ns/activitystreams",
"id" => $data->id,
"url" => $data->object->url,
"type" => "Create",
"actor" => $data->actor,
"object" => Activitypub_notice::notice_to_array (Notice::saveActivity ($act, $actor_profile, $options)));
ActivityPubReturn::answer ($res);
$res = Activitypub_create::create_to_array(
$data->id,
$data->actor,
Activitypub_notice::notice_to_array(Notice::saveActivity($act, $actor_profile, $options))
);
ActivityPubReturn::answer($res);
} catch (Exception $e) {
ActivityPubReturn::error ($e->getMessage ());
ActivityPubReturn::error($e->getMessage());
}