fix(key_manager): fix the base64 encoding and decoding (#3884)

Co-authored-by: Mélanie Marques <[email protected]>
Co-authored-by: Rémy Léone <[email protected]>

Author: 3 people

cmd/scw/testdata/test-all-usage-keymanager-key-decrypt-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   key-id              ID of the key to decrypt
-  [ciphertext]        Ciphertext data to decrypt
+  ciphertext          Base64 Ciphertext data to decrypt (Support file loading with @/path/to/file)
   [associated-data]   (Optional) Additional authenticated data
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 

cmd/scw/testdata/test-all-usage-keymanager-key-encrypt-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   key-id              ID of the key to encrypt
-  [plaintext]         Plaintext data to encrypt
+  plaintext           Base64 Plaintext data to encrypt (Support file loading with @/path/to/file)
   [associated-data]   (Optional) Additional authenticated data
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 

docs/commands/keymanager.md

@@ -66,7 +66,7 @@ scw keymanager key decrypt [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | key-id | Required | ID of the key to decrypt |
-| ciphertext |  | Ciphertext data to decrypt |
+| ciphertext | Required | Base64 Ciphertext data to decrypt |
 | associated-data |  | (Optional) Additional authenticated data |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
@@ -148,7 +148,7 @@ scw keymanager key encrypt [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | key-id | Required | ID of the key to encrypt |
-| plaintext |  | Plaintext data to encrypt |
+| plaintext | Required | Base64 Plaintext data to encrypt |
 | associated-data |  | (Optional) Additional authenticated data |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 

internal/namespaces/key_manager/v1alpha1/custom.go

@@ -1,7 +1,66 @@
 package key_manager
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import (
+	"context"
+	"encoding/base64"
+
+	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
+)
 
 func GetCommands() *core.Commands {
-	return GetGeneratedCommands()
+	cmds := GetGeneratedCommands()
+
+	cmds.MustFind("keymanager", "key", "decrypt").Override(cipherDecrypt)
+	cmds.MustFind("keymanager", "key", "encrypt").Override(plaintextEncrypt)
+
+	return cmds
+}
+
+func plaintextEncrypt(c *core.Command) *core.Command {
+	*c.ArgSpecs.GetByName("plaintext") = core.ArgSpec{
+		Name:        "plaintext",
+		Short:       "Base64 Plaintext data to encrypt",
+		Required:    true,
+		CanLoadFile: true,
+	}
+
+	c.Interceptor = func(ctx context.Context, argsI interface{}, runner core.CommandRunner) (interface{}, error) {
+		args := argsI.(*key_manager.EncryptRequest)
+
+		p, err := base64.StdEncoding.DecodeString(string(args.Plaintext))
+		if err != nil {
+			return nil, err
+		}
+
+		args.Plaintext = p
+
+		return runner(ctx, args)
+	}
+
+	return c
+}
+
+func cipherDecrypt(c *core.Command) *core.Command {
+	*c.ArgSpecs.GetByName("ciphertext") = core.ArgSpec{
+		Name:        "ciphertext",
+		Short:       "Base64 Ciphertext data to decrypt",
+		Required:    true,
+		CanLoadFile: true,
+	}
+
+	c.Interceptor = func(ctx context.Context, argsI interface{}, runner core.CommandRunner) (interface{}, error) {
+		args := argsI.(*key_manager.DecryptRequest)
+
+		c, err := base64.StdEncoding.DecodeString(string(args.Ciphertext))
+		if err != nil {
+			return nil, err
+		}
+
+		args.Ciphertext = c
+
+		return runner(ctx, args)
+	}
+
+	return c
 }

internal/namespaces/key_manager/v1alpha1/key_manager_cli.go

@@ -540,7 +540,7 @@ func keymanagerKeyEncrypt() *core.Command {
 			},
 			{
 				Name:       "plaintext",
-				Short:      `Plaintext data to encrypt`,
+				Short:      `Base64 Plaintext data to encrypt`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -584,7 +584,7 @@ func keymanagerKeyDecrypt() *core.Command {
 			},
 			{
 				Name:       "ciphertext",
-				Short:      `Ciphertext data to decrypt`,
+				Short:      `Base64 Ciphertext data to decrypt`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,