feat(server): support JSON encoding as an option

cmd/gen.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -106,9 +105,7 @@ var cmdGen = &cobra.Command{
 
 				fmt.Print(out.String())
 			case "json":
-				crtJson := strings.ReplaceAll(string(crtBuffer[:len(crtBuffer)-1]), "\n", "\\n")
-				keyJson := strings.ReplaceAll(string(keyBuffer[:len(keyBuffer)-1]), "\n", "\\n")
-				fmt.Printf(`{"crt":"%s","key":"%s"}`, crtJson, keyJson)
+				fmt.Printf(`{"crt":"%s","key":"%s"}`, util.BytesToJSON(crtBuffer), util.BytesToJSON(keyBuffer))
 			default: // raw
 				fmt.Printf("%s%s", string(crtBuffer), string(keyBuffer))
 			}

server/ca.go

@@ -2,11 +2,14 @@ package server
 
 import (
 	"bytes"
+	"fmt"
+	"strings"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog/log"
 	"gitlab.rete.farm/sistemi/inca/pki"
 	"gitlab.rete.farm/sistemi/inca/provider"
+	"gitlab.rete.farm/sistemi/inca/util"
 )
 
 func (inca *Inca) handlerCA(c *fiber.Ctx) error {
@@ -22,5 +25,8 @@ func (inca *Inca) handlerCA(c *fiber.Ctx) error {
 	}
 
 	caCrtBytes := pki.ExportBytes(caCrt)
+	if strings.EqualFold(c.Get("Accept", "text/plain"), "application/json") {
+		return c.SendString(fmt.Sprintf(`{"crt":"%s"}`, util.BytesToJSON(caCrtBytes)))
+	}
 	return c.SendStream(bytes.NewReader(caCrtBytes), len(caCrtBytes))
 }

server/crt.go

@@ -2,6 +2,8 @@ package server
 
 import (
 	"bytes"
+	"fmt"
+	"strings"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog/log"
@@ -22,7 +24,10 @@ func (inca *Inca) handlerCRT(c *fiber.Ctx) error {
 
 	data, _, err := (*inca.Cfg.Storage).Get(name)
 	if err == nil {
-		log.Info().Str("name", name).Err(err).Msg("returning cached certificate")
+		log.Info().Str("name", name).Msg("returning cached certificate")
+		if strings.EqualFold(c.Get("Accept", "text/plain"), "application/json") {
+			return c.SendString(fmt.Sprintf(`{"crt":"%s"}`, util.BytesToJSON(data)))
+		}
 		return c.SendStream(bytes.NewReader(data), len(data))
 	}
 
@@ -44,5 +49,8 @@ func (inca *Inca) handlerCRT(c *fiber.Ctx) error {
 	}
 
 	crtData := pki.ExportBytes(crt)
+	if strings.EqualFold(c.Get("Accept", "text/plain"), "application/json") {
+		return c.SendString(fmt.Sprintf(`{"crt":"%s"}`, util.BytesToJSON(crtData)))
+	}
 	return c.SendStream(bytes.NewReader(crtData), len(crtData))
 }

server/key.go

@@ -2,14 +2,20 @@ package server
 
 import (
 	"bytes"
+	"fmt"
+	"strings"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog/log"
+	"gitlab.rete.farm/sistemi/inca/util"
 )
 
 func (inca *Inca) handlerKey(c *fiber.Ctx) error {
 	_, data, err := (*inca.Cfg.Storage).Get(c.Params("name"))
 	if err == nil {
+		if strings.EqualFold(c.Get("Accept", "text/plain"), "application/json") {
+			return c.SendString(fmt.Sprintf(`{"key":"%s"}`, util.BytesToJSON(data)))
+		}
 		return c.SendStream(bytes.NewReader(data), len(data))
 	}
 

util/json.go

@@ -0,0 +1,7 @@
+package util
+
+import "strings"
+
+func BytesToJSON(data []byte) string {
+	return strings.ReplaceAll(strings.TrimSuffix(string(data), "\n"), "\n", "\\n")
+}