diff --git a/crypt/openpgp/service.go b/crypt/openpgp/service.go index f7e329c..da6f61a 100644 --- a/crypt/openpgp/service.go +++ b/crypt/openpgp/service.go @@ -6,15 +6,15 @@ import ( goio "io" "strings" + core "forge.lthn.ai/core/go-log" + + framework "dappco.re/go/core" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" "github.com/ProtonMail/go-crypto/openpgp/packet" - - core "forge.lthn.ai/core/go-log" - framework "forge.lthn.ai/core/go/pkg/core" ) -// Service implements the framework.Crypt interface using OpenPGP. +// Service provides OpenPGP cryptographic operations. type Service struct { core *framework.Core } @@ -59,19 +59,19 @@ func (s *Service) CreateKeyPair(name, passphrase string) (string, error) { return "", core.E("openpgp.CreateKeyPair", "failed to create armor encoder", err) } - // Manual serialization to avoid panic from re-signing encrypted keys - err = s.serializeEntity(w, entity) + // Manual serialisation to avoid panic from re-signing encrypted keys + err = serializeEntity(w, entity) if err != nil { w.Close() - return "", core.E("openpgp.CreateKeyPair", "failed to serialize private key", err) + return "", core.E("openpgp.CreateKeyPair", "failed to serialise private key", err) } w.Close() return buf.String(), nil } -// serializeEntity manually serializes an OpenPGP entity to avoid re-signing. -func (s *Service) serializeEntity(w goio.Writer, e *openpgp.Entity) error { +// serializeEntity manually serialises an OpenPGP entity to avoid re-signing. +func serializeEntity(w goio.Writer, e *openpgp.Entity) error { err := e.PrivateKey.Serialize(w) if err != nil { return err @@ -188,6 +188,3 @@ func (s *Service) HandleIPCEvents(c *framework.Core, msg framework.Message) erro } return nil } - -// Ensure Service implements framework.Crypt. -var _ framework.Crypt = (*Service)(nil) diff --git a/crypt/openpgp/service_test.go b/crypt/openpgp/service_test.go index 233cfd1..17d8a55 100644 --- a/crypt/openpgp/service_test.go +++ b/crypt/openpgp/service_test.go @@ -4,40 +4,40 @@ import ( "bytes" "testing" - framework "forge.lthn.ai/core/go/pkg/core" + framework "dappco.re/go/core" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateKeyPair(t *testing.T) { - c, _ := framework.New() + c := framework.New() s := &Service{core: c} privKey, err := s.CreateKeyPair("test user", "password123") - assert.NoError(t, err) - assert.NotEmpty(t, privKey) + require.NoError(t, err) + require.NotEmpty(t, privKey) assert.Contains(t, privKey, "-----BEGIN PGP PRIVATE KEY BLOCK-----") } func TestEncryptDecrypt(t *testing.T) { - c, _ := framework.New() + c := framework.New() s := &Service{core: c} passphrase := "secret" privKey, err := s.CreateKeyPair("test user", passphrase) - assert.NoError(t, err) + require.NoError(t, err) - // In this simple test, the public key is also in the armored private key string - // (openpgp.ReadArmoredKeyRing reads both) + // ReadArmoredKeyRing extracts public keys from armored private key blocks publicKey := privKey data := "hello openpgp" var buf bytes.Buffer armored, err := s.EncryptPGP(&buf, publicKey, data) - assert.NoError(t, err) + require.NoError(t, err) assert.NotEmpty(t, armored) assert.NotEmpty(t, buf.String()) decrypted, err := s.DecryptPGP(privKey, armored, passphrase) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, data, decrypted) } diff --git a/go.mod b/go.mod index fa9be8e..4b81cf5 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,20 @@ module forge.lthn.ai/core/go-crypt go 1.26.0 require ( - forge.lthn.ai/core/cli v0.3.5 - forge.lthn.ai/core/go v0.3.1 - forge.lthn.ai/core/go-i18n v0.1.6 - forge.lthn.ai/core/go-io v0.1.5 + dappco.re/go/core v0.4.7 + forge.lthn.ai/core/cli v0.3.7 + forge.lthn.ai/core/go-i18n v0.1.7 + forge.lthn.ai/core/go-io v0.1.7 forge.lthn.ai/core/go-log v0.0.4 - forge.lthn.ai/core/go-store v0.1.7 + forge.lthn.ai/core/go-store v0.1.10 github.com/ProtonMail/go-crypto v1.4.0 github.com/stretchr/testify v1.11.1 golang.org/x/crypto v0.49.0 ) require ( - forge.lthn.ai/core/go-inference v0.1.4 // indirect + forge.lthn.ai/core/go v0.3.3 // indirect + forge.lthn.ai/core/go-inference v0.1.7 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/charmbracelet/bubbletea v1.3.10 // indirect github.com/charmbracelet/colorprofile v0.4.3 // indirect @@ -53,5 +54,5 @@ require ( modernc.org/libc v1.70.0 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect - modernc.org/sqlite v1.46.2 // indirect + modernc.org/sqlite v1.47.0 // indirect ) diff --git a/go.sum b/go.sum index 6df95e4..343a2eb 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,19 @@ -forge.lthn.ai/core/cli v0.3.5 h1:P7yK0DmSA1QnUMFuCjJZf/fk/akKPIxopQ6OwD8Sar8= -forge.lthn.ai/core/cli v0.3.5/go.mod h1:SeArHx+hbpX5iZqgASCD7Q1EDoc6uaaGiGBotmNzIx4= -forge.lthn.ai/core/go v0.3.1 h1:5FMTsUhLcxSr07F9q3uG0Goy4zq4eLivoqi8shSY4UM= -forge.lthn.ai/core/go v0.3.1/go.mod h1:gE6c8h+PJ2287qNhVUJ5SOe1kopEwHEquvinstpuyJc= -forge.lthn.ai/core/go-i18n v0.1.6 h1:Z9h6sEZsgJmWlkkq3ZPZyfgWipeeqN5lDCpzltpamHU= -forge.lthn.ai/core/go-i18n v0.1.6/go.mod h1:C6CbwdN7sejTx/lbutBPrxm77b8paMHBO6uHVLHOdqQ= -forge.lthn.ai/core/go-inference v0.1.4 h1:fuAgWbqsEDajHniqAKyvHYbRcBrkGEiGSqR2pfTMRY0= -forge.lthn.ai/core/go-inference v0.1.4/go.mod h1:jfWz+IJX55wAH98+ic6FEqqGB6/P31CHlg7VY7pxREw= -forge.lthn.ai/core/go-io v0.1.5 h1:+XJ1YhaGGFLGtcNbPtVlndTjk+pO0Ydi2hRDj5/cHOM= -forge.lthn.ai/core/go-io v0.1.5/go.mod h1:FRtXSsi8W+U9vewCU+LBAqqbIj3wjXA4dBdSv3SAtWI= +dappco.re/go/core v0.4.7 h1:KmIA/2lo6rl1NMtLrKqCWfMlUqpDZYH3q0/d10dTtGA= +dappco.re/go/core v0.4.7/go.mod h1:f2/tBZ3+3IqDrg2F5F598llv0nmb/4gJVCFzM5geE4A= +forge.lthn.ai/core/cli v0.3.7 h1:1GrbaGg0wDGHr6+klSbbGyN/9sSbHvFbdySJznymhwg= +forge.lthn.ai/core/cli v0.3.7/go.mod h1:DBUppJkA9P45ZFGgI2B8VXw1rAZxamHoI/KG7fRvTNs= +forge.lthn.ai/core/go v0.3.3 h1:kYYZ2nRYy0/Be3cyuLJspRjLqTMxpckVyhb/7Sw2gd0= +forge.lthn.ai/core/go v0.3.3/go.mod h1:Cp4ac25pghvO2iqOu59t1GyngTKVOzKB5/VPdhRi9CQ= +forge.lthn.ai/core/go-i18n v0.1.7 h1:aHkAoc3W8fw3RPNvw/UszQbjyFWXHszzbZgty3SwyAA= +forge.lthn.ai/core/go-i18n v0.1.7/go.mod h1:0VDjwtY99NSj2iqwrI09h5GUsJeM9s48MLkr+/Dn4G8= +forge.lthn.ai/core/go-inference v0.1.7 h1:9Dy6v03jX5ZRH3n5iTzlYyGtucuBIgSe+S7GWvBzx9Q= +forge.lthn.ai/core/go-inference v0.1.7/go.mod h1:jfWz+IJX55wAH98+ic6FEqqGB6/P31CHlg7VY7pxREw= +forge.lthn.ai/core/go-io v0.1.7 h1:Tdb6sqh+zz1lsGJaNX9RFWM6MJ/RhSAyxfulLXrJsbk= +forge.lthn.ai/core/go-io v0.1.7/go.mod h1:8lRLFk4Dnp5cR/Cyzh9WclD5566TbpdRgwcH7UZLWn4= forge.lthn.ai/core/go-log v0.0.4 h1:KTuCEPgFmuM8KJfnyQ8vPOU1Jg654W74h8IJvfQMfv0= forge.lthn.ai/core/go-log v0.0.4/go.mod h1:r14MXKOD3LF/sI8XUJQhRk/SZHBE7jAFVuCfgkXoZPw= -forge.lthn.ai/core/go-store v0.1.7 h1:M1lA+YKX6NR+g5EzXkKjrTNRznGz5nypYahvPlbYVdQ= -forge.lthn.ai/core/go-store v0.1.7/go.mod h1:8HSEYfcU9tuivAzBz3i0FLBV0ls44QzXnlcd7cqL6PA= +forge.lthn.ai/core/go-store v0.1.10 h1:JLyf8xMR3V6PfBAW1kv6SJeHsYY93LacEBpTFW657qE= +forge.lthn.ai/core/go-store v0.1.10/go.mod h1:VNnHh94TMD3+L+sSgvxn0GHtDKhJR8FD6JiuIuRtjuk= github.com/ProtonMail/go-crypto v1.4.0 h1:Zq/pbM3F5DFgJiMouxEdSVY44MVoQNEKp5d5QxIQceQ= github.com/ProtonMail/go-crypto v1.4.0/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= @@ -133,8 +135,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.46.2 h1:gkXQ6R0+AjxFC/fTDaeIVLbNLNrRoOK7YYVz5BKhTcE= -modernc.org/sqlite v1.46.2/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig= +modernc.org/sqlite v1.47.0 h1:R1XyaNpoW4Et9yly+I2EeX7pBza/w+pmYee/0HJDyKk= +modernc.org/sqlite v1.47.0/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=