From f9cf01b48b0699ab641ef615a18f0e0497c6de3f Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 8 Jul 2023 20:52:50 -0300
Subject: [PATCH] do target validation on a case-by-case basis and don't
 validate empty -author on nevent.

---
 encode.go | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/encode.go b/encode.go
index cb3fc68..41238b6 100644
--- a/encode.go
+++ b/encode.go
@@ -21,27 +21,22 @@ var encode = &cli.Command{
 		nak encode nevent --author <pubkey-hex> --relay <relay-url> --relay <other-relay> <event-id>
 		nak encode nsec <privkey-hex>`,
 	Before: func(c *cli.Context) error {
-		if c.Args().First() == "naddr" {
-			// validation will be done on the specific handler
-			return nil
-		}
-
 		if c.Args().Len() < 2 {
 			return fmt.Errorf("expected more than 2 arguments.")
 		}
-		target := c.Args().Get(c.Args().Len() - 1)
-		if target == "--help" {
-			return nil
-		}
-
-		return validate32BytesHex(target)
+		return nil
 	},
 	Subcommands: []*cli.Command{
 		{
 			Name:  "npub",
 			Usage: "encode a hex private key into bech32 'npub' format",
 			Action: func(c *cli.Context) error {
-				if npub, err := nip19.EncodePublicKey(c.Args().First()); err == nil {
+				target := c.Args().First()
+				if err := validate32BytesHex(target); err != nil {
+					return err
+				}
+
+				if npub, err := nip19.EncodePublicKey(target); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {
@@ -53,7 +48,12 @@ var encode = &cli.Command{
 			Name:  "nsec",
 			Usage: "encode a hex private key into bech32 'nsec' format",
 			Action: func(c *cli.Context) error {
-				if npub, err := nip19.EncodePrivateKey(c.Args().First()); err == nil {
+				target := c.Args().First()
+				if err := validate32BytesHex(target); err != nil {
+					return err
+				}
+
+				if npub, err := nip19.EncodePrivateKey(target); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {
@@ -72,12 +72,17 @@ var encode = &cli.Command{
 				},
 			},
 			Action: func(c *cli.Context) error {
+				target := c.Args().First()
+				if err := validate32BytesHex(target); err != nil {
+					return err
+				}
+
 				relays := c.StringSlice("relay")
 				if err := validateRelayURLs(relays); err != nil {
 					return err
 				}
 
-				if npub, err := nip19.EncodeProfile(c.Args().First(), relays); err == nil {
+				if npub, err := nip19.EncodeProfile(target, relays); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {
@@ -100,17 +105,24 @@ var encode = &cli.Command{
 				},
 			},
 			Action: func(c *cli.Context) error {
-				author := c.String("author")
-				if err := validate32BytesHex(author); err != nil {
+				target := c.Args().First()
+				if err := validate32BytesHex(target); err != nil {
 					return err
 				}
 
+				author := c.String("author")
+				if author != "" {
+					if err := validate32BytesHex(author); err != nil {
+						return err
+					}
+				}
+
 				relays := c.StringSlice("relay")
 				if err := validateRelayURLs(relays); err != nil {
 					return err
 				}
 
-				if npub, err := nip19.EncodeEvent(c.Args().First(), relays, author); err == nil {
+				if npub, err := nip19.EncodeEvent(target, relays, author); err == nil {
 					fmt.Println(npub)
 					return nil
 				} else {