use deploy config from exapp instead of daemon config

Signed-off-by: Anupam Kumar <[email protected]>

Author: kyteinsky

lib/Controller/HarpController.php

@@ -47,10 +47,9 @@ public function __construct(
 	}
 
 	private function validateHarpSharedKey(string $appId): bool {
-		// todo: cache
-		$daemonConfig = $this->daemonConfigService->getDaemonConfigByAppId($appId);
-		if ($daemonConfig === null) {
-			$this->logger->error('Daemon config not found for the app', ['appId' => $appId]);
+		$exApp = $this->exAppService->getExApp($appId);
+		if ($exApp === null) {
+			$this->logger->error('ExApp not found', ['appId' => $appId]);
 			// Protection for guessing installed ExApps list
 			$this->throttler->registerAttempt(Application::APP_ID, $this->request->getRemoteAddress(), [
 				'appid' => $appId,
@@ -59,11 +58,11 @@ private function validateHarpSharedKey(string $appId): bool {
 		}
 
 		try {
-			if (!isset($daemonConfig->getDeployConfig()['haproxy_password'])) {
+			if (!isset($exApp->getDeployConfig()['haproxy_password'])) {
 				$this->logger->error('Harp shared key is not set. Invalid daemon config.');
 				return false;
 			}
-			$harpKey = $this->crypto->decrypt($daemonConfig->getDeployConfig()['haproxy_password']);
+			$harpKey = $this->crypto->decrypt($exApp->getDeployConfig()['haproxy_password']);
 		} catch (\Exception $e) {
 			$this->logger->error('Failed to decrypt harp shared key. Invalid daemon config.', ['exception' => $e]);
 			return false;

lib/Db/DaemonConfigMapper.php

@@ -54,23 +54,4 @@ public function findByName(string $name): DaemonConfig {
 			);
 		return $this->findEntity($qb);
 	}
-
-	/**
-	 * @param string $appId
-	 *
-	 * @throws DoesNotExistException
-	 * @throws Exception
-	 * @throws MultipleObjectsReturnedException
-	 *
-	 * @return DaemonConfig
-	 */
-	public function findByAppId(string $appId): DaemonConfig {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('d.*')
-			->from('ex_apps', 'a')
-			->where($qb->expr()->eq('a.appid', $qb->createNamedParameter($appId)))
-			->leftJoin('a', $this->tableName, 'd', $qb->expr()->eq('a.daemon_config_name', 'd.name'))
-			->setMaxResults(1);
-		return $this->findEntity($qb);
-	}
 }

lib/DeployActions/DockerActions.php

@@ -175,7 +175,7 @@ private function installParsedCertificates(string $dockerUrl, string $containerI
 	}
 
 	private function installFRPCertificates(DaemonConfig $daemonConfig, string $dockerUrl, string $containerId, string $targetDir): void {
-		if (!HarpService::isHarp($daemonConfig)) {
+		if (!HarpService::isHarp($daemonConfig->getDeployConfig())) {
 			return;
 		}
 		$certificates = $this->harpService->getFrpCertificates($daemonConfig);

lib/Service/AppAPICommonService.php

@@ -34,15 +34,8 @@ public function buildAppAPIAuthHeaders(?IRequest $request, ?string $userId, ExAp
 			'AA-REQUEST-ID' => $request instanceof IRequest ? $request->getId() : 'CLI',
 		];
 
-		// todo: cache
-		$daemonConfig = $this->daemonConfigService->getDaemonConfigByAppId($exApp->getAppid());
-		if ($daemonConfig === null) {
-			// this should not happen
-			$this->logger->error(sprintf('Daemon config with name %s not found.', $exApp->getDaemonConfigName()));
-			return $headers;
-		}
-		if ($this->harpService->isHarp($daemonConfig)) {
-			$harpKey = $this->harpService->getHarpSharedKey($daemonConfig);
+		if ($this->harpService->isHarp($exApp->getDeployConfig())) {
+			$harpKey = $this->harpService->getHarpSharedKey($exApp->getDeployConfig());
 			$headers['HARP-SHARED-KEY'] = $harpKey;
 			$headers['EX-APP-PORT'] = $exApp->getPort();
 		}

lib/Service/AppAPIService.php

@@ -502,14 +502,13 @@ public function heartbeatExApp(
 		}
 		$this->logger->info(sprintf('Performing heartbeat on: %s', $exAppUrl . '/heartbeat'));
 
-		// todo: cache
-		$daemonConfig = $this->daemonConfigService->getDaemonConfigByAppId($appId);
-		if (boolval($daemonConfig->getDeployConfig()['harp'] ?? false)) {
+		$exApp = $this->exAppService->getExApp($appId);
+		if ($exApp === null) {
+			$this->logger->error(sprintf('ExApp with appId %s not found.', $appId));
+			return false;
+		}
+		if (boolval($exApp->getDeployConfig()['harp'] ?? false)) {
 			$exApp = $this->exAppService->getExApp($appId);
-			if ($exApp === null) {
-				$this->logger->error(sprintf('ExApp with appId %s not found.', $appId));
-				return false;
-			}
 			$options['headers'] = array_merge(
 				$options['headers'],
 				$this->commonService->buildAppAPIAuthHeaders(null, null, $exApp),

lib/Service/DaemonConfigService.php

@@ -129,13 +129,4 @@ public function updateDaemonConfig(DaemonConfig $daemonConfig): ?DaemonConfig {
 			return null;
 		}
 	}
-
-	public function getDaemonConfigByAppId(string $appId): ?DaemonConfig {
-		try {
-			return $this->mapper->findByAppId($appId);
-		} catch (DoesNotExistException|MultipleObjectsReturnedException|Exception $e) {
-			$this->logger->debug('Failed to get daemon config by appId. Error: ' . $e->getMessage(), ['exception' => $e]);
-			return null;
-		}
-	}
 }

lib/Service/HarpService.php

@@ -47,9 +47,9 @@ protected function setupCerts(array $guzzleParams): array {
 	 * @return string|null
 	 * @throws \Exception
 	 */
-	public function getHarpSharedKey(DaemonConfig $daemonConfig): ?string {
+	public function getHarpSharedKey(array $deployConfig): ?string {
 		try {
-			return $this->crypto->decrypt($daemonConfig->getDeployConfig()['haproxy_password']);
+			return $this->crypto->decrypt($deployConfig['haproxy_password']);
 		} catch (\Exception $e) {
 			throw new \Exception('Failed to decrypt harp shared key', 0, $e);
 		}
@@ -84,8 +84,8 @@ protected function buildHarpUrl(DaemonConfig $daemonConfig, string $path): strin
 			. ltrim($path, '/');
 	}
 
-	public static function isHarp(DaemonConfig $daemonConfig): bool {
-		return boolval($daemonConfig->getDeployConfig()['harp'] ?? false);
+	public static function isHarp(array $deployConfig): bool {
+		return boolval($deployConfig['harp'] ?? false);
 	}
 
 	public static function getHarpExApp(ExApp $exApp): array {
@@ -108,7 +108,7 @@ public static function getHarpExApp(ExApp $exApp): array {
 	}
 
 	public function harpExAppUpdate(DaemonConfig $daemonConfig, ExApp $exApp, bool $added): void {
-		if (!self::isHarp($daemonConfig)) {
+		if (!self::isHarp($daemonConfig->getDeployConfig())) {
 			return;
 		}
 		$this->initGuzzleClient($daemonConfig);
@@ -141,7 +141,7 @@ public function harpExAppUpdate(DaemonConfig $daemonConfig, ExApp $exApp, bool $
 	 * @return array{tls_enabled: bool, ca_crt: string, client_crt: string, client_key: string}|null
 	 */
 	public function getFrpCertificates(DaemonConfig $daemonConfig): ?array {
-		if (!self::isHarp($daemonConfig)) {
+		if (!self::isHarp($daemonConfig->getDeployConfig())) {
 			return null;
 		}
 		$this->initGuzzleClient($daemonConfig);