n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

hicli/profile: check device signature for own cross-signing keys

Browse source
This commit is contained in:
Tulir Asokan 2024-12-06 16:34:07 +02:00
parent 544bd17a1d
commit 838a9ce106
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/hicli/profile.go
View file

@ -140,13 +140,15 @@ func (h *HiClient) GetProfileView(ctx context.Context, roomID id.RoomID, userID
addError(fmt.Errorf("failed to get devices: %w", err)) addError(fmt.Errorf("failed to get devices: %w", err))
return return
} }
if ownUserSigningKey != "" && theirMasterKey.Key != "" { if userID == h.Account.UserID {
resp.UserTrusted, err = h.CryptoStore.IsKeySignedBy(ctx, userID, theirMasterKey.Key, userID, h.Crypto.OwnIdentity().SigningKey)
} else if ownUserSigningKey != "" && theirMasterKey.Key != "" {
resp.UserTrusted, err = h.CryptoStore.IsKeySignedBy(ctx, userID, theirMasterKey.Key, h.Account.UserID, ownUserSigningKey) resp.UserTrusted, err = h.CryptoStore.IsKeySignedBy(ctx, userID, theirMasterKey.Key, h.Account.UserID, ownUserSigningKey)
}
if err != nil { if err != nil {
log.Err(err).Msg("Failed to check if user is trusted") log.Err(err).Msg("Failed to check if user is trusted")
addError(fmt.Errorf("failed to check if user is trusted: %w", err)) addError(fmt.Errorf("failed to check if user is trusted: %w", err))
} }
}
resp.Devices = make([]*ProfileViewDevice, len(devices)) resp.Devices = make([]*ProfileViewDevice, len(devices))
i := 0 i := 0
for _, device := range devices { for _, device := range devices {