Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity Actions

Revert erroneous changes

Browse source
This commit is contained in:
Alex Kirk 2022-12-09 19:05:43 +01:00
parent 0925405430
commit 7d598d92a8
6 changed files with 31 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/class-mention.php
View file

@ -58,7 +58,7 @@ class Mention {
public static function extract_mentions( $mentions, $post_content ) { public static function extract_mentions( $mentions, $post_content ) {
\preg_match_all( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/i', $post_content, $matches ); \preg_match_all( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/i', $post_content, $matches );
foreach ( $matches[0] as $match ) { foreach ( $matches[0] as $match ) {
$link = \Activitypub\Rest\Webfinger::resolve( $match ); $link = \Activitypub\Webfinger::resolve( $match );
if ( ! is_wp_error( $link ) ) { if ( ! is_wp_error( $link ) ) {
$mentions[ $match ] = $link; $mentions[ $match ] = $link;
} }

22
includes/class-webfinger.php
View file

@ -28,9 +28,16 @@ class Webfinger {
} }
public static function resolve( $account ) { public static function resolve( $account ) {
if ( ! preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $account, $m ) ) { if ( ! preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $account, $m ) ) {
return null; return null;
} }
$transient_key = 'activitypub_resolve_' . ltrim( $account, '@' );
$link = \get_transient( $transient_key );
if ( $link ) {
return $link;
}
$url = \add_query_arg( 'resource', 'acct:' . ltrim( $account, '@' ), 'https://' . $m[1] . '/.well-known/webfinger' ); $url = \add_query_arg( 'resource', 'acct:' . ltrim( $account, '@' ), 'https://' . $m[1] . '/.well-known/webfinger' );
if ( ! \wp_http_validate_url( $url ) ) { if ( ! \wp_http_validate_url( $url ) ) {
return new \WP_Error( 'invalid_webfinger_url', null, $url ); return new \WP_Error( 'invalid_webfinger_url', null, $url );
@ -46,7 +53,9 @@ class Webfinger {
); );
if ( \is_wp_error( $response ) ) { if ( \is_wp_error( $response ) ) {
return new \WP_Error( 'webfinger_url_not_accessible', null, $url ); $link = new \WP_Error( 'webfinger_url_not_accessible', null, $url );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
} }
$response_code = \wp_remote_retrieve_response_code( $response ); $response_code = \wp_remote_retrieve_response_code( $response );
@ -55,15 +64,20 @@ class Webfinger {
$body = \json_decode( $body, true ); $body = \json_decode( $body, true );
if ( ! isset( $body['links'] ) ) { if ( ! isset( $body['links'] ) ) {
return new \WP_Error( 'webfinger_url_invalid_response', null, $url ); $link = new \WP_Error( 'webfinger_url_invalid_response', null, $url );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
} }
foreach ( $body['links'] as $link ) { foreach ( $body['links'] as $link ) {
if ( 'self' === $link['rel'] && 'application/activity+json' === $link['type'] ) { if ( 'self' === $link['rel'] && 'application/activity+json' === $link['type'] ) {
\set_transient( $transient_key, $link['href'], WEEK_IN_SECONDS );
return $link['href']; return $link['href'];
} }
} }
return new \WP_Error( 'webfinger_url_no_activity_pub', null, $body ); $link = new \WP_Error( 'webfinger_url_no_activity_pub', null, $body );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
} }
} }

2
includes/functions.php
View file

@ -111,7 +111,7 @@ function get_remote_metadata_by_actor( $actor ) {
return $pre; return $pre;
} }
if ( preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $actor ) ) { if ( preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $actor ) ) {
$actor = Rest\Webfinger::resolve( $actor ); $actor = Webfinger::resolve( $actor );
} }
if ( ! $actor ) { if ( ! $actor ) {

54
includes/rest/class-webfinger.php
View file

@ -118,58 +118,4 @@ class Webfinger {
return $array; return $array;
} }
public static function resolve( $account ) {
if ( ! preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $account, $m ) ) {
return null;
}
$transient_key = 'activitypub_resolve_' . ltrim( $account, '@' );
$link = \get_transient( $transient_key );
if ( $link ) {
return $link;
}
$url = \add_query_arg( 'resource', 'acct:' . ltrim( $account, '@' ), 'https://' . $m[1] . '/.well-known/webfinger' );
if ( ! \wp_http_validate_url( $url ) ) {
return new \WP_Error( 'invalid_webfinger_url', null, $url );
}
// try to access author URL
$response = \wp_remote_get(
$url,
array(
'headers' => array( 'Accept' => 'application/activity+json' ),
'redirection' => 0,
)
);
if ( \is_wp_error( $response ) ) {
$link = new \WP_Error( 'webfinger_url_not_accessible', null, $url );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
}
$response_code = \wp_remote_retrieve_response_code( $response );
$body = \wp_remote_retrieve_body( $response );
$body = \json_decode( $body, true );
if ( ! isset( $body['links'] ) ) {
$link = new \WP_Error( 'webfinger_url_invalid_response', null, $url );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
}
foreach ( $body['links'] as $link ) {
if ( 'self' === $link['rel'] && 'application/activity+json' === $link['type'] ) {
\set_transient( $transient_key, $link['href'], WEEK_IN_SECONDS );
return $link['href'];
}
}
$link = new \WP_Error( 'webfinger_url_no_activity_pub', null, $body );
\set_transient( $transient_key, $link, HOUR_IN_SECONDS ); // Cache the error for a shorter period.
return $link;
}
} }

2
integration/class-friends-feed-parser-activitypub.php
View file

@ -98,7 +98,7 @@ class Friends_Feed_Parser_ActivityPub extends \Friends\Feed_Parser {
*/ */
public function friends_rewrite_incoming_url( $url, $incoming_url ) { public function friends_rewrite_incoming_url( $url, $incoming_url ) {
if ( preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $incoming_url ) ) { if ( preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $incoming_url ) ) {
$resolved_url = \Activitypub\Rest\Webfinger::resolve( $incoming_url ); $resolved_url = \Activitypub\Webfinger::resolve( $incoming_url );
if ( ! is_wp_error( $resolved_url ) ) { if ( ! is_wp_error( $resolved_url ) ) {
return $resolved_url; return $resolved_url;
} }