connect to internal dsp of harp if present

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', 'Is HaRP', 'HaRP FRP Address']);
+		$table->setHeaders(['Def', 'Name', 'Display name', 'Deploy ID', 'Protocol', 'Host', 'NC Url', 'Is HaRP', 'HaRP FRP Address', 'HaRP Docker Socket Port']);
 		$rows = [];
 
 		foreach ($daemonConfigs as $daemon) {
@@ -54,8 +54,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$daemon->getProtocol(),
 				$daemon->getHost(),
 				$daemon->getDeployConfig()['nextcloud_url'],
-				$daemon->getDeployConfig()['harp'] ? 'yes' : 'no',
+				boolval($daemon->getDeployConfig()['harp'] ?? false) ? 'yes' : 'no',
 				$daemon->getDeployConfig()['harp_frp_address'] ?? '(none)',
+				$daemon->getDeployConfig()['harp_docker_socket_port'] ?? '(none)',
 			];
 		}
 

lib/Command/Daemon/RegisterDaemon.php

@@ -48,6 +48,7 @@ protected function configure(): void {
 		$this->addOption('harp', null, InputOption::VALUE_NONE, 'Set daemon to use HaRP for all docker and exapp communication');
 		$this->addOption('harp_frp_address', null, InputOption::VALUE_REQUIRED, '[host]:[port] of the HaRP FRP server, default host is same as HaRP host and port is 8782');
 		$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('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');
@@ -103,6 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			'computeDevice' => $this->buildComputeDevice($input->getOption('compute_device') ?? 'cpu'),
 			'harp' => $isHarp,
 			'harp_frp_address' => $input->getOption('harp_frp_address') ?? '',
+			'harp_docker_socket_port' => $input->getOption('harp_docker_socket_port'),
 		];
 
 		$daemonConfig = $this->daemonConfigService->registerDaemonConfig([

lib/DeployActions/DockerActions.php

@@ -829,7 +829,14 @@ public function healthcheckContainer(string $containerId, DaemonConfig $daemonCo
 
 	public function buildDockerUrl(DaemonConfig $daemonConfig): string {
 		// When using local socket, we the curl URL needs to be set to http://localhost
-		return $this->isLocalSocket($daemonConfig->getHost()) ? 'http://localhost' : $daemonConfig->getProtocol() . '://' . $daemonConfig->getHost();
+		$url = $this->isLocalSocket($daemonConfig->getHost())
+			? 'http://localhost'
+			: $daemonConfig->getProtocol() . '://' . $daemonConfig->getHost();
+		if (boolval($daemonConfig->getDeployConfig()['harp'] ?? false)) {
+			// if there is a trailling slash, remove it
+			$url = rtrim($url, '/') . '/exapps/app_api';
+		}
+		return $url;
 	}
 
 	public function initGuzzleClient(DaemonConfig $daemonConfig): void {
@@ -849,6 +856,12 @@ public function initGuzzleClient(DaemonConfig $daemonConfig): void {
 			$haproxyPass = $this->crypto->decrypt($daemonConfig->getDeployConfig()['haproxy_password']);
 			$guzzleParams['auth'] = [self::APP_API_HAPROXY_USER, $haproxyPass];
 		}
+		if (boolval($daemonConfig->getDeployConfig()['harp'] ?? false)) {
+			$guzzleParams['headers'] = [
+				'harp-shared-key' => $guzzleParams['auth'][1],
+				'docker-engine-port' => $daemonConfig->getDeployConfig()['harp_docker_socket_port'],
+			];
+		}
 		$this->guzzleClient = new Client($guzzleParams);
 	}