occ: make daemon commands harp combatible

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

Author: kyteinsky

lib/Command/Daemon/ListDaemons.php

@@ -43,7 +43,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$output->writeln('Registered ExApp daemon configs:');
 		$table = new Table($output);
-		$table->setHeaders(['Def', 'Name', 'Display name', 'Deploy ID', 'Protocol', 'Host', 'NC Url']);
+		$table->setHeaders(['Def', 'Name', 'Display name', 'Deploy ID', 'Protocol', 'Host', 'NC Url', 'Is HaRP']);
 		$rows = [];
 
 		foreach ($daemonConfigs as $daemon) {
@@ -53,7 +53,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$daemon->getAcceptsDeployId(),
 				$daemon->getProtocol(),
 				$daemon->getHost(),
-				$daemon->getDeployConfig()['nextcloud_url']
+				$daemon->getDeployConfig()['nextcloud_url'],
+				$daemon->getDeployConfig()['harp'] ? 'yes' : 'no',
 			];
 		}
 

lib/Command/Daemon/RegisterDaemon.php

@@ -32,6 +32,7 @@ protected function configure(): void {
 		$this->setName('app_api:daemon:register');
 		$this->setDescription('Register daemon config for ExApp deployment');
 
+		// todo: add docs
 		$this->addArgument('name', InputArgument::REQUIRED);
 		$this->addArgument('display-name', InputArgument::REQUIRED);
 		$this->addArgument('accepts-deploy-id', InputArgument::REQUIRED);
@@ -42,13 +43,16 @@ protected function configure(): void {
 		// daemon-config settings
 		$this->addOption('net', null, InputOption::VALUE_REQUIRED, 'DeployConfig, the name of the docker network to attach App to');
 		$this->addOption('haproxy_password', null, InputOption::VALUE_REQUIRED, 'AppAPI Docker Socket Proxy password for HAProxy Basic auth');
-
 		$this->addOption('compute_device', null, InputOption::VALUE_REQUIRED, 'Compute device for GPU support (cpu|cuda|rocm)');
-
 		$this->addOption('set-default', null, InputOption::VALUE_NONE, 'Set DaemonConfig as default');
-
-		$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->addOption('harp', null, InputOption::VALUE_NONE, 'Set daemon to use HaRP for all docker and exapp communication');
+		$this->addOption('harp_shared_key', null, InputOption::VALUE_REQUIRED, 'HaRP shared key for secure communication between HaRP and AppAPI');
+
+		$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_install "Harp Install" "docker-install" "http" "nextcloud-appapi-harp:8780" "http://nextcloud.local" --harp --harp_shared_key "some_very_secure_password" --set-default --compute_device=cuda');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
@@ -58,28 +62,43 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$protocol = $input->getArgument('protocol');
 		$host = $input->getArgument('host');
 		$nextcloudUrl = $input->getArgument('nextcloud_url');
-
-		$deployConfig = [
-			'net' => $input->getOption('net') ?? 'host',
-			'nextcloud_url' => $nextcloudUrl,
-			'haproxy_password' => $input->getOption('haproxy_password') ?? '',
-			'computeDevice' => $this->buildComputeDevice($input->getOption('compute_device') ?? 'cpu'),
-		];
+		$isHarp = $input->getOption('harp') !== null;
 
 		if (($protocol !== 'http') && ($protocol !== 'https')) {
 			$output->writeln('Value error: The protocol must be `http` or `https`.');
 			return 1;
 		}
-		if (($acceptsDeployId === 'manual-install') && ($protocol !== 'http')) {
+		if ($acceptsDeployId === 'manual-install' && $protocol !== 'http') {
 			$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;
+		}
 
 		if ($this->daemonConfigService->getDaemonConfigByName($name) !== null) {
 			$output->writeln(sprintf('Skip registration, as daemon config `%s` already registered.', $name));
 			return 0;
 		}
 
+		$secret = $isHarp
+			? $input->getOption('harp_shared_key')
+			: $input->getOption('haproxy_password') ?? '';
+
+		$deployConfig = [
+			'net' => $input->getOption('net') ?? 'host',
+			'nextcloud_url' => $nextcloudUrl,
+			'haproxy_password' => $secret,
+			'computeDevice' => $this->buildComputeDevice($input->getOption('compute_device') ?? 'cpu'),
+			'harp' => $isHarp,
+		];
+
 		$daemonConfig = $this->daemonConfigService->registerDaemonConfig([
 			'name' => $name,
 			'display_name' => $displayName,