Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Cross-signing [2/4] - upload/download keys #5769

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
d1c7c2a
allow devices to be marked as "hidden"
uhoreg Jul 25, 2019
c659b9f
allow uploading keys for cross-signing
uhoreg Jul 25, 2019
781ade8
apply changes from PR review
uhoreg Jul 31, 2019
2997a91
add changelog file
uhoreg Jul 31, 2019
bc95890
Merge branch 'cross-signing_hidden' into cross-signing_keys
uhoreg Jul 31, 2019
c1f0a56
Merge branch 'develop' into cross-signing_hidden
uhoreg Jul 31, 2019
185188b
remove extra SQL query param
uhoreg Jul 31, 2019
430ea08
PostgreSQL, Y U no like?
uhoreg Jul 31, 2019
73b26f8
really fix queries to work with Postgres
uhoreg Jul 31, 2019
d78a4fe
don't need to return the hidden column any more
uhoreg Aug 1, 2019
336c546
Merge branch 'cross-signing_hidden' into cross-signing_keys
uhoreg Aug 1, 2019
fac1cdc
make changes from PR review
uhoreg Aug 2, 2019
d28d1e2
add changelog
uhoreg Aug 2, 2019
8c9adcc
fix formatting
uhoreg Aug 2, 2019
7c3abc6
apply PR review suggestions
uhoreg Aug 21, 2019
814f253
make isort happy
uhoreg Aug 21, 2019
3b0b22c
use stream ID generator instead of timestamp
uhoreg Aug 29, 2019
96bda56
black
uhoreg Aug 29, 2019
e3d3fbf
Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys
uhoreg Aug 29, 2019
e701128
Fix coverage in sytest and use plugins for buildkite (#5922)
hawkowl Aug 29, 2019
5625abe
Fix buildkite pipeline plugin matrix-org/annotate using the wrong var…
hawkowl Aug 30, 2019
3057095
Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)
anoadragon453 Aug 30, 2019
d19505a
Removed unused jenkins/ folder and script (#5938)
hawkowl Aug 30, 2019
4765f0c
Add m.id_access_token flag (#5930)
anoadragon453 Aug 30, 2019
4fca313
Move buildkite config to the pipelines repo (#5943)
hawkowl Aug 30, 2019
4548d1f
Remove unnecessary parentheses around return statements (#5931)
anoadragon453 Aug 30, 2019
2a012e8
Revert "Add m.id_access_token flag (#5930)" (#5945)
anoadragon453 Aug 30, 2019
cee00a3
Update INSTALL.md to say that Python 2 is no longer supported (#5953)
aaronraimist Sep 2, 2019
ce7803b
fix thumbnail storage location (#5915)
L0ric0 Sep 2, 2019
36f34e6
Remove unused methods from c/s api v1 in register.py (#5963)
anoadragon453 Sep 2, 2019
a90d16d
Opentrace device lists (#5853)
JorikSchellekens Sep 3, 2019
2a44782
Remove double return statements (#5962)
anoadragon453 Sep 3, 2019
8401bcd
fix typo
ara4n Sep 3, 2019
0eac707
Ensure an auth instance is available to ListMediaInRoom (#5967)
turt2live Sep 3, 2019
894c1a5
Docker packaging should not su-exec or chmod if already running as UI…
michaelkaye Sep 3, 2019
a98b858
Remove unnecessary variable declaration
anoadragon453 Sep 3, 2019
6b6086b
Fix docstring
anoadragon453 Sep 3, 2019
2f416fc
Ensure the list media admin API is always available (#5966)
turt2live Sep 3, 2019
ea128a3
code cleanups
anoadragon453 Sep 3, 2019
6e834e9
Fix and refactor room and user stats (#5971)
erikjohnston Sep 4, 2019
b09d443
Cleanup event auth type initialisation (#5975)
anoadragon453 Sep 4, 2019
b736c6c
Remove bind_email and bind_msisdn (#5964)
anoadragon453 Sep 4, 2019
faf72a4
Merge branch 'develop' into cross-signing_keys
uhoreg Sep 4, 2019
a22d58c
add user signature stream change cache to slaved device store
uhoreg Sep 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .buildkite/docker-compose.py35.pg95.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ services:
SYNAPSE_POSTGRES_HOST: postgres
SYNAPSE_POSTGRES_USER: postgres
SYNAPSE_POSTGRES_PASSWORD: postgres
working_dir: /app
working_dir: /src
volumes:
- ..:/app
- ..:/src
4 changes: 2 additions & 2 deletions .buildkite/docker-compose.py37.pg11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ services:
SYNAPSE_POSTGRES_HOST: postgres
SYNAPSE_POSTGRES_USER: postgres
SYNAPSE_POSTGRES_PASSWORD: postgres
working_dir: /app
working_dir: /src
volumes:
- ..:/app
- ..:/src
4 changes: 2 additions & 2 deletions .buildkite/docker-compose.py37.pg95.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ services:
SYNAPSE_POSTGRES_HOST: postgres
SYNAPSE_POSTGRES_USER: postgres
SYNAPSE_POSTGRES_PASSWORD: postgres
working_dir: /app
working_dir: /src
volumes:
- ..:/app
- ..:/src
15 changes: 15 additions & 0 deletions .buildkite/format_tap.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# -*- coding: utf-8 -*-
# Copyright 2019 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.

import sys
from tap.parser import Parser
from tap.line import Result, Unknown, Diagnostic
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/merge_base_branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ git config --global user.name "A robot"

# Fetch and merge. If it doesn't work, it will raise due to set -e.
git fetch -u origin $GITBASE
git merge --no-edit origin/$GITBASE
git merge --no-edit --no-commit origin/$GITBASE

# Show what we are after.
git --no-pager show -s
248 changes: 0 additions & 248 deletions .buildkite/pipeline.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[run]
branch = True
parallel = True
include = synapse/*
include=$TOP/synapse/*
data_file = $TOP/.coverage

[report]
precision = 2
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ that your email address is probably `[email protected]` rather than
System requirements:

- POSIX-compliant system (tested on Linux & OS X)
- Python 3.5, 3.6, 3.7, or 2.7
- Python 3.5, 3.6, or 3.7
- At least 1GB of free RAM if you want to join large public rooms like #matrix:matrix.org

Synapse is written in Python but some of the libraries it uses are written in
Expand Down Expand Up @@ -421,7 +421,7 @@ If Synapse is not configured with an SMTP server, password reset via email will

The easiest way to create a new user is to do so from a client like [Riot](https://riot.im).

Alternatively you can do so from the command line if you have installed via pip.
Alternatively you can do so from the command line if you have installed via pip.

This can be done as follows:

Expand Down
1 change: 1 addition & 0 deletions changelog.d/5769.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow uploading of cross-signing keys.
1 change: 1 addition & 0 deletions changelog.d/5853.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Opentracing for device list updates.
1 change: 0 additions & 1 deletion changelog.d/5897.feature

This file was deleted.

1 change: 1 addition & 0 deletions changelog.d/5915.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix 404 for thumbnail download when `dynamic_thumbnails` is `false` and the thumbnail was dynamically generated. Fix reported by rkfg.
1 change: 1 addition & 0 deletions changelog.d/5922.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Buildkite pipeline to use plugins instead of buildkite-agent commands.
1 change: 1 addition & 0 deletions changelog.d/5931.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unnecessary parentheses in return statements.
1 change: 1 addition & 0 deletions changelog.d/5938.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unused jenkins/prepare_sytest.sh file.
1 change: 1 addition & 0 deletions changelog.d/5943.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move Buildkite pipeline config to the pipelines repo.
1 change: 1 addition & 0 deletions changelog.d/5953.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update INSTALL.md to say that Python 2 is no longer supported.
1 change: 1 addition & 0 deletions changelog.d/5962.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unnecessary return statements in the codebase which were the result of a regex run.
1 change: 1 addition & 0 deletions changelog.d/5963.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove left-over methods from C/S registration API.
1 change: 1 addition & 0 deletions changelog.d/5964.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove `bind_email` and `bind_msisdn` parameters from /register ala MSC2140.
1 change: 1 addition & 0 deletions changelog.d/5966.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix admin API for listing media in a room not being available with an external media repo.
1 change: 1 addition & 0 deletions changelog.d/5967.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix list media admin API always returning an error.
1 change: 1 addition & 0 deletions changelog.d/5970.docker
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid changing UID/GID if they are already correct.
1 change: 1 addition & 0 deletions changelog.d/5971.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix room and user stats tracking.
1 change: 1 addition & 0 deletions changelog.d/5975.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cleanup event auth type initialisation.
Loading