Merge pull request #37 from nextcloud-gmbh/fixing-verification

source verification
alpha1
Maxence Lange 2018-11-19 11:25:40 -01:00 zatwierdzone przez GitHub
commit 86e90ffef8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
5 zmienionych plików z 74 dodań i 29 usunięć

Wyświetl plik

@ -33,7 +33,6 @@ namespace OCA\Social\Db;
use OCA\Social\Exceptions\FollowDoesNotExistException;
use OCA\Social\Model\ActivityPub\Follow;
use OCA\Social\Model\ActivityPub\Person;
/**
@ -74,22 +73,22 @@ class FollowsRequest extends FollowsRequestBuilder {
/**
* @param Person $actor
* @param Person $remote
* @param string $actorId
* @param string $remoteActorId
*
* @return Follow
* @throws FollowDoesNotExistException
*/
public function getByPersons(Person $actor, Person $remote) {
public function getByPersons(string $actorId, string $remoteActorId) {
$qb = $this->getFollowsSelectSql();
$this->limitToActorId($qb, $actor->getId());
$this->limitToObjectId($qb, $remote->getId());
$this->limitToActorId($qb, $actorId);
$this->limitToObjectId($qb, $remoteActorId);
$cursor = $qb->execute();
$data = $cursor->fetch();
$cursor->closeCursor();
if ($data === false) {
$this->miscService->log('does not exisst ?');
throw new FollowDoesNotExistException();
}
@ -108,5 +107,17 @@ class FollowsRequest extends FollowsRequestBuilder {
}
/**
* @param Follow $follow
*/
public function deleteByPersons(Follow $follow) {
$qb = $this->getFollowsDeleteSql();
$this->limitToActorId($qb, $follow->getActorId());
$this->limitToObjectId($qb, $follow->getObjectId());
$qb->execute();
}
}

Wyświetl plik

@ -0,0 +1,8 @@
<?php
namespace OCA\Social\Exceptions;
class ActivityCantBeVerifiedException extends \Exception {
}

Wyświetl plik

@ -32,6 +32,7 @@ namespace OCA\Social\Model\ActivityPub;
use daita\MySmallPhpTools\Traits\TArrayTools;
use JsonSerializable;
use OCA\Social\Exceptions\ActivityCantBeVerifiedException;
use OCA\Social\Model\InstancePath;
use OCA\Social\Service\ICoreService;
@ -184,20 +185,23 @@ abstract class ACore implements JsonSerializable {
/**
* @param string $url
*
* @return bool
* @throws ActivityCantBeVerifiedException
*/
public function verify(string $url): bool {
if (parse_url($this->getId(), PHP_URL_HOST) !==
parse_url($url, PHP_URL_HOST))
return false;
public function verify(string $url) {
$url1 = parse_url($this->getId());
$url2 = parse_url($url);
\OC::$server->getLogger()->log(2, '#### ' . json_encode(parse_url($this->getId(), PHP_URL_PORT)));
// if (parse_url($this->getId(), PHP_URL_PORT) !==
// parse_url($url, PHP_URL_HOST))
// return false;
//
if ($this->get('host', $url1, '1') !== $this->get('host', $url2, '2')) {
throw new ActivityCantBeVerifiedException('activity cannot be verified');
}
return true;
if ($this->get('scheme', $url1, '1') !== $this->get('scheme', $url2, '2')) {
throw new ActivityCantBeVerifiedException('activity cannot be verified');
}
if ($this->getInt('port', $url1, 1) !== $this->getInt('port', $url2, 1)) {
throw new ActivityCantBeVerifiedException('activity cannot be verified');
}
}

Wyświetl plik

@ -106,8 +106,9 @@ class FollowService implements ICoreService {
$follow->setObjectId($remoteActor->getId());
try {
$this->followsRequest->getByPersons($actor, $remoteActor);
$this->followsRequest->getByPersons($actor->getId(), $remoteActor->getId());
} catch (FollowDoesNotExistException $e) {
$this->miscService->log('CREATE NEW ONE !');
$this->followsRequest->save($follow);
$follow->addInstancePath(new InstancePath($remoteActor->getInbox()));
@ -126,7 +127,7 @@ class FollowService implements ICoreService {
$remoteActor = $this->personService->getFromAccount($account);
try {
$follow = $this->followsRequest->getByPersons($actor, $remoteActor);
$follow = $this->followsRequest->getByPersons($actor->getId(), $remoteActor->getId());
$this->followsRequest->delete($follow);
} catch (FollowDoesNotExistException $e) {
}
@ -180,25 +181,32 @@ class FollowService implements ICoreService {
*/
public function save(ACore $follow) {
/** @var Follow $follow */
if ($follow->isRoot()) {
$follow->verify($follow->getActorId());
try {
$this->followsRequest->getByPersons($follow->getActorId(), $follow->getObjectId());
} catch (FollowDoesNotExistException $e) {
$this->followsRequest->save($follow);
$this->confirmFollowRequest($follow);
}
} else {
$parent = $follow->getParent();
if ($parent->isRoot() === false) {
return;
}
if ($parent->getType() === Undo::TYPE && $parent->verify($follow->getActorId())) {
$this->followsRequest->delete($follow);
if ($parent->getType() === Undo::TYPE) {
$parent->verify($follow->getActorId());
$this->followsRequest->deleteByPersons($follow);
}
if ($parent->getType() === Reject::TYPE && $parent->verify($follow->getObjectId())) {
$this->followsRequest->delete($follow);
if ($parent->getType() === Reject::TYPE) {
$parent->verify($follow->getObjectId());
$this->followsRequest->deleteByPersons($follow);
}
if ($parent->getType() === Accept::TYPE && $parent->verify($follow->getObjectId())) {
if ($parent->getType() === Accept::TYPE) {
$parent->verify($follow->getObjectId());
$this->followsRequest->accepted($follow);
}

Wyświetl plik

@ -37,6 +37,7 @@ use OCA\Social\Exceptions\ActorDoesNotExistException;
use OCA\Social\Exceptions\RequestException;
use OCA\Social\Exceptions\SocialAppConfigException;
use OCA\Social\Model\ActivityPub\ACore;
use OCA\Social\Model\ActivityPub\Activity\Create;
use OCA\Social\Model\ActivityPub\Note;
use OCA\Social\Model\ActivityPub\Person;
use OCA\Social\Model\InstancePath;
@ -229,9 +230,22 @@ class NoteService implements ICoreService {
*/
public function save(ACore $note) {
/** @var Note $note */
if ($note->isRoot()) {
return;
}
$parent = $note->getParent();
if ($parent->isRoot() === false) {
return;
}
if ($parent->getType() === Create::TYPE) {
$parent->verify(($note->getAttributedTo()));
$this->notesRequest->save($note);
}
}
/**
* @param string $userId