实现 Windows 与 Web 加密文字群聊预览
This commit is contained in:
1 parent
709e6aa6a6
commit
ea6aec3323
19 files changed
+809
-31
No files matched your search
@@ -184,7 +184,17 @@ func (s *Store) ClaimPackage(ctx context.Context, owner, requester, contact, dev
|
||||
if active != 2 {
|
||||
return item, ErrUnavailable
|
||||
}
|
||||
err = tx.QueryRow(ctx, `
|
||||
item, err = TakePackage(ctx, tx, device)
|
||||
if err != nil {
|
||||
return item, err
|
||||
}
|
||||
return item, tx.Commit(ctx)
|
||||
}
|
||||
|
||||
// TakePackage consumes a key package while the caller holds the device row lock.
|
||||
func TakePackage(ctx context.Context, tx pgx.Tx, device string) (KeyPackage, error) {
|
||||
var item KeyPackage
|
||||
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
|
||||
@@ -196,8 +206,5 @@ func (s *Store) ClaimPackage(ctx context.Context, owner, requester, contact, dev
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return item, ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return item, err
|
||||
}
|
||||
return item, tx.Commit(ctx)
|
||||
return item, err
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
package groups
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"xhchat/server/internal/delivery"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
)
|
||||
|
||||
type GroupDevice struct {
|
||||
delivery.DirectoryDevice
|
||||
User string `json:"user"`
|
||||
}
|
||||
|
||||
func (s *Store) Devices(ctx context.Context, group, user, device string) ([]GroupDevice, error) {
|
||||
tx, err := s.db.BeginTx(ctx, pgx.TxOptions{IsoLevel: pgx.RepeatableRead, AccessMode: pgx.ReadOnly})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
if err = readAccess(ctx, tx, group, user, device); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := tx.Query(ctx, `
|
||||
SELECT d.id,d.name,d.public_key,m.user_id,c.public_key,c.signature
|
||||
FROM group_members m JOIN devices d ON d.user_id=m.user_id
|
||||
JOIN device_mls_credentials c ON c.device_id=d.id
|
||||
WHERE m.group_id=$1 AND m.state='active' AND d.revoked_at IS NULL ORDER BY d.id
|
||||
`, group)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
result := make([]GroupDevice, 0)
|
||||
for rows.Next() {
|
||||
var entry GroupDevice
|
||||
entry.MLS = &delivery.Credential{}
|
||||
if err = rows.Scan(&entry.ID, &entry.Name, &entry.PublicKey, &entry.User, &entry.MLS.PublicKey, &entry.MLS.Signature); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result = append(result, entry)
|
||||
}
|
||||
if err = rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, tx.Commit(ctx)
|
||||
}
|
||||
|
||||
func (s *Store) Claim(ctx context.Context, group, user, sender, target string) (delivery.KeyPackage, error) {
|
||||
tx, err := s.db.Begin(ctx)
|
||||
if err != nil {
|
||||
return delivery.KeyPackage{}, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
_, owner, err := lockTransport(ctx, tx, group, user, sender)
|
||||
if err != nil {
|
||||
return delivery.KeyPackage{}, err
|
||||
}
|
||||
if !owner || sender == target {
|
||||
return delivery.KeyPackage{}, ErrAction
|
||||
}
|
||||
var device string
|
||||
err = tx.QueryRow(ctx, `
|
||||
SELECT d.id FROM devices d JOIN group_members m ON m.user_id=d.user_id
|
||||
JOIN device_mls_credentials c ON c.device_id=d.id
|
||||
WHERE m.group_id=$1 AND m.state='active' AND d.id=$2 AND d.revoked_at IS NULL AND d.user_id<>$3
|
||||
FOR UPDATE OF d
|
||||
`, group, target, user).Scan(&device)
|
||||
if err == pgx.ErrNoRows {
|
||||
return delivery.KeyPackage{}, ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return delivery.KeyPackage{}, err
|
||||
}
|
||||
pack, err := delivery.TakePackage(ctx, tx, device)
|
||||
if err == delivery.ErrUnavailable {
|
||||
return pack, ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return pack, err
|
||||
}
|
||||
return pack, tx.Commit(ctx)
|
||||
}
|
||||
@@ -23,11 +23,12 @@ type Epoch struct {
|
||||
}
|
||||
|
||||
type AvailableEpoch struct {
|
||||
ID string `json:"id"`
|
||||
Version string `json:"membershipVersion"`
|
||||
Creator string `json:"creatorDevice"`
|
||||
Welcome []byte `json:"welcome,omitempty"`
|
||||
Current bool `json:"current"`
|
||||
ID string `json:"id"`
|
||||
Version string `json:"membershipVersion"`
|
||||
Creator string `json:"creatorDevice"`
|
||||
Welcome []byte `json:"welcome,omitempty"`
|
||||
Current bool `json:"current"`
|
||||
Roster []string `json:"roster"`
|
||||
}
|
||||
|
||||
type Message struct {
|
||||
@@ -274,14 +275,18 @@ func (s *Store) Epochs(ctx context.Context, group, user, device string) ([]Avail
|
||||
}
|
||||
rows, err := tx.Query(ctx, `
|
||||
SELECT e.id,e.membership_version::text,e.creator_device,d.welcome,
|
||||
e.membership_version=g.membership_version AND e.retired_at IS NULL AND NOT EXISTS (
|
||||
SELECT 1 FROM group_epoch_devices x JOIN devices bound ON bound.id=x.device_id
|
||||
WHERE x.group_id=e.group_id AND x.epoch_id=e.id AND bound.revoked_at IS NOT NULL
|
||||
)
|
||||
phase.current, ARRAY(SELECT x.device_id::text FROM group_epoch_devices x
|
||||
WHERE x.group_id=e.group_id AND x.epoch_id=e.id ORDER BY x.device_id)
|
||||
FROM group_epochs e JOIN chat_groups g ON g.id=e.group_id
|
||||
JOIN group_epoch_devices d ON d.group_id=e.group_id AND d.epoch_id=e.id AND d.device_id=$3
|
||||
LEFT JOIN group_epoch_devices d ON d.group_id=e.group_id AND d.epoch_id=e.id AND d.device_id=$3
|
||||
JOIN group_members m ON m.group_id=e.group_id AND m.user_id=$2
|
||||
WHERE e.group_id=$1 AND e.membership_version>=m.joined_version
|
||||
CROSS JOIN LATERAL (
|
||||
SELECT e.membership_version=g.membership_version AND e.retired_at IS NULL AND NOT EXISTS (
|
||||
SELECT 1 FROM group_epoch_devices x JOIN devices bound ON bound.id=x.device_id
|
||||
WHERE x.group_id=e.group_id AND x.epoch_id=e.id AND bound.revoked_at IS NOT NULL
|
||||
) AS current
|
||||
) phase
|
||||
WHERE e.group_id=$1 AND e.membership_version>=m.joined_version AND (d.device_id IS NOT NULL OR phase.current)
|
||||
ORDER BY e.created_at DESC,e.id LIMIT 200
|
||||
`, group, user, device)
|
||||
if err != nil {
|
||||
@@ -291,7 +296,7 @@ func (s *Store) Epochs(ctx context.Context, group, user, device string) ([]Avail
|
||||
result := make([]AvailableEpoch, 0)
|
||||
for rows.Next() {
|
||||
var e AvailableEpoch
|
||||
if err = rows.Scan(&e.ID, &e.Version, &e.Creator, &e.Welcome, &e.Current); err != nil {
|
||||
if err = rows.Scan(&e.ID, &e.Version, &e.Creator, &e.Welcome, &e.Current, &e.Roster); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result = append(result, e)
|
||||
|
||||
@@ -68,6 +68,8 @@ func New(accounts *account.Store, contactStore *contacts.Store, envelopeStore *d
|
||||
mux.HandleFunc("POST /api/v1/groups/{id}/epochs", a.authorized(a.publishGroupEpoch))
|
||||
mux.HandleFunc("GET /api/v1/groups/{id}/messages", a.authorized(a.groupInbox))
|
||||
mux.HandleFunc("POST /api/v1/groups/{id}/messages", a.authorized(a.sendGroupMessage))
|
||||
mux.HandleFunc("GET /api/v1/groups/{id}/devices", a.authorized(a.groupDevices))
|
||||
mux.HandleFunc("POST /api/v1/groups/{id}/devices/{device}/claim", a.authorized(a.claimGroupPackage))
|
||||
return a.boundary(mux)
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,37 @@ import (
|
||||
"xhchat/server/internal/groups"
|
||||
)
|
||||
|
||||
func (a *API) groupDevices(w http.ResponseWriter, r *http.Request, _ string, actor account.Identity) {
|
||||
id := r.PathValue("id")
|
||||
if !uuidPattern.MatchString(id) {
|
||||
groupError(w, groups.ErrUnavailable)
|
||||
return
|
||||
}
|
||||
result, err := a.groups.Devices(r.Context(), id, actor.User.ID, actor.Device.ID)
|
||||
if err != nil {
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
respond(w, 200, result)
|
||||
}
|
||||
|
||||
func (a *API) claimGroupPackage(w http.ResponseWriter, r *http.Request, _ string, actor account.Identity) {
|
||||
id, target := r.PathValue("id"), strings.ToLower(r.PathValue("device"))
|
||||
if !uuidPattern.MatchString(id) || !uuidPattern.MatchString(target) {
|
||||
groupError(w, groups.ErrUnavailable)
|
||||
return
|
||||
}
|
||||
if !a.limit(w, r, "group-claim:"+actor.Device.ID, 64) {
|
||||
return
|
||||
}
|
||||
pack, err := a.groups.Claim(r.Context(), id, actor.User.ID, actor.Device.ID, target)
|
||||
if err != nil {
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
respond(w, 200, pack)
|
||||
}
|
||||
|
||||
func (a *API) groupEpochs(w http.ResponseWriter, r *http.Request, _ string, actor account.Identity) {
|
||||
id := r.PathValue("id")
|
||||
if !uuidPattern.MatchString(id) {
|
||||
|
||||
Reference in new issue
Block a user