eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[AP] Handle unlisted/followers-only notices

Browse Source 
Note that this commit isn't intended to add support for sending such notes
in GS. Instead, we handle the reception, storage and direct reply to this
type of notices, in AP.

ActivityPubPlugin:
- Subscribe the event StartNoticeSave to hack answering non-public notes

Activitypub_create:
- Add 'directMessage' attribute to the Create activity, defaulting to false for now
- Update validation method: validate 'directMessage' and add debug

Activitypub_notice:
- Handle incoming unlisted/followers-only notes
- Add support for unlisted-replies
- Add method to verify private (direct) notices

inbox_handler:
- Add handler for CREATE Note
- Prepare logic for private-messaging
- Overall refactor: Class members were continuously being passed as function arguments without need

SharePlugin:
- Stop showing the announce button in non public posts
This commit is contained in:
tenma
2019-08-13 00:05:51 +01:00
committed by Diogo Cordeiro
parent 7188d81ad4
commit 217c8a3933
5 changed files with 188 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/ActivityPub/lib/models/Activitypub_create.php
View File

@@ -44,16 +44,17 @@ class Activitypub_create
* @param array $object
* @return array pretty array to be used in a response
*/
public static function create_to_array($actor, $object)
public static function create_to_array(string $actor, array $object): array
{
$res = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => $object['id'].'/create',
'type' => 'Create',
'to' => $object['to'],
'cc' => $object['cc'],
'actor' => $actor,
'object' => $object
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => $object['id'].'/create',
'type' => 'Create',
'directMessage' => false,
'to' => $object['to'],
'cc' => $object['cc'],
'actor' => $actor,
'object' => $object
];
return $res;
}
@@ -68,11 +69,17 @@ class Activitypub_create
public static function validate_object($object)
{
if (!is_array($object)) {
common_debug('ActivityPub Create Validator: Rejected because of invalid Object format.');
throw new Exception('Invalid Object Format for Create Activity.');
}
if (!isset($object['type'])) {
common_debug('ActivityPub Create Validator: Rejected because of Type.');
throw new Exception('Object type was not specified for Create Activity.');
}
if (isset($object['directMessage']) && !is_bool($object['directMessage'])) {
common_debug('ActivityPub Create Validator: Rejected because Object directMessage is invalid.');
throw new Exception('Invalid Object directMessage.');
}
switch ($object['type']) {
case 'Note':
// Validate data

80
plugins/ActivityPub/lib/models/Activitypub_notice.php
View File

@@ -61,13 +61,22 @@ class Activitypub_notice
}
}
$to = ['https://www.w3.org/ns/activitystreams#Public'];
foreach ($notice->getAttentionProfiles() as $to_profile) {
$to[] = $href = $to_profile->getUri();
$tags[] = Activitypub_mention_tag::mention_tag_to_array_from_values($href, $to_profile->getNickname().'@'.parse_url($href, PHP_URL_HOST));
if ($notice->isPublic()) {
$to = ['https://www.w3.org/ns/activitystreams#Public'];
$cc = [common_local_url('apActorFollowers', ['id' => $profile->getID()])];
} else {
// Since we currently don't support sending unlisted/followers-only
// notices, arriving here means we're instead answering to that type
// of posts. Not having subscription policy working, its safer to
// always send answers of type unlisted.
$to = [];
$cc = ['https://www.w3.org/ns/activitystreams#Public'];
}
$cc = [common_local_url('apActorFollowers', ['id' => $profile->getID()])];
foreach ($notice->getAttentionProfiles() as $to_profile) {
$to[] = $href = $to_profile->getUri();
$tags[] = Activitypub_mention_tag::mention_tag_to_array_from_values($href, $to_profile->getNickname().'@'.parse_url($href, PHP_URL_HOST));
}
$item = [
'@context' => 'https://www.w3.org/ns/activitystreams',
@@ -108,11 +117,11 @@ class Activitypub_notice
*
* @author Diogo Cordeiro <diogo@fc.up.pt>
* @param array $object
* @param Profile|null $actor_profile
* @param Profile $actor_profile
* @return Notice
* @throws Exception
*/
public static function create_notice($object, $actor_profile = null)
public static function create_notice(array $object, Profile $actor_profile = null)
{
$id = $object['id']; // int
$url = isset($object['url']) ? $object['url'] : $id; // string
@@ -140,7 +149,10 @@ class Activitypub_notice
$act->time = time();
$act->actor = $actor_profile->asActivityObject();
$act->context = new ActivityContext();
$options = ['source' => 'ActivityPub', 'uri' => $id, 'url' => $url];
$options = ['source' => 'ActivityPub',
'uri' => $id,
'url' => $url,
'is_local' => self::getNotePolicyType($object, $actor_profile)];
// Is this a reply?
if (isset($settings['inReplyTo'])) {
@@ -238,9 +250,9 @@ class Activitypub_notice
common_debug('ActivityPub Notice Validator: Rejected because Object URL is invalid.');
throw new Exception('Invalid Object URL.');
}
if (!(isset($object['to']) || isset($object['cc']))) {
common_debug('ActivityPub Notice Validator: Rejected because neither Object CC and TO were specified.');
throw new Exception('Neither Object CC and TO were specified.');
if (!(isset($object['to']) && isset($object['cc']))) {
common_debug('ActivityPub Notice Validator: Rejected because either Object CC or TO wasn\'t specified.');
throw new Exception('Either Object CC or TO wasn\'t specified.');
}
return true;
}
@@ -253,10 +265,46 @@ class Activitypub_notice
* @author Bruno Casteleiro <brunoccast@fc.up.pt>
*/
public static function getUrl(Notice $notice): string {
if ($notice->isLocal()) {
return common_local_url('apNotice', ['id' => $notice->getID()]);
} else {
return $notice->getUrl();
}
if ($notice->isLocal()) {
return common_local_url('apNotice', ['id' => $notice->getID()]);
} else {
return $notice->getUrl();
}
}
/**
* Extract note policy type from note targets.
*
* @param array $note received Note
* @param Profile $actor_profile Note author
* @return int Notice policy type
* @author Bruno Casteleiro <brunoccast@fc.up.pt>
*/
public static function getNotePolicyType(array $note, Profile $actor_profile): int {
if (in_array('https://www.w3.org/ns/activitystreams#Public', $note['to'])) {
return $actor_profile->isLocal() ? Notice::LOCAL_PUBLIC : Notice::REMOTE;
} else {
// either an unlisted or followers-only note, we'll handle
// both as a GATEWAY notice since this type is not visible
// from the public timelines, hence partially enough while
// we don't have subscription_policy working.
return Notice::GATEWAY;
}
}
/**
* Verify if received note is private (direct).
* Note that we're conformant with the (yet) non-standard directMessage attribute:
* https://github.com/w3c/activitypub/issues/196#issuecomment-304958984
*
* @param array $activity received Create-Note activity
* @return bool true if note is private, false otherwise
*/
public static function isPrivateNote(array $activity): bool {
if (isset($activity['directMessage'])) {
return $activity['directMessage'];
}
return empty($activity['cc']) && !in_array('https://www.w3.org/ns/activitystreams#Public', $activity['to']);
}
}