archive
/
matrix-spec-proposals
mirror of https://github.com/matrix-org/matrix-spec-proposals
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2639 from uhoreg/backup_version_required

Browse Source 
various key backups fixes
pull/2667/head
Hubert Chathi 4 years ago committed by GitHub
parent 782aed7383 b44ebaa32e
commit a91c6446bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File

38
api/client-server/definitions/room_key_backup.yaml
Unescape Escape View File

@ -0,0 +1,38 @@
# Copyright 2020 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
type: object
title: RoomKeyBackup
description: "The backed up keys for a room."
properties:
sessions:
type: object
description: "A map of session IDs to key data."
additionalProperties:
allOf:
- $ref: "key_backup_data.yaml"
example: {
"sessionid1": {
"first_message_index": 1,
"forwarded_count": 0,
"is_verified": true,
"session_data": {
"ephemeral": "base64+ephemeral+key",
"ciphertext": "base64+ciphertext+of+JSON+data",
"mac": "base64+mac+of+ciphertext"
}
}
}
required:
- sessions

89
api/client-server/key_backup.yaml
Unescape Escape View File

@ -130,7 +130,7 @@ paths:
example: "anopaquestring" example: "anopaquestring"
version: version:
type: string type: string
description: The backup version description: The backup version.
example: "1" example: "1"
required: required:
- algorithm - algorithm
@ -212,7 +212,7 @@ paths:
example: "anopaquestring" example: "anopaquestring"
version: version:
type: string type: string
description: The backup version description: The backup version.
example: "1" example: "1"
required: required:
- algorithm - algorithm
@ -450,7 +450,7 @@ paths:
type: string type: string
name: version name: version
description: |- description: |-
The backup from which to retrieve the key The backup from which to retrieve the key.
required: true required: true
x-example: "1" x-example: "1"
- in: path - in: path
@ -569,22 +569,7 @@ paths:
description: "The backup data" description: "The backup data"
name: backupData name: backupData
schema: schema:
type: object $ref: "definitions/room_key_backup.yaml"
properties:
sessions:
type: object
description: |-
A map of session IDs to key data.
additionalProperties:
allOf:
- $ref: "definitions/key_backup_data.yaml"
example: {
"sessionid1": {
"ephemeral": "base64+ephemeral+key",
"ciphertext": "base64+ciphertext+of+JSON+data",
"mac": "base64+mac+of+ciphertext"
}
}
responses: responses:
200: 200:
description: The update succeeded description: The update succeeded
@ -645,7 +630,7 @@ paths:
type: string type: string
name: version name: version
description: |- description: |-
The backup from which to retrieve the key The backup from which to retrieve the key.
required: true required: true
x-example: "1" x-example: "1"
- in: path - in: path
@ -661,21 +646,7 @@ paths:
``sessions`` property will be returned (``{"sessions": {}}``). ``sessions`` property will be returned (``{"sessions": {}}``).
schema: schema:
type: object type: object
properties: $ref: "definitions/room_key_backup.yaml"
sessions:
type: object
description: |-
A map of session IDs to key data.
additionalProperties:
allOf:
- $ref: "definitions/key_backup_data.yaml"
example: {
"sessionid1": {
"ephemeral": "base64+ephemeral+key",
"ciphertext": "base64+ciphertext+of+JSON+data",
"mac": "base64+mac+of+ciphertext"
}
}
404: 404:
description: |- description: |-
The backup was not found. The backup was not found.
@ -702,7 +673,7 @@ paths:
type: string type: string
name: version name: version
description: |- description: |-
The backup from which to delete the key The backup from which to delete the key.
required: true required: true
x-example: "1" x-example: "1"
- in: path - in: path
@ -761,7 +732,7 @@ paths:
required: true required: true
x-example: "1" x-example: "1"
- in: body - in: body
description: "The backup data" description: "The backup data."
name: backupData name: backupData
schema: schema:
type: object type: object
@ -769,23 +740,28 @@ paths:
rooms: rooms:
type: object type: object
description: |- description: |-
A map of room IDs to session IDs to key data. A map of room IDs to room key backup data.
additionalProperties: additionalProperties:
type: object allOf:
additionalProperties: - $ref: "definitions/room_key_backup.yaml"
allOf:
- $ref: "definitions/key_backup_data.yaml"
example: { example: {
"!room:example.org": { "!room:example.org": {
"sessions": { "sessions": {
"sessionid1": { "sessionid1": {
"ephemeral": "base64+ephemeral+key", "first_message_index": 1,
"ciphertext": "base64+ciphertext+of+JSON+data", "forwarded_count": 0,
"mac": "base64+mac+of+ciphertext" "is_verified": true,
"session_data": {
"ephemeral": "base64+ephemeral+key",
"ciphertext": "base64+ciphertext+of+JSON+data",
"mac": "base64+mac+of+ciphertext"
}
} }
} }
} }
} }
required:
- rooms
responses: responses:
200: 200:
description: The update succeeded description: The update succeeded
@ -846,8 +822,8 @@ paths:
type: string type: string
name: version name: version
description: |- description: |-
The backup from which to retrieve the keys. If omitted, the keys are The backup from which to retrieve the keys.
retrieved from the current backup. required: true
x-example: "1" x-example: "1"
responses: responses:
200: 200:
@ -860,19 +836,22 @@ paths:
rooms: rooms:
type: object type: object
description: |- description: |-
A map of room IDs to session IDs to key data. A map of room IDs to room key backup data.
additionalProperties: additionalProperties:
type: object allOf:
additionalProperties: - $ref: "definitions/room_key_backup.yaml"
allOf:
- $ref: "definitions/key_backup_data.yaml"
example: { example: {
"!room:example.org": { "!room:example.org": {
"sessions": { "sessions": {
"sessionid1": { "sessionid1": {
"ephemeral": "base64+ephemeral+key", "first_message_index": 1,
"ciphertext": "base64+ciphertext+of+JSON+data", "forwarded_count": 0,
"mac": "base64+mac+of+ciphertext" "is_verified": true,
"session_data": {
"ephemeral": "base64+ephemeral+key",
"ciphertext": "base64+ciphertext+of+JSON+data",
"mac": "base64+mac+of+ciphertext"
}
} }
} }
} }

1
changelogs/client_server/2639.clarification
Unescape Escape View File

@ -0,0 +1 @@
Fixed some errors in the key backup spec.
Write Preview
Loading…
Cancel
Save