Merge pull request #255 from homeport/address/gosec-finding

Address `gosec` findings
homeport · Jan 1, 2025 · 13f7d42 · 13f7d42
2 parents bccf6b3 + ec63791
commit 13f7d42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -68,6 +68,7 @@ window including all terminal colors and text decorations.
 				version = "(development)"
 			}
 
+			// #nosec G104
 			bunt.Printf("Lime{*%s*} version DimGray{%s}\n",
 				executableName(),
 				version,
@@ -111,6 +112,7 @@ window including all terminal colors and text decorations.
 		// Optional: Prepend command line arguments to output content
 		//
 		if includeCommand, err := cmd.Flags().GetBool("show-cmd"); err == nil && includeCommand {
+			// #nosec G104
 			bunt.Fprintf(&buf, "Lime{%s} DimGray{%s}\n",
 				commandIndicator,
 				strings.Join(args, " "),
@@ -182,7 +184,7 @@ window including all terminal colors and text decorations.
 			return fmt.Errorf("file extension %q of filename %q is not supported, only png is supported", extension, filename)
 		}
 
-		file, err := os.Create(filename)
+		file, err := os.Create(filepath.Clean(filename))
 		if err != nil {
 			return fmt.Errorf("failed to create file: %w", err)
 		}

diff --git a/internal/cmd/root_darwin.go b/internal/cmd/root_darwin.go
@@ -62,7 +62,7 @@ func init() {
 				return err
 			}
 
-			cmd := exec.Command(osascript, "-e", buf.String())
+			cmd := exec.Command(osascript, "-e", buf.String()) // #nosec G204
 			out, err := cmd.CombinedOutput()
 			if err != nil {
 				fmt.Fprint(os.Stderr, string(out))

diff --git a/internal/img/output.go b/internal/img/output.go
@@ -309,9 +309,9 @@ func (s *Scaffold) image() (image.Image, error) {
 		switch cr.Settings & 0x02 {
 		case 2:
 			dc.SetRGB255(
-				int((cr.Settings>>32)&0xFF),
-				int((cr.Settings>>40)&0xFF),
-				int((cr.Settings>>48)&0xFF),
+				int((cr.Settings>>32)&0xFF), // #nosec G115
+				int((cr.Settings>>40)&0xFF), // #nosec G115
+				int((cr.Settings>>48)&0xFF), // #nosec G115
 			)
 
 			dc.DrawRectangle(x, y-h+12, w, h)
@@ -322,9 +322,9 @@ func (s *Scaffold) image() (image.Image, error) {
 		switch cr.Settings & 0x01 {
 		case 1:
 			dc.SetRGB255(
-				int((cr.Settings>>8)&0xFF),
-				int((cr.Settings>>16)&0xFF),
-				int((cr.Settings>>24)&0xFF),
+				int((cr.Settings>>8)&0xFF),  // #nosec G115
+				int((cr.Settings>>16)&0xFF), // #nosec G115
+				int((cr.Settings>>24)&0xFF), // #nosec G115
 			)
 
 		default: