Base62 mail domains

cmd/yggmail/main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/emersion/go-imap/server"
 	"github.com/emersion/go-sasl"
 	"github.com/emersion/go-smtp"
+	"github.com/jxskiss/base62"
 	"golang.org/x/term"
 
 	"github.com/neilalexander/yggmail/internal/config"
@@ -64,7 +65,7 @@ func main() {
 		copy(sk, skBytes)
 	}
 	pk := sk.Public().(ed25519.PublicKey)
-	log.Println("Mail domain:", hex.EncodeToString(pk))
+	log.Println("Mail domain:", base62.EncodeToString(pk))
 
 	switch {
 	case createuser != nil && *createuser != "":
@@ -92,7 +93,7 @@ func main() {
 			panic(err)
 		}
 		fmt.Printf("Created user %q\n", *createuser)
-		fmt.Printf("Email address will be %s@%s%s\n", *createuser, hex.EncodeToString(pk), smtpserver.TLD)
+		fmt.Printf("Email address will be %s@%s%s\n", *createuser, base62.EncodeToString(pk), smtpserver.TLD)
 		os.Exit(0)
 	}
 
@@ -148,7 +149,7 @@ func main() {
 
 		localServer := smtp.NewServer(localBackend)
 		localServer.Addr = *smtpaddr
-		localServer.Domain = hex.EncodeToString(pk)
+		localServer.Domain = base62.EncodeToString(pk)
 		localServer.MaxMessageBytes = 1024 * 1024
 		localServer.MaxRecipients = 50
 		localServer.AllowInsecureAuth = true
@@ -177,7 +178,7 @@ func main() {
 		}
 
 		overlayServer := smtp.NewServer(overlayBackend)
-		overlayServer.Domain = hex.EncodeToString(pk)
+		overlayServer.Domain = base62.EncodeToString(pk)
 		overlayServer.MaxMessageBytes = 1024 * 1024
 		overlayServer.MaxRecipients = 50
 		overlayServer.AuthDisabled = true

cmd/yggproxy/main.go

@@ -1,101 +0,0 @@
-package main
-
-import (
-	"crypto/ed25519"
-	"encoding/hex"
-	"flag"
-	"log"
-	"net"
-	"os"
-
-	"github.com/neilalexander/yggmail/internal/transport"
-)
-
-var dst = flag.String("dst", "", "Destination public key to proxy to")
-var peeraddr = flag.String("peer", "", "Yggdrasil static peer")
-
-func main() {
-	flag.Parse()
-
-	/*
-		pk, sk, err := ed25519.GenerateKey(nil)
-		if err != nil {
-			panic(err)
-		}
-	*/
-
-	sk := make(ed25519.PrivateKey, ed25519.PrivateKeySize)
-	if sks, err := hex.DecodeString("f50a6a4688ca602307dcf282304583b1746093a558e934d3e9a817bb1e7be77b7c824efcd702e80a3a6912e15ebc4e13454022947ce8ee46ddb871e8b9a9147f"); err != nil {
-		panic(err)
-	} else {
-		copy(sk, sks)
-	}
-	pk := sk.Public().(ed25519.PublicKey)
-
-	log.Println("Private key:", hex.EncodeToString(sk))
-
-	log := log.New(os.Stdout, "", 0)
-	transport, err := transport.NewYggdrasilTransport(log, sk, pk, *peeraddr)
-	if err != nil {
-		panic(err)
-	}
-
-	listener, err := net.Listen("tcp", "localhost:1026")
-	if err != nil {
-		panic(err)
-	}
-
-	log.Println("Proxying", listener.Addr(), "to", *dst)
-
-	for {
-		conn, err := listener.Accept()
-		if err != nil {
-			panic(err)
-		}
-
-		log.Println("Accepted connection from", conn.RemoteAddr())
-
-		upstream, err := transport.Dial(*dst)
-		if err != nil {
-			log.Println("Failed to dial upstream:", err)
-			conn.Close()
-			continue
-		}
-
-		go func(conn, upstream net.Conn) {
-			defer conn.Close()
-			defer upstream.Close()
-			var b [1024]byte
-			for {
-				n, err := conn.Read(b[:])
-				if err != nil {
-					log.Println("conn.Read:", err)
-					return
-				}
-				_, err = upstream.Write(b[:n])
-				if err != nil {
-					log.Println("upstream.Write:", err)
-					return
-				}
-			}
-		}(conn, upstream)
-
-		go func(conn, upstream net.Conn) {
-			defer conn.Close()
-			defer upstream.Close()
-			var b [1024]byte
-			for {
-				n, err := upstream.Read(b[:])
-				if err != nil {
-					log.Println("upstream.Read:", err)
-					return
-				}
-				_, err = conn.Write(b[:n])
-				if err != nil {
-					log.Println("conn.Write:", err)
-					return
-				}
-			}
-		}(conn, upstream)
-	}
-}

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
 	github.com/emersion/go-smtp v0.15.0
 	github.com/gologme/log v1.2.0
+	github.com/jxskiss/base62 v0.0.0-20191017122030-4f11678b909b // indirect
 	github.com/mattn/go-sqlite3 v1.14.7
 	github.com/neilalexander/utp v0.1.1-0.20210705212447-691f29ad692b
 	github.com/yggdrasil-network/yggdrasil-go v0.4.1-0.20210707004512-3704ebf4cbea

go.sum

@@ -62,6 +62,8 @@ github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbc
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jxskiss/base62 v0.0.0-20191017122030-4f11678b909b h1:XUr8tvMEILhphQPp3TFcIudb5KTOzFeD0pJyDn5+5QI=
+github.com/jxskiss/base62 v0.0.0-20191017122030-4f11678b909b/go.mod h1:a5Mn24iYVJRUQSkFupGByqykzD+k+wFI8J91zGHuPf8=
 github.com/kardianos/minwinsvc v1.0.0/go.mod h1:Bgd0oc+D0Qo3bBytmNtyRKVlp85dAloLKhfxanPFFRc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

internal/smtpsender/sender.go

@@ -1,7 +1,6 @@
 package smtpsender
 
 import (
-	"encoding/hex"
 	"fmt"
 	"log"
 	"math"
@@ -9,6 +8,7 @@ import (
 	"time"
 
 	"github.com/emersion/go-smtp"
+	"github.com/jxskiss/base62"
 	"github.com/neilalexander/yggmail/internal/config"
 	"github.com/neilalexander/yggmail/internal/transport"
 	"go.uber.org/atomic"
@@ -93,7 +93,7 @@ func (q *Queue) run() {
 			}
 			defer client.Close()
 
-			if err := client.Hello(hex.EncodeToString(q.queues.Config.PublicKey)); err != nil {
+			if err := client.Hello(base62.EncodeToString(q.queues.Config.PublicKey)); err != nil {
 				return fmt.Errorf("client.Hello: %w", err)
 			}
 

internal/smtpserver/session_local.go

@@ -2,13 +2,13 @@ package smtpserver
 
 import (
 	"bytes"
-	"encoding/hex"
 	"fmt"
 	"io"
 	"time"
 
 	"github.com/emersion/go-message"
 	"github.com/emersion/go-smtp"
+	"github.com/jxskiss/base62"
 	"github.com/neilalexander/yggmail/internal/smtpsender"
 )
 
@@ -25,7 +25,7 @@ func (s *SessionLocal) Mail(from string, opts smtp.MailOptions) error {
 		return fmt.Errorf("parseAddress: %w", err)
 	}
 
-	if host != hex.EncodeToString(s.backend.Config.PublicKey) {
+	if host != base62.EncodeToString(s.backend.Config.PublicKey) {
 		return fmt.Errorf("not allowed to send outgoing mail as %s", from)
 	}
 
@@ -47,7 +47,7 @@ func (s *SessionLocal) Data(r io.Reader) error {
 	m.Header.Add(
 		"Received", fmt.Sprintf("from %s by Yggmail %s; %s",
 			s.state.RemoteAddr.String(),
-			hex.EncodeToString(s.backend.Config.PublicKey),
+			base62.EncodeToString(s.backend.Config.PublicKey),
 			time.Now().String(),
 		),
 	)
@@ -65,7 +65,7 @@ func (s *SessionLocal) Data(r io.Reader) error {
 		}
 		servers[host] = struct{}{}
 
-		if host == hex.EncodeToString(s.backend.Config.PublicKey) {
+		if host == base62.EncodeToString(s.backend.Config.PublicKey) {
 			var b bytes.Buffer
 			if err := m.WriteTo(&b); err != nil {
 				return fmt.Errorf("m.WriteTo: %w", err)

internal/smtpserver/session_remote.go

@@ -3,13 +3,13 @@ package smtpserver
 import (
 	"bytes"
 	"crypto/ed25519"
-	"encoding/hex"
 	"fmt"
 	"io"
 	"time"
 
 	"github.com/emersion/go-message"
 	"github.com/emersion/go-smtp"
+	"github.com/jxskiss/base62"
 )
 
 type SessionRemote struct {
@@ -40,7 +40,7 @@ func (s *SessionRemote) Rcpt(to string) error {
 		return fmt.Errorf("mail.ParseAddress: %w", err)
 	}
 
-	if local := hex.EncodeToString(s.backend.Config.PublicKey); host != local {
+	if local := base62.EncodeToString(s.backend.Config.PublicKey); host != local {
 		return fmt.Errorf("not allowed to send mail to %q", host)
 	}
 
@@ -56,7 +56,7 @@ func (s *SessionRemote) Data(r io.Reader) error {
 
 	m.Header.Add(
 		"Received", fmt.Sprintf("from Yggmail %s; %s",
-			hex.EncodeToString(s.public),
+			base62.EncodeToString(s.public),
 			time.Now().String(),
 		),
 	)

internal/transport/yggdrasil.go

@@ -9,6 +9,7 @@ import (
 
 	iwt "github.com/Arceliar/ironwood/types"
 	gologme "github.com/gologme/log"
+	"github.com/jxskiss/base62"
 	"github.com/neilalexander/utp"
 	"github.com/yggdrasil-network/yggdrasil-go/src/config"
 	"github.com/yggdrasil-network/yggdrasil-go/src/core"
@@ -63,7 +64,7 @@ func NewYggdrasilTransport(log *log.Logger, sk ed25519.PrivateKey, pk ed25519.Pu
 
 func (t *YggdrasilTransport) Dial(host string) (net.Conn, error) {
 	addr := make(iwt.Addr, ed25519.PublicKeySize)
-	k, err := hex.DecodeString(host)
+	k, err := base62.DecodeString(host)
 	if err != nil {
 		return nil, err
 	}