Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-02-23 22:43:42 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clarifications, minor fixes, formatting

Browse source
This commit is contained in:
Hubert Chathi 2019-08-27 17:46:45 -07:00
parent 4d31ddc8c9
commit e1b0042e7b
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
proposals/1756-cross-signing.md
View file

@ -27,8 +27,8 @@ Each user has three sets of key pairs:
- a user-signing key pair that is used to sign other users' master keys. - a user-signing key pair that is used to sign other users' master keys.
When one user (e.g. Alice) verifies another user's (Bob's) identity, Alice will When one user (e.g. Alice) verifies another user's (Bob's) identity, Alice will
sign Bob's self-signing key with her user-signing key. (This will mean that sign Bob's master key with her user-signing key. (This will mean that
verification methods will need to be modified to pass along the self-signing verification methods will need to be modified to pass along the master
identity key.) Alice's device will trust Bob's device if: identity key.) Alice's device will trust Bob's device if:
- Alice's device is using a master key that has signed her user-signing key, - Alice's device is using a master key that has signed her user-signing key,
@ -66,14 +66,18 @@ keys, respectively.
### Signature distribution ### Signature distribution
Currently, users will only be allowed to see signatures made by their own Currently, users will only be allowed to see
master, self-signing or user-signing keys, signatures of their own master key * signatures made by their own master, self-signing or user-signing keys,
made by their own devices, signatures made by other users' master or * signatures made by their own devices of their own master key,
self-signing keys about their own devices, or signatures made of other users' * signatures made by other users' self-signing keys about the other users' own
master keys by their own devices. This is done in order to preserve the devices,
privacy of social connections. Future proposals may define mechanisms for * signatures made by other users' master keys about the other users'
distributing signatures to other users in order to allow for other web-of-trust self-signing key, or
use cases. * signatures made by other users' devices about the other users' master keys.
This is done in order to preserve the privacy of social connections. Future
proposals may define mechanisms for distributing signatures to other users in
order to allow for other web-of-trust use cases.
### Migrating from device verifications ### Migrating from device verifications
@ -134,8 +138,7 @@ Auth](https://matrix.org/docs/spec/client_server/r0.4.0.html#user-interactive-au
} }
``` ```
Cross-signing keys are JSON objects with the following Cross-signing keys are JSON objects with the following properties:
properties:
* `user_id` (string): The user who owns the key * `user_id` (string): The user who owns the key
* `usage` ([string]): Allowed uses for the key. Must contain `"master"` for * `usage` ([string]): Allowed uses for the key. Must contain `"master"` for
@ -149,10 +152,10 @@ properties:
key MAY be signed by a device. key MAY be signed by a device.
In order to ensure that there will be no collisions in the `signatures` In order to ensure that there will be no collisions in the `signatures`
property, the server must respond with an error (FIXME: what error?) if any of property, the server must respond with an `M_FORBIDDEN` error if any of
the uploaded public keys match an existing device ID for the user. Similarly, the uploaded public keys match an existing device ID for the user. Similarly,
if a user attempts to log in specifying a device ID matching one of the signing if a user attempts to log in specifying a device ID matching one of the signing
keys, the server must respond with an error (FIXME: what error?). keys, the server must respond with an `M_FORBIDDEN` error.
If a self-signing or user-signing key is uploaded, it must be signed by the If a self-signing or user-signing key is uploaded, it must be signed by the
master key that is included in the request, or the current master key if no master key that is included in the request, or the current master key if no
@ -211,10 +214,10 @@ response:
} }
``` ```
Similarly, the federation endpoints `GET /user/keys/query` and Similarly, the federation endpoints `GET /user/keys/query` and `POST
`POST /user/devices/{userId}` will include the master and self-signing keys. /user/devices/{userId}` will include the master and self-signing keys. (It
(It will not include the user-signing key because it is not intended to be will not include the user-signing key because it is not intended to be visible
visible to other users.) to other users.)
`POST /keys/query` `POST /keys/query`