Replace '%s' with %q

NHAS · NHAS · commit fc4ae63435f9 · 2025-11-22T11:18:50.000+13:00
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -132,7 +132,7 @@ func main() {
 	if timeoutString, err := options.GetArgString("timeout"); err == nil {
 		timeout, err = strconv.Atoi(timeoutString)
 		if err != nil {
-			fmt.Printf("Unable to convert '%s' to int\n", timeoutString)
+			fmt.Printf("Unable to convert %q to int\n", timeoutString)
 			printHelp()
 			return
 		}
diff --git a/internal/client/client.go b/internal/client/client.go
@@ -401,10 +401,10 @@ func Run(settings *Settings) {
 			if err != nil {
 
 				if errMsg := err.Error(); strings.Contains(errMsg, "missing port in address") {
-					log.Fatalf("Unable to connect to TCP invalid address: '%s', %s", settings.Addr, errMsg)
+					log.Fatalf("Unable to connect to TCP invalid address: %q, %s", settings.Addr, errMsg)
 				}
 
-				log.Printf("Unable to connect directly TCP: %s\n", err)
+				log.Printf("Unable to connect directly TCP: %v\n", err)
 
 				if len(potentialProxies) > 0 {
 					if len(potentialProxies) <= triedProxyIndex {
diff --git a/internal/client/handlers/session.go b/internal/client/handlers/session.go
@@ -57,7 +57,7 @@ func Session(session *connection.Session) func(newChannel ssh.NewChannel, log lo
 				err := subsystems.RunSubsystems(connection, req)
 				if err != nil {
 					log.Error("subsystem encountered an error: %s", err.Error())
-					fmt.Fprintf(connection, "subsystem error: '%s'", err.Error())
+					fmt.Fprintf(connection, "subsystem error: %q", err.Error())
 				}
 
 				return
diff --git a/internal/client/handlers/subsystems/init.go b/internal/client/handlers/subsystems/init.go
@@ -30,5 +30,5 @@ func RunSubsystems(connection ssh.Channel, req *ssh.Request) error {
 	}
 
 	req.Reply(false, []byte("Unknown subsystem"))
-	return fmt.Errorf("Unknown subsystem '%s'", req.Payload)
+	return fmt.Errorf("Unknown subsystem %q", req.Payload)
 }
diff --git a/internal/global.go b/internal/global.go
@@ -126,7 +126,7 @@ func DiscardChannels(sshConn ssh.Conn, chans <-chan ssh.NewChannel) {
 		t := newChannel.ChannelType()
 
 		newChannel.Reject(ssh.UnknownChannelType, fmt.Sprintf("unsupported channel type: %s", t))
-		log.Printf("Client %s (%s) sent invalid channel type '%s'\n", sshConn.RemoteAddr(), sshConn.ClientVersion(), t)
+		log.Printf("Client %s (%s) sent invalid channel type %q\n", sshConn.RemoteAddr(), sshConn.ClientVersion(), t)
 	}
 
 }
diff --git a/internal/server/commands/access.go b/internal/server/commands/access.go
@@ -59,7 +59,7 @@ func (s *access) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedLi
 	}
 
 	if len(connections) == 0 {
-		return fmt.Errorf("No clients matched '%s'", pattern)
+		return fmt.Errorf("No clients matched %q", pattern)
 	}
 
 	if !line.IsSet("y") {
diff --git a/internal/server/commands/connect.go b/internal/server/commands/connect.go
@@ -57,11 +57,11 @@ func (c *connect) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedL
 	}
 
 	if len(foundClients) == 0 {
-		return fmt.Errorf("No clients matched '%s'", client)
+		return fmt.Errorf("No clients matched %q", client)
 	}
 
 	if len(foundClients) > 1 {
-		return fmt.Errorf("'%s' matches multiple clients please choose a more specific identifier", client)
+		return fmt.Errorf("%q matches multiple clients please choose a more specific identifier", client)
 	}
 
 	var target ssh.Conn
diff --git a/internal/server/commands/kill.go b/internal/server/commands/kill.go
@@ -31,7 +31,7 @@ func (k *kill) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedLine
 	}
 
 	if len(connections) == 0 {
-		return fmt.Errorf("No clients matched '%s'", line.Arguments[0].Value())
+		return fmt.Errorf("No clients matched %q", line.Arguments[0].Value())
 	}
 
 	if !line.IsSet("y") {
diff --git a/internal/server/commands/listen.go b/internal/server/commands/listen.go
@@ -86,7 +86,7 @@ func (l *listen) client(user *users.User, tty io.ReadWriter, line terminal.Parse
 	}
 
 	if len(foundClients) == 0 && !auto {
-		return fmt.Errorf("No clients matched '%s'", specifier)
+		return fmt.Errorf("No clients matched %q", specifier)
 	}
 
 	if line.IsSet("l") {
diff --git a/internal/server/data/webhooks.go b/internal/server/data/webhooks.go
@@ -27,11 +27,11 @@ func CreateWebhook(newUrl string, checktls bool) (string, error) {
 
 	addresses, err := net.LookupIP(u.Hostname())
 	if err != nil {
-		return "", fmt.Errorf("unable to lookup hostname '%s': %s", u.Hostname(), err)
+		return "", fmt.Errorf("unable to lookup hostname %q: %s", u.Hostname(), err)
 	}
 
 	if len(addresses) == 0 {
-		return "", fmt.Errorf("no addresses found for '%s': %s", u.Hostname(), err)
+		return "", fmt.Errorf("no addresses found for %q: %s", u.Hostname(), err)
 	}
 
 	// Create a new Webhook instance
diff --git a/internal/server/handlers/download.go b/internal/server/handlers/download.go
@@ -17,7 +17,7 @@ func Download(dataDir string) func(_ string, _ *users.User, newChannel ssh.NewCh
 		downloadPath = path.Join(dataDir, "downloads", downloadPath)
 
 		if stats, err := os.Stat(downloadPath); err != nil && (os.IsNotExist(err) || !stats.IsDir()) {
-			log.Warning("remote client requested non-existant path: '%s'", downloadPath)
+			log.Warning("remote client requested non-existant path: %q", downloadPath)
 			newChannel.Reject(ssh.Prohibited, "file not found")
 			return
 		}
@@ -26,7 +26,7 @@ func Download(dataDir string) func(_ string, _ *users.User, newChannel ssh.NewCh
 
 		f, err := os.Open(downloadPath)
 		if err != nil {
-			log.Warning("unable to open requested path: '%s': %s", downloadPath, err)
+			log.Warning("unable to open requested path: %q: %s", downloadPath, err)
 
 			newChannel.Reject(ssh.Prohibited, "cannot open file")
 			return
diff --git a/internal/server/handlers/localforward.go b/internal/server/handlers/localforward.go
@@ -42,12 +42,12 @@ func LocalForward(_ string, user *users.User, newChannel ssh.NewChannel, log log
 	}
 
 	if len(foundClients) == 0 {
-		newChannel.Reject(ssh.ConnectionFailed, fmt.Sprintf("\n\nNo clients matched '%s'\n", drtMsg.Raddr))
+		newChannel.Reject(ssh.ConnectionFailed, fmt.Sprintf("\n\nNo clients matched %q\n", drtMsg.Raddr))
 		return
 	}
 
 	if len(foundClients) > 1 {
-		newChannel.Reject(ssh.ConnectionFailed, fmt.Sprintf("\n\n'%s' matches multiple clients please choose a more specific identifier\n", drtMsg.Raddr))
+		newChannel.Reject(ssh.ConnectionFailed, fmt.Sprintf("\n\n%q matches multiple clients please choose a more specific identifier\n", drtMsg.Raddr))
 		return
 	}
 
diff --git a/internal/server/users/users.go b/internal/server/users/users.go
@@ -215,7 +215,7 @@ func (u *User) GetClient(identifier string) (*ssh.ServerConn, error) {
 	if len(matchingHosts) > 0 {
 		matchingHosts = matchingHosts[:len(matchingHosts)-1]
 	}
-	return nil, fmt.Errorf("%d connections match alias '%s'\n%s", matches, identifier, matchingHosts)
+	return nil, fmt.Errorf("%d connections match alias %q\n%s", matches, identifier, matchingHosts)
 
 }
 
diff --git a/internal/server/webhooks/server.go b/internal/server/webhooks/server.go
@@ -62,7 +62,7 @@ func StartWebhooks() {
 					buff := bytes.NewBuffer(webhookMessage)
 					_, err := client.Post(webhook.URL, "application/json", buff)
 					if err != nil {
-						log.Printf("Error sending webhook '%s': %s\n", webhook.URL, err)
+						log.Printf("Error sending webhook %q: %s\n", webhook.URL, err)
 					}
 				}
 			}(msg)
diff --git a/internal/terminal/utils.go b/internal/terminal/utils.go
@@ -262,7 +262,7 @@ func ParseLineValidFlags(line string, cursorPosition int, validFlags map[string]
 	for flag := range pl.Flags {
 		_, ok := validFlags[flag]
 		if !ok {
-			return ParsedLine{}, fmt.Errorf("flag provided but not defined: '%s'", flag)
+			return ParsedLine{}, fmt.Errorf("flag provided but not defined: %q", flag)
 		}
 	}
 
diff --git a/pkg/trie/trie_test.go b/pkg/trie/trie_test.go
@@ -66,7 +66,7 @@ func TestSimpleRemove(t *testing.T) {
 		}
 
 		if !found && n != "apple" {
-			t.Logf("Removed wrong item...? '%s'\n", n)
+			t.Logf("Removed wrong item...? %q\n", n)
 			t.FailNow()
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func main() {`
`132`	`132`	`if timeoutString, err := options.GetArgString("timeout"); err == nil {`
`133`	`133`	`timeout, err = strconv.Atoi(timeoutString)`
`134`	`134`	`if err != nil {`
`135`		`- fmt.Printf("Unable to convert '%s' to int\n", timeoutString)`
	`135`	`+ fmt.Printf("Unable to convert %q to int\n", timeoutString)`
`136`	`136`	`printHelp()`
`137`	`137`	`return`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func Session(session *connection.Session) func(newChannel ssh.NewChannel, log lo`
`57`	`57`	`err := subsystems.RunSubsystems(connection, req)`
`58`	`58`	`if err != nil {`
`59`	`59`	`log.Error("subsystem encountered an error: %s", err.Error())`
`60`		`- fmt.Fprintf(connection, "subsystem error: '%s'", err.Error())`
	`60`	`+ fmt.Fprintf(connection, "subsystem error: %q", err.Error())`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`return`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ func RunSubsystems(connection ssh.Channel, req *ssh.Request) error {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`req.Reply(false, []byte("Unknown subsystem"))`
`33`		`- return fmt.Errorf("Unknown subsystem '%s'", req.Payload)`
	`33`	`+ return fmt.Errorf("Unknown subsystem %q", req.Payload)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func DiscardChannels(sshConn ssh.Conn, chans <-chan ssh.NewChannel) {`
`126`	`126`	`t := newChannel.ChannelType()`
`127`	`127`
`128`	`128`	`newChannel.Reject(ssh.UnknownChannelType, fmt.Sprintf("unsupported channel type: %s", t))`
`129`		`- log.Printf("Client %s (%s) sent invalid channel type '%s'\n", sshConn.RemoteAddr(), sshConn.ClientVersion(), t)`
	`129`	`+ log.Printf("Client %s (%s) sent invalid channel type %q\n", sshConn.RemoteAddr(), sshConn.ClientVersion(), t)`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (s access) Run(user users.User, tty io.ReadWriter, line terminal.ParsedLi`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if len(connections) == 0 {`
`62`		`- return fmt.Errorf("No clients matched '%s'", pattern)`
	`62`	`+ return fmt.Errorf("No clients matched %q", pattern)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if !line.IsSet("y") {`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ func (c connect) Run(user users.User, tty io.ReadWriter, line terminal.ParsedL`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if len(foundClients) == 0 {`
`60`		`- return fmt.Errorf("No clients matched '%s'", client)`
	`60`	`+ return fmt.Errorf("No clients matched %q", client)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if len(foundClients) > 1 {`
`64`		`- return fmt.Errorf("'%s' matches multiple clients please choose a more specific identifier", client)`
	`64`	`+ return fmt.Errorf("%q matches multiple clients please choose a more specific identifier", client)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`var target ssh.Conn`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func (k kill) Run(user users.User, tty io.ReadWriter, line terminal.ParsedLine`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if len(connections) == 0 {`
`34`		`- return fmt.Errorf("No clients matched '%s'", line.Arguments[0].Value())`
	`34`	`+ return fmt.Errorf("No clients matched %q", line.Arguments[0].Value())`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if !line.IsSet("y") {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (l listen) client(user users.User, tty io.ReadWriter, line terminal.Parse`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if len(foundClients) == 0 && !auto {`
`89`		`- return fmt.Errorf("No clients matched '%s'", specifier)`
	`89`	`+ return fmt.Errorf("No clients matched %q", specifier)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`if line.IsSet("l") {`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ func CreateWebhook(newUrl string, checktls bool) (string, error) {`
`27`	`27`
`28`	`28`	`addresses, err := net.LookupIP(u.Hostname())`
`29`	`29`	`if err != nil {`
`30`		`- return "", fmt.Errorf("unable to lookup hostname '%s': %s", u.Hostname(), err)`
	`30`	`+ return "", fmt.Errorf("unable to lookup hostname %q: %s", u.Hostname(), err)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if len(addresses) == 0 {`
`34`		`- return "", fmt.Errorf("no addresses found for '%s': %s", u.Hostname(), err)`
	`34`	`+ return "", fmt.Errorf("no addresses found for %q: %s", u.Hostname(), err)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Create a new Webhook instance`