allow manual-install to use harp

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

Author: kyteinsky

lib/Command/Daemon/RegisterDaemon.php

@@ -49,11 +49,13 @@ protected function configure(): void {
 		$this->addOption('harp_shared_key', null, InputOption::VALUE_REQUIRED, 'HaRP shared key for secure communication between HaRP and AppAPI');
 		$this->addOption('harp_docker_socket_port', null, InputOption::VALUE_REQUIRED, '\'remotePort\' of the FRP client of the remote docker socket proxy. There is one included in the harp container so this can be skipped for default setups.', '24000');
 
+		$this->addUsage('harp_proxy_docker "Harp Proxy (Docker)" "docker-install" "http" "appapi-harp:8780" "http://nextcloud.local" --net nextcloud --harp --harp_frp_address "appapi-harp:8782" --harp_shared_key "some_very_secure_password" --set-default --compute_device=cuda');
+		$this->addUsage('harp_proxy_host "Harp Proxy (Host)" "docker-install" "http" "localhost:8780" "http://nextcloud.local" --harp --harp_frp_address "localhost:8782" --harp_shared_key "some_very_secure_password" --set-default --compute_device=cuda');
+		$this->addUsage('manual_install_harp "Harp Manual Install" "manual-install" "http" "appapi-harp:8780" "http://nextcloud.local" --net nextcloud --harp --harp_frp_address "appapi-harp:8782" --harp_shared_key "some_very_secure_password"');
+		$this->addUsage('docker_install "Docker Socket Proxy" "docker-install" "http" "nextcloud-appapi-dsp:2375" "http://nextcloud.local" --net=nextcloud --set-default --compute_device=cuda');
 		$this->addUsage('manual_install "Manual Install" "manual-install" "http" null "http://nextcloud.local"');
 		$this->addUsage('local_docker "Docker Local" "docker-install" "http" "/var/run/docker.sock" "http://nextcloud.local" --net=nextcloud');
 		$this->addUsage('local_docker "Docker Local" "docker-install" "http" "/var/run/docker.sock" "http://nextcloud.local" --net=nextcloud --set-default --compute_device=cuda');
-		$this->addUsage('docker_install "Docker Socket Proxy" "docker-install" "http" "nextcloud-appapi-dsp:2375" "http://nextcloud.local" --net=nextcloud --set-default --compute_device=cuda');
-		$this->addUsage('harp_proxy "Harp Proxy with DSP" "docker-install" "http" "appapi-harp:8780" "http://nextcloud.local" --harp --harp_frp_address "localhost:8782" --harp_shared_key "some_very_secure_password" --set-default --compute_device=cuda');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
@@ -73,11 +75,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$output->writeln('Value error: Manual-install daemon supports only `http` protocol.');
 			return 1;
 		}
-		// todo:
-		if ($acceptsDeployId === 'manual-install' && $isHarp) {
-			$output->writeln('Value error: Manual-install daemon does not support HaRP.');
-			return 1;
-		}
 		if ($isHarp && !$input->getOption('harp_shared_key')) {
 			$output->writeln('Value error: HaRP enabled daemon requires `harp_shared_key` option.');
 			return 1;

lib/Controller/DaemonConfigController.php

@@ -121,11 +121,6 @@ public function unregisterDaemonConfig(string $name): Response {
 
 	public function verifyDaemonConnection(string $name): Response {
 		$daemonConfig = $this->daemonConfigService->getDaemonConfigByName($name);
-		if ($daemonConfig->getAcceptsDeployId() !== $this->dockerActions->getAcceptsDeployId()) {
-			return new JSONResponse([
-				'error' => sprintf('Only "%s" is supported', $this->dockerActions->getAcceptsDeployId()),
-			]);
-		}
 		$this->dockerActions->initGuzzleClient($daemonConfig);
 		$dockerDaemonAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
 		return new JSONResponse([
@@ -165,11 +160,6 @@ public function checkDaemonConnection(array $daemonParams): Response {
 			'host' => $daemonParams['host'],
 			'deploy_config' => $daemonParams['deploy_config'],
 		]);
-		if ($daemonConfig->getAcceptsDeployId() !== $this->dockerActions->getAcceptsDeployId()) {
-			return new JSONResponse([
-				'error' => sprintf('Only "%s" is supported', $this->dockerActions->getAcceptsDeployId()),
-			]);
-		}
 		$this->dockerActions->initGuzzleClient($daemonConfig);
 		$dockerDaemonAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
 		return new JSONResponse([

lib/DeployActions/ManualActions.php

@@ -47,6 +47,14 @@ public function buildDeployEnvs(array $params, array $deployConfig): array {
 	public function resolveExAppUrl(
 		string $appId, string $protocol, string $host, array $deployConfig, int $port, array &$auth
 	): string {
+		if (boolval($deployConfig['harp'] ?? false)) {
+			$url = rtrim($deployConfig['nextcloud_url'], '/');
+			if (str_ends_with($url, '/index.php')) {
+				$url = substr($url, 0, -10);
+			}
+			return sprintf('%s/exapps/%s', $url, $appId);
+		}
+
 		$auth = [];
 		if (isset($deployConfig['additional_options']['OVERRIDE_APP_HOST']) &&
 			$deployConfig['additional_options']['OVERRIDE_APP_HOST'] !== ''

lib/Service/AppAPIService.php

@@ -713,7 +713,7 @@ public function removeExAppsByDaemonConfigName(DaemonConfig $daemonConfig): void
 			}
 			foreach ($targetDaemonExApps as $exApp) {
 				$this->disableExApp($exApp);
-				if ($daemonConfig->getAcceptsDeployId() === 'docker-install') {
+				if ($daemonConfig->getAcceptsDeployId() === $this->dockerActions->getAcceptsDeployId()) {
 					$this->dockerActions->initGuzzleClient($daemonConfig);
 					$this->dockerActions->removeContainer($this->dockerActions->buildDockerUrl($daemonConfig), $this->dockerActions->buildExAppContainerName($exApp->getAppid()));
 					$this->dockerActions->removeVolume($this->dockerActions->buildDockerUrl($daemonConfig), $this->dockerActions->buildExAppVolumeName($exApp->getAppid()));

lib/Service/ExAppService.php

@@ -265,6 +265,9 @@ public function getAppInfo(string $appId, ?string $infoXml, ?string $jsonInfo, ?
 		$extractedDir = '';
 		if ($jsonInfo !== null) {
 			$appInfo = json_decode($jsonInfo, true);
+			if ($appInfo === false) {
+				return ['error' => 'Invalid app info JSON'];
+			}
 			# fill 'id' if it is missing(this field was called `appid` in previous versions in json)
 			$appInfo['id'] = $appInfo['id'] ?? $appId;
 			# during manual install JSON can have all values at root level