$m->connect('main/ostatuspeopletag',
array('action' => 'ostatuspeopletag'));
- // PuSH actions
+ // WebSub actions
$m->connect('main/push/hub', array('action' => 'pushhub'));
$m->connect('main/push/callback/:feed',
// Prepare outgoing distributions after notice save.
$qm->connect('ostatus', 'OStatusQueueHandler');
- // Outgoing from our internal PuSH hub
+ // Outgoing from our internal WebSub hub
$qm->connect('hubconf', 'HubConfQueueHandler');
$qm->connect('hubprep', 'HubPrepQueueHandler');
// Outgoing Salmon replies (when we don't need a return value)
$qm->connect('salmon', 'SalmonQueueHandler');
- // Incoming from a foreign PuSH hub
+ // Incoming from a foreign WebSub hub
$qm->connect('pushin', 'PushInQueueHandler');
// Re-subscribe feeds that need renewal
}
/**
- * Set up a PuSH hub link to our internal link for canonical timeline
+ * Set up a WebSub hub link to our internal link for canonical timeline
* Atom feeds for users and groups.
*/
function onStartApiAtom($feed)
if (!empty($id)) {
$hub = common_config('ostatus', 'hub');
if (empty($hub)) {
- // Updates will be handled through our internal PuSH hub.
+ // Updates will be handled through our internal WebSub hub.
$hub = common_local_url('pushhub');
}
$feed->addLink($hub, array('rel' => 'hub'));
return true;
}
+ /**
+ * Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz
+ * @param string $text The text from which to extract webfinger IDs
+ * @param string $preMention Character(s) that signals a mention ('@', '!'...)
+ *
+ * @return array The matching IDs (without $preMention) and each respective position in the given string.
+ */
+ static function extractWebfingerIds($text, $preMention='@')
+ {
+ $wmatches = array();
+ $result = preg_match_all('/(?<!\S)'.preg_quote($preMention, '/').'('.Nickname::WEBFINGER_FMT.')/',
+ $text,
+ $wmatches,
+ PREG_OFFSET_CAPTURE);
+ if ($result === false) {
+ common_log(LOG_ERR, __METHOD__ . ': Error parsing webfinger IDs from text (preg_last_error=='.preg_last_error().').');
+ } elseif (count($wmatches)) {
+ common_debug(sprintf('Found %d matches for WebFinger IDs: %s', count($wmatches), _ve($wmatches)));
+ }
+ return $wmatches[1];
+ }
+
+ /**
+ * Profile URL matches: @example.com/mublog/user
+ * @param string $text The text from which to extract URL mentions
+ * @param string $preMention Character(s) that signals a mention ('@', '!'...)
+ *
+ * @return array The matching URLs (without @ or acct:) and each respective position in the given string.
+ */
+ static function extractUrlMentions($text, $preMention='@')
+ {
+ $wmatches = array();
+ // In the regexp below we need to match / _before_ URL_REGEX_VALID_PATH_CHARS because it otherwise gets merged
+ // with the TLD before (but / is in URL_REGEX_VALID_PATH_CHARS anyway, it's just its positioning that is important)
+ $result = preg_match_all('/(?:^|\s+)'.preg_quote($preMention, '/').'('.URL_REGEX_DOMAIN_NAME.'(?:\/['.URL_REGEX_VALID_PATH_CHARS.']*)*)/',
+ $text,
+ $wmatches,
+ PREG_OFFSET_CAPTURE);
+ if ($result === false) {
+ common_log(LOG_ERR, __METHOD__ . ': Error parsing profile URL mentions from text (preg_last_error=='.preg_last_error().').');
+ } elseif (count($wmatches)) {
+ common_debug(sprintf('Found %d matches for profile URL mentions: %s', count($wmatches), _ve($wmatches)));
+ }
+ return $wmatches[1];
+ }
+
/**
* Find any explicit remote mentions. Accepted forms:
* Webfinger: @user@example.com
{
$matches = array();
- $wmatches = array();
- // Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz
- if (preg_match_all('!(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
- $text,
- $wmatches,
- PREG_OFFSET_CAPTURE)) {
- foreach ($wmatches[1] as $wmatch) {
- list($target, $pos) = $wmatch;
- $this->log(LOG_INFO, "Checking webfinger '$target'");
- $profile = null;
+ foreach (self::extractWebfingerIds($text, '@') as $wmatch) {
+ list($target, $pos) = $wmatch;
+ $this->log(LOG_INFO, "Checking webfinger person '$target'");
+ $profile = null;
+ try {
+ $oprofile = Ostatus_profile::ensureWebfinger($target);
+ if (!$oprofile instanceof Ostatus_profile || !$oprofile->isPerson()) {
+ continue;
+ }
+ $profile = $oprofile->localProfile();
+ } catch (OStatusShadowException $e) {
+ // This means we got a local user in the webfinger lookup
+ $profile = $e->profile;
+ } catch (Exception $e) {
+ $this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage());
+ continue;
+ }
+
+ assert($profile instanceof Profile);
+
+ $displayName = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target)
+ ? $profile->getNickname() // TODO: we could do getBestName() or getFullname() here
+ : $target;
+ $url = $profile->getUri();
+ if (!common_valid_http_url($url)) {
+ $url = $profile->getUrl();
+ }
+ $matches[$pos] = array('mentioned' => array($profile),
+ 'type' => 'mention',
+ 'text' => $displayName,
+ 'position' => $pos,
+ 'length' => mb_strlen($target),
+ 'url' => $url);
+ }
+
+ // Doing groups in a separate routine because webfinger lookups don't work
+ // remotely until everyone updates etc. etc.
+ foreach (self::extractWebfingerIds($text, '!') as $wmatch) {
+ list($target, $pos) = $wmatch;
+ list($target_nickname, $target_hostname) = explode('@', parse_url($target, PHP_URL_PATH));
+ $this->log(LOG_INFO, sprintf('Checking webfinger group %s as user %s on server %s', $target, $target_nickname, $target_hostname));
+
+ $profile = null;
+ if ($target_hostname === mb_strtolower(common_config('site', 'server'))) {
try {
- $oprofile = Ostatus_profile::ensureWebfinger($target);
- if (!$oprofile instanceof Ostatus_profile || !$oprofile->isPerson()) {
+ $profile = Local_group::getKV('nickname', $target_nickname)->getProfile();
+ } catch (NoSuchGroupException $e) {
+ // referenced a local group which does not exist, so not returning it as a mention
+ $this->log(LOG_ERR, "Local group lookup failed: " . _ve($e->getMessage()));
+ continue;
+ }
+ } else {
+ // XXX: Superhacky. Domain name can be incorrectly matched
+ // here. But since users are only members of groups
+ // they trust (of course they are!), the likelihood of
+ // a mention-hijacking is very very low... for now.
+ $possible_groups = new User_group();
+ $possible_groups->nickname = $target_nickname;
+ if (!$possible_groups->find()) {
+ common_debug('No groups at all found with nickname: '._ve($target_nickname));
+ continue;
+ }
+ while ($possible_groups->fetch()) {
+ if (!$sender->isMember($possible_groups)) {
continue;
}
- $profile = $oprofile->localProfile();
- } catch (OStatusShadowException $e) {
- // This means we got a local user in the webfinger lookup
- $profile = $e->profile;
- } catch (Exception $e) {
- $this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage());
+ $group_hostname = mb_strtolower(parse_url($possible_groups->mainpage, PHP_URL_HOST));
+ if ($target_hostname === $group_hostname) {
+ common_debug(sprintf('Found group with nick@host (%s@%s) matching %s', _ve($possible_groups->nickname), _ve($group_hostname), _ve($target)));
+ $profile = $possible_groups->getProfile();
+ break;
+ }
+ }
+ $possible_groups->free();
+ if (!$profile instanceof Profile) {
+ common_debug('Found groups with correct nickname but not hostname for: '._ve($target));
continue;
}
+ }
- assert($profile instanceof Profile);
+ assert($profile instanceof Profile);
- $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target)
- ? $profile->getNickname() // TODO: we could do getBestName() or getFullname() here
- : $target;
- $url = $profile->getUri();
- if (!common_valid_http_url($url)) {
- $url = $profile->getUrl();
- }
- $matches[$pos] = array('mentioned' => array($profile),
- 'type' => 'mention',
- 'text' => $text,
- 'position' => $pos,
- 'length' => mb_strlen($target),
- 'url' => $url);
+ $displayName = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target)
+ ? $profile->getNickname() // TODO: we could do getBestName() or getFullname() here
+ : $target;
+ $url = $profile->getUri();
+ if (!common_valid_http_url($url)) {
+ $url = $profile->getUrl();
}
+ $matches[$pos] = array('mentioned' => array($profile),
+ 'type' => 'group',
+ 'text' => $displayName,
+ 'position' => $pos,
+ 'length' => mb_strlen($target),
+ 'url' => $url);
}
- // Profile matches: @example.com/mublog/user
- if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)*)!',
- $text,
- $wmatches,
- PREG_OFFSET_CAPTURE)) {
- foreach ($wmatches[1] as $wmatch) {
- list($target, $pos) = $wmatch;
- $schemes = array('http', 'https');
- foreach ($schemes as $scheme) {
- $url = "$scheme://$target";
- $this->log(LOG_INFO, "Checking profile address '$url'");
- try {
- $oprofile = Ostatus_profile::ensureProfileURL($url);
- if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) {
- $profile = $oprofile->localProfile();
- $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target) ?
- $profile->nickname : $target;
- $matches[$pos] = array('mentioned' => array($profile),
- 'type' => 'mention',
- 'text' => $text,
- 'position' => $pos,
- 'length' => mb_strlen($target),
- 'url' => $profile->getUrl());
- break;
- }
- } catch (Exception $e) {
- $this->log(LOG_ERR, "Profile check failed: " . $e->getMessage());
+ foreach (self::extractUrlMentions($text) as $wmatch) {
+ list($target, $pos) = $wmatch;
+ $schemes = array('https', 'http');
+ foreach ($schemes as $scheme) {
+ $url = "$scheme://$target";
+ $this->log(LOG_INFO, "Checking profile address '$url'");
+ try {
+ $oprofile = Ostatus_profile::ensureProfileURL($url);
+ if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) {
+ $profile = $oprofile->localProfile();
+ $displayName = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target) ?
+ $profile->nickname : $target;
+ $matches[$pos] = array('mentioned' => array($profile),
+ 'type' => 'mention',
+ 'text' => $displayName,
+ 'position' => $pos,
+ 'length' => mb_strlen($target),
+ 'url' => $profile->getUrl());
+ break;
}
+ } catch (Exception $e) {
+ $this->log(LOG_ERR, "Profile check failed: " . $e->getMessage());
}
}
}
}
/**
- * Send incoming PuSH feeds for OStatus endpoints in for processing.
+ * Send incoming WebSub feeds for OStatus endpoints in for processing.
*
* @param FeedSub $feedsub
* @param DOMDocument $feed
/**
* When about to subscribe to a remote user, start a server-to-server
- * PuSH subscription if needed. If we can't establish that, abort.
+ * WebSub subscription if needed. If we can't establish that, abort.
*
* @fixme If something else aborts later, we could end up with a stray
- * PuSH subscription. This is relatively harmless, though.
+ * WebSub subscription. This is relatively harmless, though.
*
* @param Profile $profile subscriber
* @param Profile $other subscribee
return true;
}
- // Drop the PuSH subscription if there are no other subscribers.
+ // Drop the WebSub subscription if there are no other subscribers.
$oprofile->garbageCollect();
$act = new Activity();
return true;
}
- // Drop the PuSH subscription if there are no other subscribers.
+ // Drop the WebSub subscription if there are no other subscribers.
$oprofile->garbageCollect();
$member = $profile;
return true;
}
- // Drop the PuSH subscription if there are no other subscribers.
+ // Drop the WebSub subscription if there are no other subscribers.
$oprofile->garbageCollect();
$sub = Profile::getKV($user->id);
$oprofile->notifyDeferred($act, $tagger);
- // initiate a PuSH subscription for the person being tagged
+ // initiate a WebSub subscription for the person being tagged
$oprofile->subscribe();
return true;
}
$oprofile->notifyDeferred($act, $tagger);
- // unsubscribe to PuSH feed if no more required
+ // unsubscribe to WebSub feed if no more required
$oprofile->garbageCollect();
return true;
// Find foreign accounts I'm subscribed to that support Salmon pings.
//
- // @fixme we could run updates through the PuSH feed too,
+ // @fixme we could run updates through the WebSub feed too,
// in which case we can skip Salmon pings to folks who
// are also subscribed to me.
$sql = "SELECT * FROM ostatus_profile " .
return true;
}
+ function onEndShowAccountProfileBlock(HTMLOutputter $out, Profile $profile)
+ {
+ if ($profile->isLocal()) {
+ return true;
+ }
+ try {
+ $oprofile = Ostatus_profile::fromProfile($profile);
+ } catch (NoResultException $e) {
+ // Not a remote Ostatus_profile! Maybe some other network
+ // that has imported a non-local user?
+ return true;
+ }
+ try {
+ $feedsub = $oprofile->getFeedSub();
+ } catch (NoResultException $e) {
+ // No WebSub subscription has been attempted or exists for this profile
+ // which is the case, say for remote profiles that are only included
+ // via mentions or repeat/share.
+ return true;
+ }
+
+ $websub_states = [
+ 'subscribe' => _m('Pending'),
+ 'active' => _m('Active'),
+ 'nohub' => _m('Polling'),
+ 'inactive' => _m('Inactive'),
+ ];
+ $out->elementStart('dl', 'entity_tags ostatus_profile');
+ $out->element('dt', null, _m('WebSub'));
+ $out->element('dd', null, $websub_states[$feedsub->sub_state]);
+ $out->elementEnd('dl');
+ }
+
// FIXME: This one can accept both an Action and a Widget. Confusing! Refactor to (HTMLOutputter $out, Profile $target)!
function onStartProfileListItemActionElements($item)
{
return true;
}
- // 200 OK is the best response
- // 202 Accepted is what we get from Diaspora for example
- if (!in_array($response->getStatus(), array(200, 202))) {
+ // The different kinds of accepted responses...
+ // 200 OK means it's all ok
+ // 201 Created is what Mastodon returns when it's ok
+ // 202 Accepted is what we get from Diaspora, also good
+ if (!in_array($response->getStatus(), array(200, 201, 202))) {
common_log(LOG_ERR, sprintf('Salmon (from profile %d) endpoint %s returned status %s: %s',
$magic_env->getActor()->getID(), $endpoint_uri, $response->getStatus(), $response->getBody()));
return true;
projects / quix0rs-gnu-social.git / blobdiff