绑定设备身份并分发一次性 MLS 密钥包

This commit is contained in:
xhgit committed 2026-11-13 18:27:10 +08:00
1 parent f30f01b699
commit 0b17dd07c5
11 files changed
+286 -11

No files matched your search

+141
View File
@@ -0,0 +1,141 @@
package delivery
import (
"context"
"crypto/ed25519"
"crypto/sha256"
"errors"
"github.com/jackc/pgx/v5"
)
type DirectoryDevice struct {
ID string `json:"id"`
Name string `json:"name"`
PublicKey []byte `json:"publicKey"`
}
type KeyPackage struct {
Package []byte `json:"package"`
Signature []byte `json:"signature"`
}
var ErrSignature = errors.New("invalid key package device signature")
var ErrPackageLimit = errors.New("device key package limit reached")
const acceptedContact = `
EXISTS (SELECT 1 FROM contact_relationships
WHERE first_user=LEAST($1::uuid,$2::uuid) AND second_user=GREATEST($1::uuid,$2::uuid)
AND status='accepted')
`
func (s *Store) Directory(ctx context.Context, owner, contact string) ([]DirectoryDevice, error) {
rows, err := s.db.Query(ctx, `
SELECT id,name,public_key FROM devices
WHERE user_id=$2 AND revoked_at IS NULL AND `+acceptedContact+`
ORDER BY id LIMIT 128`, owner, contact)
if err != nil {
return nil, err
}
defer rows.Close()
result := make([]DirectoryDevice, 0)
for rows.Next() {
var device DirectoryDevice
if err := rows.Scan(&device.ID, &device.Name, &device.PublicKey); err != nil {
return nil, err
}
result = append(result, device)
}
return result, rows.Err()
}
func (s *Store) PublishPackage(ctx context.Context, owner, device string, item KeyPackage) error {
tx, err := s.db.Begin(ctx)
if err != nil {
return err
}
defer tx.Rollback(ctx)
var public []byte
err = tx.QueryRow(ctx, "SELECT public_key FROM devices WHERE id=$1 AND user_id=$2 AND revoked_at IS NULL FOR UPDATE", device, owner).Scan(&public)
if errors.Is(err, pgx.ErrNoRows) {
return ErrUnavailable
}
if err != nil {
return err
}
binding := append([]byte("XHChat MLS KeyPackage v1\n"+owner+"\n"+device+"\n"), item.Package...)
if !ed25519.Verify(public, binding, item.Signature) {
return ErrSignature
}
hash := sha256.Sum256(item.Package)
var known bool
var available int
err = tx.QueryRow(ctx, `
SELECT count(*) FILTER (WHERE claimed_at IS NULL AND created_at > now() - interval '24 hours'),
COALESCE(bool_or(package_hash=$2),false)
FROM device_key_packages WHERE device_id=$1
`, device, hash[:]).Scan(&available, &known)
if err != nil {
return err
}
if known {
return tx.Commit(ctx)
}
if available >= 32 {
return ErrPackageLimit
}
if _, err := tx.Exec(ctx, "INSERT INTO device_key_packages(device_id,package_hash,package,signature) VALUES($1,$2,$3,$4)",
device, hash[:], item.Package, item.Signature); err != nil {
return err
}
return tx.Commit(ctx)
}
func (s *Store) ClaimPackage(ctx context.Context, owner, requester, contact, device string) (KeyPackage, error) {
var item KeyPackage
tx, err := s.db.Begin(ctx)
if err != nil {
return item, err
}
defer tx.Rollback(ctx)
if _, err := tx.Exec(ctx, "SELECT id FROM users WHERE id IN ($1,$2) ORDER BY id FOR UPDATE", owner, contact); err != nil {
return item, err
}
var friends bool
err = tx.QueryRow(ctx, "SELECT "+acceptedContact, owner, contact).Scan(&friends)
if err != nil {
return item, err
}
if !friends {
return item, ErrUnavailable
}
var active int
err = tx.QueryRow(ctx, `
SELECT count(*) FROM (
SELECT id FROM devices WHERE ((id=$1 AND user_id=$2) OR (id=$3 AND user_id=$4))
AND revoked_at IS NULL ORDER BY id FOR UPDATE
) AS active_devices
`, requester, owner, device, contact).Scan(&active)
if err != nil {
return item, err
}
if active != 2 {
return item, ErrUnavailable
}
err = tx.QueryRow(ctx, `
UPDATE device_key_packages SET claimed_at=now()
WHERE (device_id, package_hash)=(
SELECT device_id, package_hash FROM device_key_packages
WHERE device_id=$1 AND claimed_at IS NULL AND created_at > now() - interval '24 hours'
ORDER BY created_at, package_hash LIMIT 1
)
RETURNING package, signature
`, device).Scan(&item.Package, &item.Signature)
if errors.Is(err, pgx.ErrNoRows) {
return item, ErrUnavailable
}
if err != nil {
return item, err
}
return item, tx.Commit(ctx)
}
+6 -6
View File
@@ -67,11 +67,7 @@ func (s *Store) Send(ctx context.Context, sender, recipient, message string, cip
// This direct-message endpoint only connects accepted contacts.
// A separate authorization flow is needed for same-account device transfers.
var friends bool
err = tx.QueryRow(ctx, `
SELECT EXISTS (SELECT 1 FROM contact_relationships
WHERE first_user=LEAST($1::uuid,$2::uuid) AND second_user=GREATEST($1::uuid,$2::uuid)
AND status='accepted')
`, senderUser, recipientUser).Scan(&friends)
err = tx.QueryRow(ctx, "SELECT "+acceptedContact, senderUser, recipientUser).Scan(&friends)
if err != nil {
return "", err
}
@@ -126,6 +122,10 @@ func (s *Store) Inbox(ctx context.Context, recipient string, after int64) ([]Env
}
func (s *Store) Cleanup(ctx context.Context, retention time.Duration) error {
_, err := s.db.Exec(ctx, "DELETE FROM device_envelopes WHERE created_at < $1", time.Now().Add(-retention))
if _, err := s.db.Exec(ctx, "DELETE FROM device_envelopes WHERE created_at < $1", time.Now().Add(-retention)); err != nil {
return err
}
// Keep issued package hashes past the validity window of an individual upload.
_, err := s.db.Exec(ctx, "DELETE FROM device_key_packages WHERE created_at < now() - interval '90 days'")
return err
}