Merge pull request #461 from innogames/loop_security

gosec: avoid security warning
innogames · Aug 25, 2023 · 565c4f8 · 565c4f8
2 parents f509038 + 1506a2f
commit 565c4f8
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/command/pool/pool_commands.go b/command/pool/pool_commands.go
@@ -92,7 +92,15 @@ func (c *poolCommands) lockResource(match matcher.Result, message msg.Message) {
 		c.slackClient.ReplyError(message, err)
 		return
 	}
-	c.slackClient.SendMessage(message, fmt.Sprintf("`%s` is locked for you until %s!\n%s%s", resource.Resource.Name, resource.LockUntil.Format(time.RFC1123), getFormattedReason(resource.Reason), getAddressesAndFeatures(&resource.Resource)))
+	c.slackClient.SendMessage(
+		message,
+		fmt.Sprintf("`%s` is locked for you until %s!\n%s%s",
+			resource.Resource.Name,
+			resource.LockUntil.Format(time.RFC1123),
+			getFormattedReason(resource.Reason),
+			getAddressesAndFeatures(resource.Resource),
+		),
+	)
 }
 
 func (c *poolCommands) unlockResource(match matcher.Result, message msg.Message) {
@@ -208,15 +216,25 @@ func (c *poolCommands) listPoolInfo(match matcher.Result, message msg.Message) {
 		messages = append(messages, "*Available:*")
 		free := c.pool.GetFree()
 		for _, f := range free {
-			messages = append(messages, fmt.Sprintf("`%s`:\n%s\n", f.Name, getAddressesAndFeatures(f)))
+			messages = append(messages, fmt.Sprintf("`%s`:\n%s\n", f.Name, getAddressesAndFeatures(*f)))
 		}
 	}
 	messages = append(messages, "")
 	if len(status) == 0 || status == "used" || status == "locked" {
 		locked := c.pool.GetLocks("")
 		messages = append(messages, "*Used/Locked:*")
 		for _, l := range locked {
-			messages = append(messages, fmt.Sprintf("`%s`:\n locked by %s until %s\n%s%s", l.Resource.Name, l.User, l.LockUntil.Format(time.RFC1123), getFormattedReason(l.Reason), getAddressesAndFeatures(&l.Resource)))
+			messages = append(
+				messages,
+				fmt.Sprintf(
+					"`%s`:\n locked by %s until %s\n%s%s",
+					l.Resource.Name,
+					l.User,
+					l.LockUntil.Format(time.RFC1123),
+					getFormattedReason(l.Reason),
+					getAddressesAndFeatures(l.Resource),
+				),
+			)
 		}
 	}
 
@@ -230,7 +248,7 @@ func getFormattedReason(reason string) string {
 	return fmt.Sprintf("_%s_\n", reason)
 }
 
-func getAddressesAndFeatures(resource *config.Resource) string {
+func getAddressesAndFeatures(resource config.Resource) string {
 	var lines []string
 	lines = append(lines, ">_Addresses:_")
 	for _, address := range resource.Addresses {