Merge pull request #12956 from annando/server-blocked

[friendica.git] / src / Module / PublicRSAKey.php

diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php
index a13130d1c98bdd86e2c2b49b0db0483ffd447348..810a9210cdbe72f9399590c6a851864065d3bc53 100644 (file)
--- a/src/Module/PublicRSAKey.php
+++ b/src/Module/PublicRSAKey.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,35 +22,33 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\DI;
+use Friendica\Core\System;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Util\Crypto;
-use Friendica\Util\Strings;
+use Friendica\Protocol\Salmon;
 
 /**
  * prints the public RSA key of a user
  */
 class PublicRSAKey extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               if (empty($parameters['nick'])) {
+               if (empty($this->parameters['nick'])) {
                        throw new BadRequestException();
                }
 
-               $nick = $parameters['nick'];
+               $nick = $this->parameters['nick'];
 
                $user = User::getByNickname($nick, ['spubkey']);
                if (empty($user) || empty($user['spubkey'])) {
                        throw new BadRequestException();
                }
 
-               Crypto::pemToMe($user['spubkey'], $modulus, $exponent);
-
-               header('Content-type: application/magic-public-key');
-               echo 'RSA' . '.' . Strings::base64UrlEncode($modulus, true) . '.' . Strings::base64UrlEncode($exponent, true);
-
-               exit();
+               System::httpExit(
+                       Salmon::salmonKey($user['spubkey']),
+                       Response::TYPE_BLANK,
+                       'application/magic-public-key'
+               );
        }
 }