X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPublicRSAKey.php;h=810a9210cdbe72f9399590c6a851864065d3bc53;hb=450dd433a31c1b85408f633d603f27203c105734;hp=5e90d90725768476882362bfe748b8b703368a86;hpb=3c76826793feeb933dab7a07dab7cc7eb2efc451;p=friendica.git

diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php
index 5e90d90725..810a9210cd 100644
--- a/src/Module/PublicRSAKey.php
+++ b/src/Module/PublicRSAKey.php
@@ -1,48 +1,54 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
-use ASN_BASE;
 use Friendica\BaseModule;
-use Friendica\DI;
+use Friendica\Core\System;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException\BadRequestException;
+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 = [])
 	{
-		$app = DI::app();
-
-		// @TODO: Replace with parameter from router
-		if ($app->argc !== 2) {
+		if (empty($this->parameters['nick'])) {
 			throw new BadRequestException();
 		}
 
-		// @TODO: Replace with parameter from router
-		$nick = $app->argv[1];
+		$nick = $this->parameters['nick'];
 
 		$user = User::getByNickname($nick, ['spubkey']);
 		if (empty($user) || empty($user['spubkey'])) {
 			throw new BadRequestException();
 		}
 
-		$lines = explode("\n", $user['spubkey']);
-		unset($lines[0]);
-		unset($lines[count($lines)]);
-
-		$asnString = base64_decode(implode('', $lines));
-		$asnBase = ASN_BASE::parseASNString($asnString);
-
-		$m = $asnBase[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
-		$e = $asnBase[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
-
-		header('Content-type: application/magic-public-key');
-		echo 'RSA' . '.' . $m . '.' . $e;
-
-		exit();
+		System::httpExit(
+			Salmon::salmonKey($user['spubkey']),
+			Response::TYPE_BLANK,
+			'application/magic-public-key'
+		);
 	}
 }