move method
to webfinger class
This commit is contained in:
parent
d6b7cd0235
commit
c6657d2fa8
5 changed files with 43 additions and 45 deletions
|
@ -1,8 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace Activitypub;
|
namespace Activitypub;
|
||||||
|
|
||||||
use Activitypub\Rest\Webfinger;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ActivityPub Health_Check Class
|
* ActivityPub Health_Check Class
|
||||||
*
|
*
|
||||||
|
@ -204,7 +202,7 @@ class Health_Check {
|
||||||
$user = \wp_get_current_user();
|
$user = \wp_get_current_user();
|
||||||
$account = \Activitypub\get_webfinger_resource( $user->ID );
|
$account = \Activitypub\get_webfinger_resource( $user->ID );
|
||||||
|
|
||||||
$url = Webfinger::resolve( $account );
|
$url = Activitypub\Webfinger::resolve( $account );
|
||||||
if ( \is_wp_error( $url ) ) {
|
if ( \is_wp_error( $url ) ) {
|
||||||
$health_messages = array(
|
$health_messages = array(
|
||||||
'webfinger_url_not_accessible' => \sprintf(
|
'webfinger_url_not_accessible' => \sprintf(
|
||||||
|
|
|
@ -26,4 +26,44 @@ class Webfinger {
|
||||||
|
|
||||||
return $user->user_login . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
|
return $user->user_login . '@' . \wp_parse_url( \home_url(), \PHP_URL_HOST );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function resolve( $account ) {
|
||||||
|
if ( ! preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $account, $m ) ) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
$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 ) ) {
|
||||||
|
return new \WP_Error( 'webfinger_url_not_accessible', null, $url );
|
||||||
|
}
|
||||||
|
|
||||||
|
$response_code = \wp_remote_retrieve_response_code( $response );
|
||||||
|
|
||||||
|
$body = \wp_remote_retrieve_body( $response );
|
||||||
|
$body = \json_decode( $body, true );
|
||||||
|
|
||||||
|
if ( ! isset( $body['links'] ) ) {
|
||||||
|
return new \WP_Error( 'webfinger_url_invalid_response', null, $url );
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ( $body['links'] as $link ) {
|
||||||
|
if ( 'self' === $link['rel'] && 'application/activity+json' === $link['type'] ) {
|
||||||
|
return $link['href'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new \WP_Error( 'webfinger_url_no_activity_pub', null, $body );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,7 +111,7 @@ function get_remote_metadata_by_actor( $actor ) {
|
||||||
return $pre;
|
return $pre;
|
||||||
}
|
}
|
||||||
if ( preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $actor ) ) {
|
if ( preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $actor ) ) {
|
||||||
$actor = Rest\Webfinger::resolve( $actor );
|
$actor = \Acivitypub\Webfinger::resolve( $actor );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! $actor ) {
|
if ( ! $actor ) {
|
||||||
|
|
|
@ -120,44 +120,4 @@ class Webfinger {
|
||||||
|
|
||||||
return $array;
|
return $array;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function resolve( $account ) {
|
|
||||||
if ( ! preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $account, $m ) ) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
$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 ) ) {
|
|
||||||
return new \WP_Error( 'webfinger_url_not_accessible', null, $url );
|
|
||||||
}
|
|
||||||
|
|
||||||
$response_code = \wp_remote_retrieve_response_code( $response );
|
|
||||||
|
|
||||||
$body = \wp_remote_retrieve_body( $response );
|
|
||||||
$body = \json_decode( $body, true );
|
|
||||||
|
|
||||||
if ( ! isset( $body['links'] ) ) {
|
|
||||||
return new \WP_Error( 'webfinger_url_invalid_response', null, $url );
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ( $body['links'] as $link ) {
|
|
||||||
if ( 'self' === $link['rel'] && 'application/activity+json' === $link['type'] ) {
|
|
||||||
return $link['href'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return new \WP_Error( 'webfinger_url_no_activity_pub', null, $body );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,7 +95,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( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/i', $incoming_url ) ) {
|
if ( preg_match( '/^@?[^@]+@((?:[a-z0-9-]+\.)+[a-z]+)$/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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue