feat: add relay binary verification #36

pkg/manager/apt.go

@@ -46,7 +46,7 @@ func AptInstallPackages(selectedRelayOption string) {
 
 	exec.Command("apt", "update", "-qq").Run()
 
-	packages := []string{"ufw", "fail2ban", "nginx", "certbot", "python3-certbot-nginx"}
+	packages := []string{"curl", "gnupg", "ufw", "fail2ban", "nginx", "certbot", "python3-certbot-nginx"}
 
 	if selectedRelayOption == nostr_rs_relay.RelayName || selectedRelayOption == strfry.RelayName || selectedRelayOption == wot_relay.RelayName || selectedRelayOption == strfry29.RelayName {
 		packages = append(packages, "git")

pkg/network/certbot.go

@@ -2,13 +2,12 @@ package network
 
 import (
 	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
 	"github.com/nodetec/rwz/pkg/utils/directories"
 	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/pterm/pterm"
+	"os"
+	"os/exec"
+	"strings"
 )
 
 func setDomainCertDirPerms(domainName string) {

pkg/relays/khatru29/install.go

@@ -5,13 +5,14 @@ import (
 	"github.com/nodetec/rwz/pkg/relays"
 	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/nodetec/rwz/pkg/utils/systemd"
+	"github.com/nodetec/rwz/pkg/verification"
 	"github.com/pterm/pterm"
 	"path/filepath"
 )
 
 // Function to download and make the binary executable
 func InstallRelayBinary() {
-	spinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay...", RelayName))
+	downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s relay binary...", RelayName))
 
 	// Determine the file name from the URL
 	tmpFileName := filepath.Base(DownloadURL)
@@ -25,14 +26,21 @@ func InstallRelayBinary() {
 	// Download and copy the file
 	files.DownloadAndCopyFile(tmpFilePath, DownloadURL)
 
+	downloadSpinner.Success(fmt.Sprintf("%s relay binary downloaded", RelayName))
+
+	// Verify relay binary
+	verification.VerifyRelayBinary(tmpFilePath)
+
+	installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay binary...", RelayName))
+
 	// Check if the service file exists and disable and stop the service if it does
 	if files.FileExists(ServiceFilePath) {
 		// Disable and stop the Nostr relay service
-		spinner.UpdateText("Disabling and stopping service...")
+		installSpinner.UpdateText("Disabling and stopping service...")
 		systemd.DisableService(ServiceName)
 		systemd.StopService(ServiceName)
 	} else {
-		spinner.UpdateText("Service file not found...")
+		installSpinner.UpdateText("Service file not found...")
 	}
 
 	// Extract binary
@@ -48,5 +56,5 @@ func InstallRelayBinary() {
 	// Make the file executable
 	files.SetPermissions(destPath, 0755)
 
-	spinner.Success(fmt.Sprintf("%s relay binary downloaded and installed", RelayName))
+	installSpinner.Success(fmt.Sprintf("%s relay binary installed", RelayName))
 }

pkg/relays/khatru_pyramid/install.go

@@ -6,13 +6,14 @@ import (
 	"github.com/nodetec/rwz/pkg/utils/directories"
 	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/nodetec/rwz/pkg/utils/systemd"
+	"github.com/nodetec/rwz/pkg/verification"
 	"github.com/pterm/pterm"
 	"path/filepath"
 )
 
 // Function to download and make the binary executable
 func InstallRelayBinary(pubKey string) {
-	spinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay...", RelayName))
+	downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s relay binary...", RelayName))
 
 	// Determine the file name from the URL
 	tmpFileName := filepath.Base(DownloadURL)
@@ -26,28 +27,35 @@ func InstallRelayBinary(pubKey string) {
 	// Download and copy the file
 	files.DownloadAndCopyFile(tmpFilePath, DownloadURL)
 
+	downloadSpinner.Success(fmt.Sprintf("%s relay binary downloaded", RelayName))
+
+	// Verify relay binary
+	verification.VerifyRelayBinary(tmpFilePath)
+
+	installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay binary...", RelayName))
+
 	// Check if the service file exists and disable and stop the service if it does
 	if files.FileExists(ServiceFilePath) {
 		// Disable and stop the Nostr relay service
-		spinner.UpdateText("Disabling and stopping service...")
+		installSpinner.UpdateText("Disabling and stopping service...")
 		systemd.DisableService(ServiceName)
 		systemd.StopService(ServiceName)
 	} else {
-		spinner.UpdateText("Service file not found...")
+		installSpinner.UpdateText("Service file not found...")
 	}
 
 	// Check if users.json file exists
 	if files.FileExists(UsersFilePath) {
 		// Check if the pubKey exists in the users.json file
-		spinner.UpdateText("Checking for public key in users.json file...")
+		installSpinner.UpdateText("Checking for public key in users.json file...")
 		lineExists := files.LineExists(fmt.Sprintf(`"%s":""`, pubKey), UsersFilePath)
 
 		// If false remove data directory
 		if !lineExists {
-			spinner.UpdateText("Public key not found, removing data directory...")
+			installSpinner.UpdateText("Public key not found, removing data directory...")
 			directories.RemoveDirectory(DataDirPath)
 		} else {
-			spinner.UpdateText("Public key found, keeping data directory.")
+			installSpinner.UpdateText("Public key found, keeping data directory.")
 		}
 	}
 
@@ -64,5 +72,5 @@ func InstallRelayBinary(pubKey string) {
 	// Make the file executable
 	files.SetPermissions(destPath, 0755)
 
-	spinner.Success(fmt.Sprintf("%s relay binary downloaded and installed", RelayName))
+	installSpinner.Success(fmt.Sprintf("%s relay binary installed", RelayName))
 }

pkg/relays/nostr_rs_relay/install.go

@@ -7,13 +7,14 @@ import (
 	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/nodetec/rwz/pkg/utils/git"
 	"github.com/nodetec/rwz/pkg/utils/systemd"
+	"github.com/nodetec/rwz/pkg/verification"
 	"github.com/pterm/pterm"
 	"path/filepath"
 )
 
 // Function to download and make the binary executable
 func InstallRelayBinary() {
-	spinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay...", RelayName))
+	downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s relay binary...", RelayName))
 
 	// Check for and remove existing git repository
 	directories.RemoveDirectory(GitRepoTmpDirPath)
@@ -35,14 +36,21 @@ func InstallRelayBinary() {
 	// Download and copy the file
 	files.DownloadAndCopyFile(tmpFilePath, DownloadURL)
 
+	downloadSpinner.Success(fmt.Sprintf("%s relay binary downloaded", RelayName))
+
+	// Verify relay binary
+	verification.VerifyRelayBinary(tmpFilePath)
+
+	installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay binary...", RelayName))
+
 	// Check if the service file exists and disable and stop the service if it does
 	if files.FileExists(ServiceFilePath) {
 		// Disable and stop the Nostr relay service
-		spinner.UpdateText("Disabling and stopping service...")
+		installSpinner.UpdateText("Disabling and stopping service...")
 		systemd.DisableService(ServiceName)
 		systemd.StopService(ServiceName)
 	} else {
-		spinner.UpdateText("Service file not found...")
+		installSpinner.UpdateText("Service file not found...")
 	}
 
 	// Extract binary
@@ -58,5 +66,5 @@ func InstallRelayBinary() {
 	// Make the file executable
 	files.SetPermissions(destPath, 0755)
 
-	spinner.Success(fmt.Sprintf("%s relay binary downloaded and installed", RelayName))
+	installSpinner.Success(fmt.Sprintf("%s relay binary installed", RelayName))
 }

pkg/relays/strfry/install.go

@@ -7,13 +7,14 @@ import (
 	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/nodetec/rwz/pkg/utils/git"
 	"github.com/nodetec/rwz/pkg/utils/systemd"
+	"github.com/nodetec/rwz/pkg/verification"
 	"github.com/pterm/pterm"
 	"path/filepath"
 )
 
 // Function to download and make the binary executable
 func InstallRelayBinary() {
-	spinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay...", RelayName))
+	downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s relay binary...", RelayName))
 
 	// Check for and remove existing git repository
 	directories.RemoveDirectory(GitRepoTmpDirPath)
@@ -36,14 +37,21 @@ func InstallRelayBinary() {
 	// Download and copy the file
 	files.DownloadAndCopyFile(tmpFilePath, DownloadURL)
 
+	downloadSpinner.Success(fmt.Sprintf("%s relay binary downloaded", RelayName))
+
+	// Verify relay binary
+	verification.VerifyRelayBinary(tmpFilePath)
+
+	installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay binary...", RelayName))
+
 	// Check if the service file exists and disable and stop the service if it does
 	if files.FileExists(ServiceFilePath) {
 		// Disable and stop the Nostr relay service
-		spinner.UpdateText("Disabling and stopping service...")
+		installSpinner.UpdateText("Disabling and stopping service...")
 		systemd.DisableService(ServiceName)
 		systemd.StopService(ServiceName)
 	} else {
-		spinner.UpdateText("Service file not found...")
+		installSpinner.UpdateText("Service file not found...")
 	}
 
 	// Extract binary
@@ -59,5 +67,5 @@ func InstallRelayBinary() {
 	// Make the file executable
 	files.SetPermissions(destPath, 0755)
 
-	spinner.Success(fmt.Sprintf("%s relay binary downloaded and installed", RelayName))
+	installSpinner.Success(fmt.Sprintf("%s relay binary installed", RelayName))
 }

pkg/relays/strfry29/install.go

@@ -7,13 +7,14 @@ import (
 	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/nodetec/rwz/pkg/utils/git"
 	"github.com/nodetec/rwz/pkg/utils/systemd"
+	"github.com/nodetec/rwz/pkg/verification"
 	"github.com/pterm/pterm"
 	"path/filepath"
 )
 
 // Function to download and make the binary executable
 func InstallRelayBinary() {
-	spinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay...", RelayName))
+	downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s relay binary...", RelayName))
 
 	// Check for and remove existing git repository
 	directories.RemoveDirectory(GitRepoTmpDirPath)
@@ -51,14 +52,21 @@ func InstallRelayBinary() {
 	// Download and copy the file
 	files.DownloadAndCopyFile(tmpFilePath, BinaryPluginDownloadURL)
 
+	downloadSpinner.Success(fmt.Sprintf("%s relay binary downloaded", RelayName))
+
+	// Verify relay binary
+	verification.VerifyRelayBinary(tmpFilePath)
+
+	installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay binary...", RelayName))
+
 	// Check if the service file exists and disable and stop the service if it does
 	if files.FileExists(ServiceFilePath) {
 		// Disable and stop the Nostr relay service
-		spinner.UpdateText("Disabling and stopping service...")
+		installSpinner.UpdateText("Disabling and stopping service...")
 		systemd.DisableService(ServiceName)
 		systemd.StopService(ServiceName)
 	} else {
-		spinner.UpdateText("Service file not found...")
+		installSpinner.UpdateText("Service file not found...")
 	}
 
 	// Extract binary
@@ -80,5 +88,5 @@ func InstallRelayBinary() {
 	// Make the file executable
 	files.SetPermissions(destPath, 0755)
 
-	spinner.Success(fmt.Sprintf("%s relay binary downloaded and installed", RelayName))
+	installSpinner.Success(fmt.Sprintf("%s relay binary installed", RelayName))
 }

pkg/relays/wot_relay/install.go

@@ -7,13 +7,14 @@ import (
 	"github.com/nodetec/rwz/pkg/utils/files"
 	"github.com/nodetec/rwz/pkg/utils/git"
 	"github.com/nodetec/rwz/pkg/utils/systemd"
+	"github.com/nodetec/rwz/pkg/verification"
 	"github.com/pterm/pterm"
 	"path/filepath"
 )
 
 // Function to download and make the binary executable
 func InstallRelayBinary(pubKey string) {
-	spinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s...", RelayName))
+	downloadSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Downloading %s relay binary...", RelayName))
 
 	// Check for and remove existing git repository
 	directories.RemoveDirectory(GitRepoTmpDirPath)
@@ -35,28 +36,35 @@ func InstallRelayBinary(pubKey string) {
 	// Download and copy the file
 	files.DownloadAndCopyFile(tmpFilePath, DownloadURL)
 
+	downloadSpinner.Success(fmt.Sprintf("%s relay binary downloaded", RelayName))
+
+	// Verify relay binary
+	verification.VerifyRelayBinary(tmpFilePath)
+
+	installSpinner, _ := pterm.DefaultSpinner.Start(fmt.Sprintf("Installing %s relay binary...", RelayName))
+
 	// Check if the service file exists and disable and stop the service if it does
 	if files.FileExists(ServiceFilePath) {
 		// Disable and stop the Nostr relay service
-		spinner.UpdateText("Disabling and stopping service...")
+		installSpinner.UpdateText("Disabling and stopping service...")
 		systemd.DisableService(ServiceName)
 		systemd.StopService(ServiceName)
 	} else {
-		spinner.UpdateText("Service file not found...")
+		installSpinner.UpdateText("Service file not found...")
 	}
 
 	// Check if environment file exists
 	if files.FileExists(EnvFilePath) {
 		// Check if the pubKey exists in the environment file
-		spinner.UpdateText(fmt.Sprintf("Checking for public key in the %s file...", EnvFilePath))
+		installSpinner.UpdateText(fmt.Sprintf("Checking for public key in the %s file...", EnvFilePath))
 		lineExists := files.LineExists(fmt.Sprintf(`RELAY_PUBKEY="%s"`, pubKey), EnvFilePath)
 
 		// If false remove data directory
 		if !lineExists {
-			spinner.UpdateText("Public key not found, removing data directory...")
+			installSpinner.UpdateText("Public key not found, removing data directory...")
 			directories.RemoveDirectory(DataDirPath)
 		} else {
-			spinner.UpdateText("Public key found, keeping data directory.")
+			installSpinner.UpdateText("Public key found, keeping data directory.")
 		}
 	}
 
@@ -73,5 +81,5 @@ func InstallRelayBinary(pubKey string) {
 	// Make the file executable
 	files.SetPermissions(destPath, 0755)
 
-	spinner.Success(fmt.Sprintf("%s relay binary downloaded and installed", RelayName))
+	installSpinner.Success(fmt.Sprintf("%s relay binary installed", RelayName))
 }

pkg/utils/commands/utils.go

@@ -0,0 +1,30 @@
+package commands
+
+import (
+	"fmt"
+	"github.com/pterm/pterm"
+	"os"
+	"os/exec"
+)
+
+func PipeTwoCommands(commandOne, commandTwo *exec.Cmd, errMsg string) {
+	r, w, err := os.Pipe()
+	if err != nil {
+		pterm.Println()
+		pterm.Error.Println(fmt.Sprintf("Failed to create pipe: %v", err))
+		os.Exit(1)
+	}
+	defer r.Close()
+	commandOne.Stdout = w
+	err = commandOne.Start()
+	if err != nil {
+		pterm.Println()
+		pterm.Error.Println(fmt.Sprintf("%s %v", errMsg, err))
+		os.Exit(1)
+	}
+	defer commandOne.Wait()
+	w.Close()
+	commandTwo.Stdin = r
+	commandTwo.Stdout = os.Stdout
+	commandTwo.Run()
+}

pkg/verification/constants.go

@@ -0,0 +1,8 @@
+package verification
+
+const NodeTecKeybasePGPKeyURL = "https://keybase.io/nodetec/pgp_keys.asc"
+const RelaysManifestFileURL = "https://github.com/nodetec/relays/releases/download/v0.4.0/relays-0.4.0-manifest.sha512sum"
+const RelaysManifestSigFileURL = "https://github.com/nodetec/relays/releases/download/v0.4.0/relays-0.4.0-manifest.sha512sum.asc"
+const NodeTecGoodSigMsg = `Good signature from "NODE-TEC Devs <[email protected]>"`
+const NodeTecPrimaryKeyFingerprint = "04BD8C20598FA5FDDE19BECD8F2469F71314FAD7"
+const NodeTecSigningSubkeyFingerprint = "252F57B9DCD920EBF14E6151A8841CC4D10CC288"