X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=rpc%2Fdial.go;h=fa1efcdeb6c5597edcbfd0c9d4a20a0f17b4680c;hb=HEAD;hp=909ec7e1aaf7e70193af9e05d29cbbdd07769f79;hpb=7fd48d68ef5a77fa9df8ad0251722ed35800e0f8;p=safcm%2Fsafcm.git

diff --git a/rpc/dial.go b/rpc/dial.go
index 909ec7e..fa1efcd 100644
--- a/rpc/dial.go
+++ b/rpc/dial.go
@@ -1,19 +1,7 @@
 // Simple RPC-like protocol: establish new connection and upload helper
 
-// Copyright (C) 2021  Simon Ruderich
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (C) 2021-2024  Simon Ruderich
 
 package rpc
 
@@ -24,22 +12,35 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"io/fs"
 	"os/exec"
 	"strconv"
 	"strings"
 
 	"ruderich.org/simon/safcm"
-	"ruderich.org/simon/safcm/remote"
 )
 
-func (c *Conn) DialSSH(user, host, sshConfig string) error {
+type SSHConfig struct {
+	Host      string
+	User      string // optional
+	SshConfig string // optional
+
+	RemoteHelpers fs.FS
+}
+
+func (c *Conn) DialSSH(cfg SSHConfig) error {
 	if c.events == nil {
 		return fmt.Errorf("cannot reuse Conn")
 	}
 
-	remote := host
-	if user != "" {
-		remote = user + "@" + host
+	if cfg.RemoteHelpers == nil {
+		return fmt.Errorf("SSHConfig.RemoteHelpers not set")
+	}
+	c.remoteHelpers = cfg.RemoteHelpers
+
+	remote := cfg.Host
+	if cfg.User != "" {
+		remote = cfg.User + "@" + cfg.Host
 	}
 	c.debugf("DialSSH: connecting to %q", remote)
 
@@ -50,8 +51,8 @@ func (c *Conn) DialSSH(user, host, sshConfig string) error {
 	}
 
 	c.sshRemote = remote
-	if sshConfig != "" {
-		c.sshOpts = []string{"-F", sshConfig}
+	if cfg.SshConfig != "" {
+		c.sshOpts = []string{"-F", cfg.SshConfig}
 	}
 	c.cmd = exec.Command("ssh",
 		append(append([]string{}, c.sshOpts...),
@@ -77,7 +78,7 @@ func (c *Conn) DialSSH(user, host, sshConfig string) error {
 
 	err = c.dialSSH(stdin, stdout)
 	if err != nil {
-		c.Kill()
+		c.Kill() //nolint:errcheck
 		return err
 	}
 	c.conn = safcm.NewGobConn(stdout, stdin)
@@ -177,7 +178,6 @@ f() {
 		tmp="$(mktemp "$x.XXXXXX")"
 		# Report filename for upload
 		echo "$tmp"
-
 		# Wait for upload to complete
 		read unused
 
@@ -203,9 +203,9 @@ f
 		return err
 	}
 
-	// Get embedded helper binary
-	helper, err := remote.Helpers.ReadFile(
-		fmt.Sprintf("helpers/%s-%s", goos, goarch))
+	// Get remote helper binary
+	helper, err := fs.ReadFile(c.remoteHelpers,
+		fmt.Sprintf("%s-%s", goos, goarch))
 	if err != nil {
 		return fmt.Errorf("remote not built for GOOS/GOARCH %s/%s",
 			goos, goarch)