- Bridge Node Support: Added functionality to manage mail (send/receive) on remote nodes via a bridge node. Full transparent management requires a private key on the bridge, while the remote node can operate with only a public key. - End-to-End Encryption (E2EE): Integrated E2EE using age. Encryption and decryption occur strictly at the bridge level; node administrators cannot access message content. - New Addressing Schema: Transitioned from nodepub@yggmail to userpub@nodepub. - Key Adaptation: Implemented ed25519 to x25519 coordinate adaptation, allowing signing keys to be used for encryption. Changed - Address Encoding: Switched from hex16 to base32 for the address space. - Memory Optimization: Replaced direct memory allocations with streaming for mail processing to reduce RAM overhead. - Code Refactoring: Performed decomposition of the original inherited codebase to improve maintainability. Fixed - Mail Updates: Fixed the mail retrieval mechanism to ensure near-instant updates for incoming messages. Changes to be committed: modified: .gitignore modified: README.md modified: cmd/yggmail/main.go modified: go.mod modified: go.sum new file: internal/account/manager.go new file: internal/account/session.go modified: internal/imapserver/backend.go modified: internal/imapserver/imap.go modified: internal/imapserver/mailbox.go modified: internal/imapserver/notify.go modified: internal/imapserver/user.go new file: internal/notify/notify.go new file: internal/notify/remote/remote.go new file: internal/remote/client.go new file: internal/remote/handlers.go new file: internal/remote/io.go new file: internal/remote/server.go new file: internal/remote/sign.go new file: internal/remote/types/request.pb.go new file: internal/remote/types/request.proto new file: internal/remote/types/response.pb.go new file: internal/remote/types/response.proto new file: internal/shell/shell.go modified: internal/smtpsender/sender.go modified: internal/smtpserver/backend.go modified: internal/smtpserver/session_local.go modified: internal/smtpserver/session_remote.go modified: internal/smtpserver/smtp.go new file: internal/storage/filestore/filestore.go new file: internal/storage/local/storage.go new file: internal/storage/remote/mail.go new file: internal/storage/remote/mailbox.go new file: internal/storage/remote/queue.go new file: internal/storage/remote/storage.go new file: internal/storage/remote/watch.go modified: internal/storage/sqlite3/sqlite3.go new file: internal/storage/sqlite3/table_accounts.go modified: internal/storage/sqlite3/table_mailboxes.go modified: internal/storage/sqlite3/table_mails.go modified: internal/storage/sqlite3/table_queue.go modified: internal/storage/storage.go modified: internal/storage/types/types.go modified: internal/utils/address.go new file: internal/utils/age/age.go new file: internal/utils/age/bech32/bech32.go new file: internal/utils/crypt.go new file: internal/utils/e2ee/crypt.go new file: internal/utils/e2ee/e2ee_test.go new file: internal/utils/e2ee/msg.go new file: internal/utils/x25519.go modified: internal/welcome/welcome.go
115 lines
2.4 KiB
Go
115 lines
2.4 KiB
Go
/*
|
|
* Copyright (c) 2026 Kaiy Ragur
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
package remote
|
|
|
|
import (
|
|
"bufio"
|
|
"crypto/ed25519"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"time"
|
|
|
|
pb "github.com/neilalexander/yggmail/internal/remote/types"
|
|
"github.com/neilalexander/yggmail/internal/transport"
|
|
"github.com/neilalexander/yggmail/internal/utils"
|
|
)
|
|
|
|
type rpcSession struct {
|
|
conn net.Conn
|
|
buf *bufio.Reader
|
|
}
|
|
|
|
type Client struct {
|
|
publicKey ed25519.PublicKey
|
|
signer Signer
|
|
transport transport.Transport
|
|
|
|
pool chan *rpcSession
|
|
}
|
|
|
|
func NewClient(pubkey ed25519.PublicKey, signer Signer, tr transport.Transport) *Client {
|
|
c := &Client{
|
|
publicKey: pubkey,
|
|
signer: signer,
|
|
transport: tr,
|
|
pool: make(chan *rpcSession, 3),
|
|
}
|
|
return c
|
|
}
|
|
|
|
func (c *Client) getConn(target ed25519.PublicKey) (*rpcSession, error) {
|
|
select {
|
|
case session := <-c.pool:
|
|
return session, nil
|
|
default:
|
|
conn, err := c.transport.Dial(hex.EncodeToString(target))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
session := &rpcSession{
|
|
conn: conn,
|
|
buf: bufio.NewReader(conn),
|
|
}
|
|
return session, nil
|
|
}
|
|
}
|
|
func (c *Client) returnConn(sess *rpcSession) {
|
|
select {
|
|
case c.pool <- sess:
|
|
default:
|
|
sess.conn.Close()
|
|
}
|
|
}
|
|
|
|
func (c *Client) Call(targetNode ed25519.PublicKey, req *pb.Request, payload io.ReadCloser, size uint32) (*pb.Response, *Payload, error) {
|
|
for range 2 {
|
|
sess, err := c.getConn(targetNode)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("dial failed: %w", err)
|
|
}
|
|
|
|
req.AccountPk = utils.EncodeString(c.publicKey)
|
|
req.Timestamp = time.Now().UnixNano()
|
|
|
|
if err := SignRequest(req, c.signer); err != nil {
|
|
c.returnConn(sess)
|
|
return nil, nil, err
|
|
}
|
|
|
|
resp, respPayload, err := c.doRPC(sess, req, payload, size)
|
|
if err != nil {
|
|
sess.conn.Close()
|
|
return nil, nil, fmt.Errorf("rpc failed: %w", err)
|
|
}
|
|
|
|
if respPayload != nil && respPayload.R != nil {
|
|
respPayload.R.Close()
|
|
}
|
|
|
|
c.returnConn(sess)
|
|
return resp, respPayload, nil
|
|
}
|
|
return nil, nil, fmt.Errorf("all retries failed")
|
|
}
|
|
|
|
func (c *Client) doRPC(sess *rpcSession, req *pb.Request, payload io.ReadCloser, size uint32) (*pb.Response, *Payload, error) {
|
|
p := &Payload{
|
|
R: payload,
|
|
Size: size,
|
|
}
|
|
|
|
if err := SendFrame(sess.conn, req, p); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
return ReadResponse(sess.buf)
|
|
}
|