Fix unsafe use of pre-runners

Author: maxlandon

client/commands/commands.go

@@ -25,13 +25,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/reeflective/team/client"
+	"github.com/reeflective/team/internal/command"
 	"github.com/rsteube/carapace"
 	"github.com/rsteube/carapace/pkg/style"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
-	"github.com/reeflective/team/client"
-	"github.com/reeflective/team/internal/command"
 )
 
 // Generate returns a command tree to embed in client applications connecting

client/commands/import.go

@@ -22,11 +22,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
 	"github.com/reeflective/team/client"
 	"github.com/reeflective/team/internal/command"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
 func importCmd(cli *client.Client) func(cmd *cobra.Command, args []string) {

client/commands/users.go

@@ -23,11 +23,10 @@ import (
 	"time"
 
 	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
 	"github.com/reeflective/team/client"
 	"github.com/reeflective/team/internal/command"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
 func usersCmd(cli *client.Client) func(cmd *cobra.Command, args []string) error {

client/commands/version.go

@@ -22,11 +22,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
 	"github.com/reeflective/team/client"
 	"github.com/reeflective/team/internal/command"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
 func versionCmd(cli *client.Client) func(cmd *cobra.Command, args []string) error {

server/commands/commands.go

@@ -21,14 +21,13 @@ package commands
 import (
 	"fmt"
 
-	"github.com/rsteube/carapace"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
 	"github.com/reeflective/team/client"
 	cli "github.com/reeflective/team/client/commands"
 	"github.com/reeflective/team/internal/command"
 	"github.com/reeflective/team/server"
+	"github.com/rsteube/carapace"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 // Generate returns a "teamserver" command root and its tree for teamserver (server-side) management.
@@ -118,7 +117,12 @@ func serverCommands(server *server.Server, client *client.Client) *cobra.Command
 	closeComps.PositionalAnyCompletion(carapace.ActionCallback(listenerIDCompleter(client, server)))
 
 	closeComps.PreRun(func(cmd *cobra.Command, args []string) {
-		cmd.PersistentPreRunE(cmd, args)
+		if cmd.PersistentPreRunE != nil {
+			cmd.PersistentPreRunE(cmd, args)
+		}
+		if cmd.PreRunE != nil {
+			cmd.PreRunE(cmd, args)
+		}
 	})
 
 	teamCmd.AddCommand(closeCmd)
@@ -213,7 +217,12 @@ func serverCommands(server *server.Server, client *client.Client) *cobra.Command
 	rmUserComps.PositionalCompletion(carapace.ActionCallback(userCompleter(client, server)))
 
 	rmUserComps.PreRun(func(cmd *cobra.Command, args []string) {
-		cmd.PersistentPreRunE(cmd, args)
+		if cmd.PersistentPreRunE != nil {
+			cmd.PersistentPreRunE(cmd, args)
+		}
+		if cmd.PreRunE != nil {
+			cmd.PreRunE(cmd, args)
+		}
 	})
 
 	// Import a list of users and their credentials.

server/commands/completers.go

@@ -23,10 +23,9 @@ import (
 	"net"
 	"strings"
 
-	"github.com/rsteube/carapace"
-
 	"github.com/reeflective/team/client"
 	"github.com/reeflective/team/server"
+	"github.com/rsteube/carapace"
 )
 
 // interfacesCompleter completes interface addresses on the client host.

server/commands/teamserver.go

@@ -28,13 +28,12 @@ import (
 	"strings"
 
 	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
 	"github.com/reeflective/team/internal/command"
 	"github.com/reeflective/team/internal/log"
 	"github.com/reeflective/team/internal/systemd"
 	"github.com/reeflective/team/server"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
 func daemoncmd(serv *server.Server) func(cmd *cobra.Command, args []string) error {
@@ -72,7 +71,7 @@ func daemoncmd(serv *server.Server) func(cmd *cobra.Command, args []string) erro
 			lport = uint16(serv.GetConfig().DaemonMode.Port)
 		}
 
-		fmt.Fprintf(cmd.OutOrStdout(), "Starting %s teamserver daemon on %s:%d ...", serv.Name(), lhost, lport)
+		fmt.Fprintf(cmd.OutOrStdout(), "Starting %s teamserver daemon on %s:%d ...\n", serv.Name(), lhost, lport)
 
 		// Blocking call, your program will only exit/resume on Ctrl-C/SIGTERM
 		return serv.ServeDaemon(lhost, lport)

server/commands/user.go

@@ -8,13 +8,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
 	"github.com/reeflective/team/client"
 	"github.com/reeflective/team/internal/assets"
 	"github.com/reeflective/team/internal/command"
 	"github.com/reeflective/team/server"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
 func createUserCmd(serv *server.Server, cli *client.Client) func(cmd *cobra.Command, args []string) {

server/server.go

@@ -142,7 +142,7 @@ func (ts *Server) ServeDaemon(host string, port uint16, opts ...Options) (err er
 
 	err = ts.ListenerStartPersistents()
 	if err != nil && hostPort.MatchString(err.Error()) {
-		log.Errorf("Error starting persistent listeners: %s", err)
+		log.Errorf("Error starting persistent listeners: %s\n", err)
 	}
 
 	done := make(chan bool)