wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2247 from matrix-org/poljar/key_request_fix

Browse source 
Fix the action of a room key request cancellation.
This commit is contained in:
Travis Ralston 2019-08-26 09:46:57 -06:00 • committed by GitHub
commit 808eda404a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/2247.clarification Normal file
View file

@ -0,0 +1 @@
Fix the ``m.room_key_request`` ``action`` value, setting it from ``cancel_request`` to ``request_cancellation``.

2
event-schemas/examples/m.room_key_request$cancel_request
View file

@ -1,6 +1,6 @@
{ {
"content": { "content": {
"action": "cancel_request", "action": "request_cancellation",
"requesting_device_id": "RJYKSTBOIE", "requesting_device_id": "RJYKSTBOIE",
"request_id": "1495474790150.19" "request_id": "1495474790150.19"
}, },

2
event-schemas/schema/m.room_key_request
View file

@ -38,7 +38,7 @@ properties:
action: action:
enum: enum:
- request - request
- cancel_request - request_cancellation
type: string type: string
requesting_device_id: requesting_device_id:
description: ID of the device requesting the key. description: ID of the device requesting the key.

4
specification/modules/end_to_end_encryption.rst
View file

@ -756,8 +756,8 @@ sending `m.room_key_request`_ to-device messages to other devices with
device, it can forward the keys to the first device by sending an encrypted device, it can forward the keys to the first device by sending an encrypted
`m.forwarded_room_key`_ to-device message. The first device should then send an `m.forwarded_room_key`_ to-device message. The first device should then send an
`m.room_key_request`_ to-device message with ``action`` set to `m.room_key_request`_ to-device message with ``action`` set to
``cancel_request`` to the other devices that it had originally sent the key ``request_cancellation`` to the other devices that it had originally sent the key
request to; a device that receives a ``cancel_request`` should disregard any request to; a device that receives a ``request_cancellation`` should disregard any
previously-received ``request`` message with the same ``request_id`` and previously-received ``request`` message with the same ``request_id`` and
``requesting_device_id``. ``requesting_device_id``.