Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 1 | -1/+1 |
|\ | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | ||||
| * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 1 | -1/+1 |
| | | |||||
* | | take idna implementation from twisted | Jeroen | 2018-06-26 | 1 | -2/+2 |
| | | |||||
* | | allow self-signed certificates | Jeroen | 2018-06-26 | 1 | -23/+35 |
| | | |||||
* | | formatting changes for pep8 | Jeroen | 2018-06-25 | 1 | -2/+2 |
| | | |||||
* | | send SNI for federation requests | Jeroen | 2018-06-24 | 3 | -5/+37 |
|/ | |||||
* | Try to log more helpful info when a sig verification fails | Richard van der Hoff | 2018-06-08 | 1 | -6/+25 |
| | | | | | | | | Firstly, don't swallow the reason for the failure Secondly, don't assume all exceptions are verification failures Thirdly, log a bit of info about the key being used if debug is enabled | ||||
* | Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157) | Will Hunt | 2018-04-30 | 1 | -4/+5 |
| | | | | | fixes #3135 Signed-off-by: Will Hunt will@half-shot.uk | ||||
* | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 1 | -45/+48 |
|\ | |||||
| * | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 1 | -45/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background. | ||||
* | | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 1 | -11/+17 |
|/ | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object. | ||||
* | Use str(e) instead of e.message | Adrian Tschira | 2018-04-15 | 1 | -4/+4 |
| | | | | | | | Doing this I learned e.message was pretty shortlived, added in 2.6, they realized it was a bad idea and deprecated it in 2.7 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | Fix 500 when joining matrix-dev | Richard van der Hoff | 2017-11-29 | 1 | -3/+10 |
| | | | | | | | matrix-dev has an event (`$/6ANj/9QWQyd71N6DpRQPf+SDUu11+HVMeKSpMzBCwM:zemos.net`) which has no `hashes` member. Check for missing `hashes` element in events. | ||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 3 | -3/+3 |
| | | | | what could possibly go wrong | ||||
* | Merge branch 'develop' into develop | Richard van der Hoff | 2017-09-25 | 2 | -136/+166 |
|\ | |||||
| * | Fix logcontxt leak in keyclient (#2465) | Richard van der Hoff | 2017-09-25 | 1 | -12/+5 |
| | | | | | | preserve_context_over_function doesn't do what you want it to do. | ||||
| * | Fix logcontext handling in verify_json_objects_for_server | Richard van der Hoff | 2017-09-20 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | preserve_context_over_fn is essentially broken, because (a) it pointlessly drops the current logcontext before calling its wrapped function, which means we don't get any useful logcontexts for _handle_key_deferred; (b) it wraps the resulting deferred in a _PreservingContextDeferred, which is very dangerous because you then can't yield on it without leaking context back into the reactor. Instead, let's specify that the resultant deferreds call their callbacks with no logcontext. | ||||
| * | Turn _start_key_lookups into an inlineCallbacks function | Richard van der Hoff | 2017-09-20 | 1 | -40/+37 |
| | | | | | | | | | | | | | | | | | | | | | | ... which means that logcontexts can be correctly preserved for the stuff it does. get_server_verify_keys is now called with the logcontext, so needs to preserve_fn when it fires off its nested inlineCallbacks function. Also renames get_server_verify_keys to reflect the fact it's meant to be private. | ||||
| * | Fix potential race in _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | If the verify_request.deferred has already completed, then `remove_deferreds` will be called immediately. It therefore might resolve the server_to_deferred deferred while there are still other requests for that server in flight. To avoid that, we should build the complete list of requests, and *then* add the callbacks. | ||||
| * | Add some comments to _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -0/+8 |
| | | |||||
| * | Consistency for how verify_request.deferred is called | Richard van der Hoff | 2017-09-20 | 1 | -13/+17 |
| | | | | | | | | | | | | | | | | | | | | Define that it is run with no log context, and make sure that happens. If we aren't careful to reset the logcontext, we can't bung the deferreds into defer.gatherResults etc. We don't actually do that directly, but we *do* resolve other deferreds from affected callbacks (notably the server_to_deferred map in _start_key_lookups), and those *do* get passed into defer.gatherResults. It turns out that this way ends up being least confusing. | ||||
| * | Factor out _start_key_lookups | Richard van der Hoff | 2017-09-20 | 1 | -7/+17 |
| | | | | | | | | ... to make it easier to see what's going on. | ||||
| * | Replace `server_and_json` with `verify_requests` | Richard van der Hoff | 2017-09-20 | 1 | -3/+3 |
| | | | | | | | | This is a precursor to factoring some of this code out. | ||||
| * | pull out handle_key_deferred to top level | Richard van der Hoff | 2017-09-20 | 1 | -43/+44 |
| | | | | | | | | | | | | There's no need for this to be a nested definition; pulling it out not only makes it more efficient, but makes it easier to check that it's not accessing any local variables it shouldn't be. | ||||
| * | Fix incorrect key_ids in error message | Richard van der Hoff | 2017-09-20 | 1 | -1/+1 |
| | | |||||
| * | Fix concurrent server_key requests (#2458) | Richard van der Hoff | 2017-09-19 | 1 | -1/+3 |
| | | | | | | | | Fix a bug where we could end up firing off multiple requests for server_keys for the same server at the same time. | ||||
| * | Clean up and document handling of logcontexts in Keyring (#2452) | Richard van der Hoff | 2017-09-18 | 1 | -28/+36 |
| | | | | | | | | | | | | I'm still unclear on what the intended behaviour for `verify_json_objects_for_server` is, but at least I now understand the behaviour of most of the things it calls... | ||||
* | | Fix iteration of requests_missing_keys; list doesn't have .values() | Kenny Keslar | 2017-07-26 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Kenny Keslar <r3dey3@r3dey3.com> | ||||
* | Merge pull request #2050 from matrix-org/rav/federation_backoff | Richard van der Hoff | 2017-03-23 | 1 | -23/+16 |
|\ | | | | | push federation retry limiter down to matrixfederationclient | ||||
| * | push federation retry limiter down to matrixfederationclient | Richard van der Hoff | 2017-03-23 | 1 | -23/+16 |
| | | | | | | | | | | rather than having to instrument everywhere we make a federation call, make the MatrixFederationHttpClient manage the retry limiter. | ||||
* | | fix up some key verif docstrings | Richard van der Hoff | 2017-03-21 | 1 | -2/+21 |
|/ | |||||
* | Add some debug to help diagnose weird federation issue | Richard van der Hoff | 2017-03-20 | 1 | -1/+8 |
| | |||||
* | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 1 | -18/+18 |
| | |||||
* | Update keyring Measure | Erik Johnston | 2016-08-19 | 1 | -85/+85 |
| | |||||
* | Measure keyrings | Erik Johnston | 2016-08-19 | 1 | -34/+36 |
| | |||||
* | Don't print stack traces when failing to get remote keys | Erik Johnston | 2016-08-10 | 1 | -12/+16 |
| | |||||
* | Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-07-28 | 1 | -3/+9 |
|\ | | | | | | | release-v0.17.0 | ||||
| * | Cache getPeer | Erik Johnston | 2016-07-21 | 1 | -2/+5 |
| | | |||||
| * | Set host not path | Erik Johnston | 2016-07-21 | 1 | -1/+1 |
| | | |||||
| * | Send the correct host header when fetching keys | Erik Johnston | 2016-07-21 | 1 | -3/+6 |
| | | |||||
* | | Merge branch 'develop' into markjh/verify | Mark Haines | 2016-07-27 | 1 | -2/+9 |
|\ \ | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py | ||||
| * \ | Merge pull request #955 from matrix-org/markjh/only_from2 | Mark Haines | 2016-07-27 | 1 | -2/+9 |
| |\ \ | | | | | | | | | Add a couple more checks to the keyring | ||||
| | * | | Add a couple more checks to the keyring | Mark Haines | 2016-07-26 | 1 | -2/+9 |
| | |/ | |||||
| * / | Fix a couple of bugs in the transaction and keyring code | Mark Haines | 2016-07-26 | 1 | -8/+9 |
| |/ | |||||
* / | Clean up verify_json_objects_for_server | Mark Haines | 2016-07-27 | 1 | -68/+75 |
|/ | |||||
* | Uncommit accidentally commited edit to cipher list | David Baker | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | Pass through _get_event_txn | David Baker | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | Make key client send a Host header | Erik Johnston | 2016-03-11 | 1 | -0/+3 |
| | |||||
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -37/+46 |
| | |||||
* | copyrights | Matthew Hodgson | 2016-01-07 | 5 | -5/+5 |
| | |||||
* | Actually look up required remote server key IDs | Paul "LeoNerd" Evans | 2015-12-18 | 1 | -1/+3 |
| | | | | | | set.union() is a side-effect-free function that returns the union of two sets. This clearly wanted .update(), which is the side-effecting mutator version. | ||||
* | Fix typo | Erik Johnston | 2015-11-20 | 1 | -1/+1 |
| | |||||
* | Don't limit connections to perspective servers | Erik Johnston | 2015-11-20 | 1 | -21/+17 |
| | |||||
* | Fix bug where we sometimes didn't fetch all the keys requested for a | Erik Johnston | 2015-09-17 | 1 | -4/+3 |
| | | | | server. | ||||
* | Merge pull request #272 from matrix-org/daniel/insecureclient | Daniel Wagner-Hall | 2015-09-15 | 1 | -2/+2 |
|\ | | | | | Allow configuration to ignore invalid SSL certs | ||||
| * | Allow configuration to ignore invalid SSL certs | Daniel Wagner-Hall | 2015-09-09 | 1 | -2/+2 |
| | | | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name. | ||||
* | | Various bug fixes to crypto.keyring | Erik Johnston | 2015-09-09 | 1 | -10/+17 |
|/ | |||||
* | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 2 | -13/+14 |
| | |||||
* | Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs | Erik Johnston | 2015-07-10 | 1 | -131/+342 |
|\ | | | | | Implement bulk verify_signed_json API | ||||
| * | Wait for previous attempts at fetching keys for a given server before trying ↵ | Erik Johnston | 2015-06-26 | 1 | -15/+68 |
| | | | | | | | | to fetch more | ||||
| * | Implement bulk verify_signed_json API | Erik Johnston | 2015-06-26 | 1 | -134/+292 |
| | | |||||
* | | remove the tls_certificate_chain_path param and simply support ↵ | Matthew Hodgson | 2015-07-09 | 1 | -3/+1 |
| | | | | | | | | tls_certificate_path pointing to a file containing a chain of certificates | ||||
* | | oops, context.tls_certificate_chain_file() expects a file, not a certificate. | Matthew Hodgson | 2015-07-08 | 1 | -2/+2 |
| | | |||||
* | | typo | Matthew Hodgson | 2015-07-08 | 1 | -1/+1 |
| | | |||||
* | | add new optional config for tls_certificate_chain_path for folks with ↵ | Matthew Hodgson | 2015-07-08 | 1 | -0/+2 |
|/ | | | | intermediary SSL certs | ||||
* | Handle the case when things return empty but non none things | Erik Johnston | 2015-05-19 | 1 | -2/+2 |
| | |||||
* | Don't always hit get_server_verify_key_v1_direct | Erik Johnston | 2015-05-19 | 1 | -5/+10 |
| | |||||
* | SYN-383: Actually, we expect this value to be a dict | Erik Johnston | 2015-05-19 | 1 | -1/+2 |
| | |||||
* | SYN-383: Handle the fact the server might not have signed things | Erik Johnston | 2015-05-19 | 1 | -1/+1 |
| | |||||
* | Don't reuse var names | Erik Johnston | 2015-05-19 | 1 | -2/+2 |
| | |||||
* | SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return | Erik Johnston | 2015-05-19 | 1 | -18/+18 |
| | |||||
* | SYN-383: Extract the response list from 'server_keys' in the response JSON ↵ | Mark Haines | 2015-05-19 | 1 | -1/+3 |
| | | | | as it might work better than iterating over the top level dict | ||||
* | Merge pull request #143 from matrix-org/erikj/SYN-375 | Mark Haines | 2015-05-12 | 1 | -2/+6 |
|\ | | | | | SYN-375 - Lots of unhandled deferred exceptions. | ||||
| * | Change the way we create observers to deferreds so that we don't get spammed ↵ | Erik Johnston | 2015-05-08 | 1 | -2/+6 |
| | | | | | | | | by 'unhandled errors' | ||||
* | | Change the way we do logging contexts so that they survive divergences | Erik Johnston | 2015-05-08 | 1 | -6/+11 |
|/ | |||||
* | Use a defer.gatherResults to collect results from the perspective servers | Mark Haines | 2015-04-29 | 1 | -11/+21 |
| | |||||
* | Update the query format used by keyring to match current key v2 spec | Mark Haines | 2015-04-29 | 1 | -1/+12 |
| | |||||
* | Implement minimum_valid_until_ts in the remote key resource | Mark Haines | 2015-04-29 | 1 | -0/+1 |
| | |||||
* | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-27 | 1 | -0/+20 |
|\ | | | | | | | | | Conflicts: synapse/crypto/keyring.py | ||||
| * | Fix newlines | Erik Johnston | 2015-04-27 | 1 | -2/+1 |
| | | |||||
| * | Pull inner function out. | Erik Johnston | 2015-04-27 | 1 | -76/+77 |
| | | |||||
| * | Implement locks using create_observer for fetching media and server keys | Erik Johnston | 2015-04-27 | 1 | -59/+79 |
| | | |||||
* | | Add config for setting the perspective servers | Mark Haines | 2015-04-24 | 1 | -1/+5 |
| | | |||||
* | | Update to match the specification for key/v2 | Mark Haines | 2015-04-23 | 1 | -2/+2 |
| | | |||||
* | | Implement remote key lookup api | Mark Haines | 2015-04-22 | 2 | -38/+43 |
| | | |||||
* | | Implement v2 key lookup | Mark Haines | 2015-04-20 | 1 | -17/+251 |
| | | |||||
* | | Fail quicker for 4xx responses in the key client, optional hit a different ↵ | Mark Haines | 2015-04-15 | 1 | -6/+31 |
|/ | | | | API path | ||||
* | Don't look for an TLS private key if we have set --no-tls | Erik Johnston | 2015-03-06 | 1 | -1/+4 |
| | |||||
* | Log error message when we fail to fetch remote server keys | Erik Johnston | 2015-03-05 | 1 | -2/+11 |
| | |||||
* | Try to only back off if we think we failed to connect to the remote | Erik Johnston | 2015-02-17 | 1 | -54/+54 |
| | |||||
* | Add per server retry limiting. | Erik Johnston | 2015-02-17 | 1 | -15/+7 |
| | | | | | Factor out the pre destination retry logic from TransactionQueue so it can be reused in both get_pdu and crypto.keyring | ||||
* | Rate limit retries when fetching server keys. | Erik Johnston | 2015-02-17 | 1 | -55/+71 |
| | |||||
* | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
| | |||||
* | Fix code-style | Mark Haines | 2015-02-10 | 1 | -2/+2 |
| | |||||
* | Fix bug in timeout handling in keyclient | Erik Johnston | 2015-01-30 | 1 | -3/+4 |
| | |||||
* | Update copyright notices | Mark Haines | 2015-01-06 | 5 | -5/+5 |
| | |||||
* | Try and figure out how and why signatures are being changed. | Erik Johnston | 2014-12-10 | 1 | -1/+2 |
| | |||||
* | More bug fixes | Erik Johnston | 2014-12-08 | 1 | -1/+1 |
| | |||||
* | Convert rest and handlers to use new event structure | Erik Johnston | 2014-12-04 | 1 | -1/+1 |
| | |||||
* | WIP for new way of managing events. | Erik Johnston | 2014-12-03 | 1 | -18/+21 |
| | |||||
* | Merge branch 'develop' into http_client_refactor | David Baker | 2014-11-20 | 2 | -3/+3 |
|\ | |||||
| * | Use module loggers rather than the root logger. Exceptions caused by bad ↵ | Mark Haines | 2014-11-20 | 1 | -1/+1 |
| | | | | | | | | clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str' | ||||
| * | Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵ | Mark Haines | 2014-11-20 | 1 | -2/+2 |
| | | | | | | | | because they don't interact well with the logging contexts | ||||
* | | Separate out the matrix http client completely because just about all of its ↵ | David Baker | 2014-11-20 | 1 | -3/+3 |
|/ | | | | code it now separate from the simple case we need for standard HTTP(S) | ||||
* | Merge PDUs and Events into one object | Mark Haines | 2014-11-14 | 1 | -12/+3 |
| | |||||
* | Fix PDU and event signatures | Mark Haines | 2014-11-14 | 1 | -1/+10 |
| | |||||
* | Validate signatures on incoming events | Mark Haines | 2014-11-14 | 1 | -4/+14 |
| | |||||
* | Merge branch 'develop' into request_logging | Mark Haines | 2014-11-14 | 1 | -0/+98 |
|\ | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py | ||||
| * | Tidy up some of the unused sql tables | Erik Johnston | 2014-11-10 | 1 | -2/+0 |
| | | |||||
| * | Finish redaction algorithm. | Erik Johnston | 2014-11-10 | 1 | -5/+2 |
| | | |||||
| * | Add hash of current state to events | Erik Johnston | 2014-11-07 | 1 | -1/+10 |
| | | |||||
| * | Fix bugs in generating event signatures and hashing | Erik Johnston | 2014-11-03 | 1 | -62/+38 |
| | | |||||
| * | Don't assume event has hashes key already | Erik Johnston | 2014-11-03 | 1 | -0/+2 |
| | | |||||
| * | Sign evnets | Erik Johnston | 2014-10-31 | 1 | -0/+20 |
| | | |||||
| * | Make prev_event signing work again. | Erik Johnston | 2014-10-31 | 1 | -1/+12 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-30 | 4 | -5/+3 |
| |\ | | | | | | | | | | federation_authorization | ||||
| * | | fix pyflakes warnings | Mark Haines | 2014-10-27 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'develop' into event_signing | Mark Haines | 2014-10-27 | 3 | -2/+5 |
| |\ \ | |||||
| * | | | Remove signatures from pdu when computing hashes to use for prev pdus, make ↵ | Mark Haines | 2014-10-17 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | sure is_state is a boolean. | ||||
| * | | | Rename 'meta' to 'unsigned' | Mark Haines | 2014-10-17 | 1 | -1/+3 |
| | | | | |||||
| * | | | Hash the same content covered by the signature when referencing previous ↵ | Mark Haines | 2014-10-17 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | PDUs rather than reusing the PDU content hashes | ||||
| * | | | Sign outgoing PDUs. | Mark Haines | 2014-10-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | persist hashes and origin signatures for PDUs | Mark Haines | 2014-10-15 | 1 | -0/+70 |
| | | | | |||||
* | | | | Merge branch 'develop' into request_logging | Mark Haines | 2014-10-30 | 4 | -5/+3 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: synapse/config/logger.py | ||||
| * | | | Fix pep8 warnings | Mark Haines | 2014-10-30 | 4 | -5/+3 |
| | |/ | |/| | |||||
* / | | Add a request-id to each log line | Mark Haines | 2014-10-30 | 1 | -4/+6 |
|/ / | |||||
* | | Fix pyflakes warnings | Mark Haines | 2014-10-27 | 1 | -1/+0 |
| | | |||||
* | | Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 ↵ | Mark Haines | 2014-10-24 | 1 | -1/+4 |
| | | | | | | | | doesn't seem to have ECC | ||||
* | | add log line for checking verifying signatures | Mark Haines | 2014-10-17 | 1 | -0/+1 |
|/ | |||||
* | Better response message when signature is missing or unsupported | Mark Haines | 2014-10-13 | 1 | -1/+1 |
| | |||||
* | Respond with more helpful error messages for unsigned requests | Mark Haines | 2014-10-13 | 2 | -4/+33 |
| | |||||
* | SYN-75 Verify signatures on server to server transactions | Mark Haines | 2014-09-30 | 4 | -172/+154 |
| | |||||
* | Add a _matrix/key/v1 resource with the verification keys of the local server | Mark Haines | 2014-09-23 | 1 | -161/+0 |
| | |||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 6 | -6/+6 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Add copyright notices and fix pyflakes errors | Mark Haines | 2014-09-03 | 1 | -1/+15 |
| | |||||
* | enable ECDHE ciphers | Mark Haines | 2014-09-01 | 1 | -0/+6 |
| | |||||
* | Add server TLS context factory | Mark Haines | 2014-09-01 | 1 | -0/+23 |
| | |||||
* | Add config tree to synapse. Add support for reading config from a file | Mark Haines | 2014-08-31 | 1 | -160/+0 |
| | |||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 6 | -0/+6 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 6 | -0/+575 |