new exceptions

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

lib/Controller/AccountController.php

@@ -115,7 +115,7 @@ class AccountController extends Controller {
 
 			return $this->success([]);
 		} catch (Exception $e) {
-			return $this->fail($e->getMessage());
+			return $this->fail($e);
 		}
 	}
 

lib/Controller/ActivityPubController.php

@@ -34,6 +34,7 @@ use daita\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse;
 use Exception;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Db\NotesRequest;
+use OCA\Social\Exceptions\SignatureException;
 use OCA\Social\Exceptions\UnknownItemException;
 use OCA\Social\Service\ActivityPub\FollowService;
 use OCA\Social\Service\ActivityService;
@@ -131,7 +132,7 @@ class ActivityPubController extends Controller {
 
 			return $this->directSuccess($actor);
 		} catch (Exception $e) {
-			return $this->fail($e->getMessage());
+			return $this->fail($e);
 		}
 	}
 
@@ -178,7 +179,7 @@ class ActivityPubController extends Controller {
 
 			return $this->success([]);
 		} catch (Exception $e) {
-			return $this->fail($e->getMessage());
+			return $this->fail($e);
 		}
 	}
 
@@ -214,7 +215,7 @@ class ActivityPubController extends Controller {
 
 			return $this->success([]);
 		} catch (Exception $e) {
-			return $this->fail($e->getMessage());
+			return $this->fail($e);
 		}
 	}
 
@@ -271,7 +272,7 @@ class ActivityPubController extends Controller {
 
 			return $this->directSuccess($followers);
 		} catch (Exception $e) {
-			return $this->fail($e->getMessage());
+			return $this->fail($e);
 		}
 	}
 

lib/Exceptions/SignatureException.php

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

lib/Service/ActivityService.php

@@ -30,6 +30,7 @@ declare(strict_types=1);
 namespace OCA\Social\Service;
 
 
+use daita\MySmallPhpTools\Exceptions\MalformedArrayException;
 use daita\MySmallPhpTools\Model\Request;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use DateTime;
@@ -39,6 +40,7 @@ use OCA\Social\Db\NotesRequest;
 use OCA\Social\Exceptions\ActorDoesNotExistException;
 use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Exceptions\RequestException;
+use OCA\Social\Exceptions\SignatureException;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\ActivityPub\Activity\Create;
@@ -273,14 +275,17 @@ class ActivityService {
 	/**
 	 * @param IRequest $request
 	 *
-	 * @throws Exception
+	 * @throws InvalidResourceException
+	 * @throws MalformedArrayException
+	 * @throws RequestException
+	 * @throws SignatureException
 	 */
 	public function checkRequest(IRequest $request) {
 		$dTime = new DateTime($request->getHeader('date'));
 		$dTime->format(self::DATE_FORMAT);
 
 		if ($dTime->getTimestamp() < (time() - self::DATE_DELAY)) {
-			throw new Exception('object is too old');
+			throw new SignatureException('object is too old');
 		}
 
 		$this->checkSignature($request);
@@ -308,7 +313,10 @@ class ActivityService {
 	/**
 	 * @param IRequest $request
 	 *
-	 * @throws Exception
+	 * @throws InvalidResourceException
+	 * @throws RequestException
+	 * @throws SignatureException
+	 * @throws MalformedArrayException
 	 */
 	private function checkSignature(IRequest $request) {
 		$signatureHeader = $request->getHeader('Signature');
@@ -323,8 +331,8 @@ class ActivityService {
 
 		$publicKey = $this->retrieveKey($keyId);
 
-		if (openssl_verify($estimated, $signed, $publicKey, 'sha256') !== 1) {
-			throw new Exception('signature cannot be checked');
+		if ($publicKey === '' || openssl_verify($estimated, $signed, $publicKey, 'sha256') !== 1) {
+			throw new SignatureException('signature cannot be checked');
 		}
 
 	}