1
0
Commit Graph

14839 Commits

Author SHA1 Message Date
Jorik Schellekens eee4eff050 Bind exception to name 2019-08-05 16:11:54 +01:00
Jorik Schellekens a68119e676 Merge remote-tracking branch 'origin/develop' into joriks/opentracing_e2e 2019-08-05 16:03:37 +01:00
Jorik Schellekens 82d6eb186c Remove unused import 2019-08-05 15:12:17 +01:00
Jorik Schellekens 4f36a2dfec Create and use a method to get the span context as a dict. 2019-08-05 15:02:29 +01:00
Jorik Schellekens bd0ed7b0c4 Docstrings shouldn't lie. 2019-08-05 14:44:19 +01:00
Jorik Schellekens 6a355ca20a Refactor for clarity. 2019-08-05 14:26:30 +01:00
Jorik Schellekens 22b7e6a011 Debug comments gone rampant. 2019-08-05 14:23:11 +01:00
Jorik Schellekens f76b071c99 Remove redundent spans. 2019-08-05 14:21:55 +01:00
Jorik Schellekens 7ab2088ddc Remove redundent tagging. 2019-08-05 14:06:56 +01:00
Jorik Schellekens 03958693ce Use underscores. 2019-08-05 13:59:04 +01:00
Jorik Schellekens 50964d2341 String concatenation without the '+' 2019-08-05 13:56:04 +01:00
Jorik Schellekens e7f42857bb Refactor return value so we don't create identical lists each time. 2019-08-05 13:48:09 +01:00
Jorik Schellekens d859c34fb9 Nicer use of dict update methods. 2019-08-05 12:16:10 +01:00
Jorik Schellekens 46e41ee08d Comment for 'context' column in device_lists_outbound_pokes' 2019-08-05 11:48:10 +01:00
Jorik Schellekens 35eb018c02 Double negatives do not make code that isn't unclear..
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-08-05 11:39:58 +01:00
Jorik Schellekens 8b53f8e9bd Typo
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-08-05 11:36:50 +01:00
Jorik Schellekens 08aaad0756 Nicer changelog
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-08-05 11:30:18 +01:00
Brendan Abolivier 8ed9e63432 Account validity: allow defining HTML templates to serve the us… (#5807)
Account validity: allow defining HTML templates to serve the user on account renewal attempt
2019-08-01 16:09:25 +02:00
Erik Johnston d55bc4a8bf Merge pull request #5810 from matrix-org/erikj/no_server_reachable
Return 502 not 500 when failing to reach any remote server.
2019-08-01 14:19:39 +01:00
Andrew Morgan 5d018d23f0 Have ClientReaderSlavedStore inherit RegistrationStore (#5806)
Fixes #5803
2019-08-01 13:54:56 +01:00
Erik Johnston 93fd3cbc7a Newsfile 2019-08-01 13:48:52 +01:00
Erik Johnston 3c076c79c5 Merge pull request #5808 from matrix-org/erikj/parse_decode_error
Handle incorrectly encoded query params correctly
2019-08-01 13:48:10 +01:00
Erik Johnston a8f40a8302 Return 502 not 500 when failing to reach any remote server. 2019-08-01 13:47:31 +01:00
Erik Johnston 55a0c98d16 Merge pull request #5805 from matrix-org/erikj/validate_state
Validate well known state events are state events.
2019-08-01 13:45:48 +01:00
Erik Johnston 0b36decfb6 Merge pull request #5801 from matrix-org/erikj/recursive_tombstone
Don't allow clients to send tombstones that reference the same room
2019-08-01 13:45:35 +01:00
Erik Johnston da378af445 Newsfile 2019-08-01 13:24:00 +01:00
Erik Johnston d2e3d5b9db Handle incorrectly encoded query params correctly 2019-08-01 13:23:00 +01:00
Erik Johnston 76a58fdcce Fix spelling.
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-01 13:17:55 +01:00
Erik Johnston 58af30a6c7 Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room
Deny redaction of events in a different room.
2019-08-01 13:14:46 +01:00
Erik Johnston 0f632f3a57 Merge pull request #5790 from matrix-org/erikj/groups_request_errors
Handle RequestSendFailed exception correctly in more places.
2019-08-01 13:14:08 +01:00
Erik Johnston ad167c3849 Merge pull request #5804 from matrix-org/erikj/match_against_state_key
Explicitly check that tombstone is a state event before notifying.
2019-08-01 13:13:33 +01:00
Brendan Abolivier f25f638c35 Lint 2019-08-01 12:19:08 +02:00
Brendan Abolivier 3ff3dfe5a3 Sample config 2019-08-01 12:08:25 +02:00
Brendan Abolivier f4a30d286f Changelog 2019-08-01 12:08:06 +02:00
Brendan Abolivier bc35503528 Add tests 2019-08-01 12:00:08 +02:00
Brendan Abolivier a4a9ded4d0 Allow defining HTML templates to serve the user on account renewal 2019-08-01 11:59:27 +02:00
Erik Johnston e5a0224837 Newsfile 2019-07-31 16:39:42 +01:00
Erik Johnston dc4d74e44a Validate well-known state events are state events.
Lets disallow sending things like memberships, topics etc as non-state
events.
2019-07-31 16:36:20 +01:00
Erik Johnston c5288e9984 Newsfile 2019-07-31 16:32:03 +01:00
Erik Johnston 2e697d3013 Explicitly check that tombstone is a state event before notifying. 2019-07-31 16:32:03 +01:00
Erik Johnston 0eefb76fa1 Newsfile 2019-07-31 16:13:57 +01:00
Erik Johnston cf89266b98 Deny redaction of events in a different room.
We already correctly filter out such redactions, but we should also deny
them over the CS API.
2019-07-31 16:12:27 +01:00
Erik Johnston 02735e140f Newsfile 2019-07-31 15:53:52 +01:00
Erik Johnston f31d4cb7a2 Don't allow clients to send tombstones that reference the same room 2019-07-31 15:52:27 +01:00
Andrew Morgan 72167fb394 Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)
This is intended as an amendment to #5674 as using M_UNKNOWN as the errcode makes it hard for clients to differentiate between an invalid password and a deactivated user (the problem we were trying to solve in the first place).

M_UNKNOWN was originally chosen as it was presumed than an MSC would have to be carried out to add a new code, but as Synapse often is the testing bed for new MSC implementations, it makes sense to try it out first in the wild and then add it into the spec if it is successful. Thus this PR return a new M_USER_DEACTIVATED code when a deactivated user attempts to login.
2019-07-31 15:19:06 +01:00
Andrew Morgan 58a755cdc3 Remove duplicate return statement 2019-07-31 13:24:51 +01:00
Erik Johnston 8fde611a8c Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known
Share SSL options for well-known requests
2019-07-31 11:40:02 +01:00
Amber Brown 8f15832950 Remove DelayedCall debugging from test runs (#5787) 2019-07-31 20:39:22 +10:00
Erik Johnston 9fe6ad5fef Merge pull request #5796 from matrix-org/erikj/disable_codecov_report
Disable codecov reports to GH comments.
2019-07-31 11:16:15 +01:00
Erik Johnston fe2f2fc530 Newsfile 2019-07-31 10:59:39 +01:00