[lint] fix issues

Author: capcom6

.golangci.yml

@@ -251,6 +251,8 @@ linters:
         - ^net/url.URL$
         - ^os/exec.Cmd$
         - ^reflect.StructField$
+        - ^crypto/x509.CertificateRequest$
+        - ^crypto/x509/pkix.Name$
         # public libs
         - ^firebase.google.com/go/v4/messaging.AndroidConfig$
         - ^firebase.google.com/go/v4/messaging.Message$
@@ -284,6 +286,7 @@ linters:
         - ^gopkg.in/telebot.v4.Settings$
         - ^gopkg.in/yaml.v3.Node$
         - ^gorm.io/gorm/clause.+$
+        - ^github.com/urfave/cli/v2.+$
       # Allows empty structures in return statements.
       # Default: false
       allow-empty-returns: true

cmd/smsgate-ca/smsgate-ca.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/android-sms-gateway/cli/internal/commands/ca"
 	"github.com/android-sms-gateway/cli/internal/core/codes"
@@ -22,11 +23,27 @@ func main() {
 		os.Exit(codes.ParamsError)
 	}
 
+	const defaultTimeout = 30 * time.Second
+
+	cmds := ca.Commands()
+
 	app := &cli.App{
 		Name:     "smsgate-ca",
-		Usage:    "CLI interface for interacting with Certificate Authority of SMS Gateway for Android™",
+		Usage:    "CLI interface for interacting with Certificate Authority of SMSGate",
 		Version:  version,
-		Commands: make([]*cli.Command, 0, len(ca.Commands)),
+		Commands: cmds,
+		Flags: []cli.Flag{
+			&cli.DurationFlag{
+				Name:     "timeout",
+				Aliases:  []string{"t"},
+				Usage:    "Request timeout",
+				Required: false,
+				Value:    defaultTimeout,
+				EnvVars: []string{
+					"ASG_CA_TIMEOUT",
+				},
+			},
+		},
 		Authors: []*cli.Author{
 			{
 				Name:  "Aleksandr Soloshenko",
@@ -35,12 +52,19 @@ func main() {
 		},
 		Before: func(c *cli.Context) error {
 			c.App.Metadata[metadata.CAClientKey] = client.NewClient()
+
+			timeout := c.Duration("timeout")
+			if timeout <= 0 {
+				return cli.Exit(
+					"Timeout must be greater than 0",
+					codes.ParamsError,
+				)
+			}
+
 			return nil
 		},
 	}
 
-	app.Commands = append(app.Commands, ca.Commands...)
-
 	if err := app.Run(os.Args); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(codes.ParamsError)

cmd/smsgate/smsgate.go

@@ -25,11 +25,15 @@ func main() {
 		os.Exit(codes.ParamsError)
 	}
 
+	cmds := make([]*cli.Command, 0, len(messages.Commands())+len(webhooks.Commands()))
+	cmds = append(cmds, messages.Commands()...)
+	cmds = append(cmds, webhooks.Commands()...)
+
 	app := &cli.App{
 		Name:     "smsgate",
 		Usage:    "CLI interface for working with SMS Gateway for Android™",
 		Version:  version,
-		Commands: make([]*cli.Command, 0, len(messages.Commands)+len(webhooks.Commands)),
+		Commands: cmds,
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:        "endpoint",
@@ -81,18 +85,19 @@ func main() {
 		Before: func(c *cli.Context) error {
 			renderer, err := output.New(output.Format(c.String("format")))
 			if err != nil {
-				return err
+				return fmt.Errorf("failed to create renderer: %w", err)
 			}
 
 			c.App.Metadata[metadata.RendererKey] = renderer
-			c.App.Metadata[metadata.ClientKey] = client.New(c.String("username"), c.String("password"), c.String("endpoint"))
+			c.App.Metadata[metadata.ClientKey] = client.New(
+				c.String("username"),
+				c.String("password"),
+				c.String("endpoint"),
+			)
 			return nil
 		},
 	}
 
-	app.Commands = append(app.Commands, messages.Commands...)
-	app.Commands = append(app.Commands, webhooks.Commands...)
-
 	if err := app.Run(os.Args); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(codes.ParamsError)

go.mod

@@ -4,13 +4,14 @@ go 1.23.2
 
 require (
 	github.com/android-sms-gateway/client-go v1.9.2
-	github.com/capcom6/go-helpers v0.4.0
 	github.com/joho/godotenv v1.5.1
+	github.com/samber/lo v1.52.0
 	github.com/urfave/cli/v2 v2.27.5
 )
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	golang.org/x/text v0.22.0 // indirect
 )

go.sum

@@ -1,14 +1,16 @@
 github.com/android-sms-gateway/client-go v1.9.2 h1:e9HFgvR+LRMV0dOJvFkxt998UxOMWNf8hfnXwMIc39I=
 github.com/android-sms-gateway/client-go v1.9.2/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
-github.com/capcom6/go-helpers v0.4.0 h1:z2G7YFqNn3pgsdn8wVO/ZoLd/P2ckk5p97vbrGqwBAY=
-github.com/capcom6/go-helpers v0.4.0/go.mod h1:WDqc7HZNqHxUTisArkYIBZtqUfJBVyPWeQI+FMwEzAw=
 github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
 github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
+github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
 github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=

internal/commands/ca/ca.go

@@ -1,10 +1,24 @@
 package ca
 
 import (
+	"github.com/android-sms-gateway/cli/internal/commands/ca/common"
+	"github.com/android-sms-gateway/client-go/ca"
 	"github.com/urfave/cli/v2"
 )
 
-var Commands = []*cli.Command{
-	webhooks,
-	private,
+func Commands() []*cli.Command {
+	return []*cli.Command{
+		common.NewIPCertificateCommand(
+			"webhooks",
+			"Issue a new certificate for receiving webhooks to local IP address",
+			[]string{"wh"},
+			ca.CSRTypeWebhook,
+		),
+		common.NewIPCertificateCommand(
+			"private",
+			"Issue a new certificate for Private server",
+			[]string{"p"},
+			ca.CSRTypePrivateServer,
+		),
+	}
 }

internal/commands/ca/common/command.go

@@ -12,7 +12,7 @@ import (
 )
 
 // NewIPCertificateCommand creates a new CLI command for generating an IP certificate
-// of the specified type
+// of the specified type.
 func NewIPCertificateCommand(name, usage string, aliases []string, typ ca.CSRType) *cli.Command {
 	return &cli.Command{
 		Name:      name,
@@ -59,5 +59,4 @@ func NewIPCertificateCommand(name, usage string, aliases []string, typ ca.CSRTyp
 			return requestCertificate(c, typ, csrTemplate)
 		},
 	}
-
 }

internal/commands/ca/common/utils.go

@@ -8,7 +8,7 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
-	"log"
+	"log" //nolint:depguard // TODO: replace with logger from mariadb-backup-s3
 	"os"
 	"time"
 
@@ -38,7 +38,7 @@ func newServerCertificateRequestPEM(template x509.CertificateRequest, priv *ecds
 		return nil, fmt.Errorf("failed to create certificate request: %w", err)
 	}
 
-	return pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE REQUEST", Bytes: csrBytes}), nil
+	return pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE REQUEST", Headers: nil, Bytes: csrBytes}), nil
 }
 
 func requestCertificate(c *cli.Context, typ ca.CSRType, template x509.CertificateRequest) error {
@@ -54,8 +54,9 @@ func requestCertificate(c *cli.Context, typ ca.CSRType, template x509.Certificat
 	}
 
 	privPemBytes := pem.EncodeToMemory(&pem.Block{
-		Type:  "EC PRIVATE KEY",
-		Bytes: privBytes,
+		Type:    "EC PRIVATE KEY",
+		Headers: nil,
+		Bytes:   privBytes,
 	})
 
 	log.Println("Creating certificate request...")
@@ -68,14 +69,15 @@ func requestCertificate(c *cli.Context, typ ca.CSRType, template x509.Certificat
 	client := metadata.GetCAClient(c.App.Metadata)
 
 	resp, err := client.PostCSR(c.Context, ca.PostCSRRequest{
-		Type:    typ,
-		Content: string(csrPemBytes),
+		Type:     typ,
+		Content:  string(csrPemBytes),
+		Metadata: nil,
 	})
 	if err != nil {
 		return cli.Exit(err.Error(), codes.ClientError)
 	}
 
-	timeout := time.After(30 * time.Second)
+	timeout := time.After(c.Duration("timeout"))
 	for resp.Certificate == "" {
 		select {
 		case <-c.Context.Done():
@@ -93,12 +95,14 @@ func requestCertificate(c *cli.Context, typ ca.CSRType, template x509.Certificat
 	}
 
 	log.Println("Saving certificate...")
-	if err := os.WriteFile(c.String("out"), []byte(resp.Certificate), 0644); err != nil {
-		return cli.Exit(err.Error(), codes.OutputError)
+	if wrErr := os.WriteFile(c.String("out"), []byte(resp.Certificate), 0600); wrErr != nil {
+		return cli.Exit(wrErr.Error(), codes.OutputError)
 	}
-	if err := os.WriteFile(c.String("keyout"), privPemBytes, 0400); err != nil {
-		os.Remove(c.String("out"))
-		return cli.Exit(err.Error(), codes.OutputError)
+	if wrErr := os.WriteFile(c.String("keyout"), privPemBytes, 0400); wrErr != nil {
+		if rmErr := os.Remove(c.String("out")); rmErr != nil {
+			log.Printf("Failed to remove certificate file %s: %s", c.String("out"), rmErr.Error())
+		}
+		return cli.Exit(wrErr.Error(), codes.OutputError)
 	}
 
 	log.Printf("Certificate saved to %s\n", c.String("out"))