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

Commit

Permalink
Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1
Browse files Browse the repository at this point in the history
Cross-signing [2/4] - upload/download keys
  • Loading branch information
uhoreg authored Sep 4, 2019
2 parents 72d296a + a22d58c commit 19bb5c8
Show file tree
Hide file tree
Showing 141 changed files with 2,808 additions and 1,713 deletions.
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

0 comments on commit 19bb5c8

Please sign in to comment.