summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2060 from matrix-org/erikj/cache_hosts_in_roomErik Johnston2017-03-242-2/+11
|\ | | | | Cache hosts in room
| * Cache hosts in roomErik Johnston2017-03-242-2/+11
| |
* | Merge pull request #2058 from matrix-org/rav/logcontext_leaks_2Richard van der Hoff2017-03-241-12/+16
|\ \ | | | | | | try not to drop context after federation requests
| * | try not to drop context after federation requestsRichard van der Hoff2017-03-231-12/+16
| | | | | | | | | | | | | | | | | | | | | preserve_context_over_fn uses a ContextPreservingDeferred, which only restores context for the duration of its callbacks, which isn't really correct, and means that subsequent operations in the same request can end up without their logcontexts.
* | | Merge pull request #2057 from matrix-org/rav/missing_yield_2Richard van der Hoff2017-03-241-1/+1
|\ \ \ | |_|/ |/| | Add another missing yield on check_device_registered
| * | Add another missing yield on check_device_registeredRichard van der Hoff2017-03-231-1/+1
| | |
* | | Merge pull request #2054 from matrix-org/erikj/user_iter_cursorErik Johnston2017-03-2418-131/+101
|\ \ \ | | | | | | | | Reduce some CPU work on DB threads
| * | | Replace some calls to cursor_to_dictErik Johnston2017-03-243-39/+13
| | | | | | | | | | | | | | | | | | | | cursor_to_dict can be surprisinglh expensive for large result sets, so lets only call it when we need to.
| * | | Use iter(items|values)Erik Johnston2017-03-243-51/+48
| | | |
| * | | User Cursor.__iter__ instead of fetchallErik Johnston2017-03-2316-41/+40
| | | | | | | | | | | | | | | | This prevents unnecessary construction of lists
* | | | Merge pull request #2055 from matrix-org/dbkr/fix_add_msisdn_requestTokenDavid Baker2017-03-241-1/+1
|\ \ \ \ | | | | | | | | | | Fix token request for addition of phone numbers
| * | | | Oops, remove unintentional changeDavid Baker2017-03-231-7/+0
| | | | |
| * | | | Fix token request for addition of phone numbersDavid Baker2017-03-232-1/+8
| | |/ / | |/| |
* | | | Merge pull request #2056 from matrix-org/dbkr/fix_invite_rejectDavid Baker2017-03-241-0/+7
|\ \ \ \ | |_|_|/ |/| | | Fix rejection of invites not reaching sync
| * | | Fix rejection of invites not reaching syncDavid Baker2017-03-231-0/+7
| |/ / | | | | | | | | | | | | | | | | | | Always allow the user to see their own leave events, otherwise they won't see the event if they reject an invite for a room whose history visibility is set such that they cannot see events before joining.
* | | Merge pull request #2050 from matrix-org/rav/federation_backoffRichard van der Hoff2017-03-2312-315/+355
|\ \ \ | | | | | | | | push federation retry limiter down to matrixfederationclient
| * | | fix testsRichard van der Hoff2017-03-232-1/+3
| | | |
| * | | Ignore backoff history for invites, aliases, and roomdirsRichard van der Hoff2017-03-236-14/+52
| | | | | | | | | | | | | | | | | | | | Add a param to the federation client which lets us ignore historical backoff data for federation queries, and set it for a handful of operations.
| * | | push federation retry limiter down to matrixfederationclientRichard van der Hoff2017-03-238-287/+280
| | | | | | | | | | | | | | | | | | | | rather than having to instrument everywhere we make a federation call, make the MatrixFederationHttpClient manage the retry limiter.
| * | | MatrixFederationHttpClient: clean upRichard van der Hoff2017-03-231-17/+24
| | | | | | | | | | | | | | | | | | | | rename _create_request to _request, and push ascii-encoding of `destination` and `path` down into it
* | | | Merge pull request #2052 from matrix-org/rav/time_bound_deferredRichard van der Hoff2017-03-232-4/+39
|\ \ \ \ | |_|/ / |/| | | Fix time_bound_deferred to throw the right exception
| * | | Fix time_bound_deferred to throw the right exceptionRichard van der Hoff2017-03-232-4/+39
| |/ / | | | | | | | | | | | | | | | Due to a failure to instantiate DeferredTimedOutError, time_bound_deferred would throw a CancelledError when the deferred timed out, which was rather confusing.
* | | Merge pull request #1783 from pik/filter-validationErik Johnston2017-03-234-95/+238
|\ \ \ | |_|/ |/| | JSONSchema Validation For Filters
| * | Add jsonschema to python_dependencies.pypik2017-03-231-0/+1
| | | | | | | | | | | | Signed-off-by: pik <alexander.maznev@gmail.com>
| * | use jsonschema.FormatChecker for RoomID and UserID stringspik2017-03-233-24/+40
| | | | | | | | | | | | | | | | | | * use a valid filter in rest/client/v2_alpha test Signed-off-by: pik <alexander.maznev@gmail.com>
| * | Add valid filter tests, flake8, fix typopik2017-03-232-10/+55
| | | | | | | | | | | | Signed-off-by: pik <alexander.maznev@gmail.com>
| * | check_valid_filter using JSONSchemapik2017-03-232-94/+175
|/ / | | | | | | | | | | * add invalid filter tests Signed-off-by: pik <alexander.maznev@gmail.com>
* | Merge pull request #2005 from kfatehi/docs/readmeRichard van der Hoff2017-03-231-1/+1
|\ \ | | | | | | Update README: specify python2.7 in virtualenv
| * | Update README: specify python2.7 in virtualenvKeyvan Fatehi2017-03-161-1/+1
| | | | | | | | | | | | Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
* | | Merge pull request #2048 from matrix-org/rav/missing_yieldRichard van der Hoff2017-03-231-1/+1
|\ \ \ | | | | | | | | Add a missing yield in device key upload
| * | | Add a missing yield in device key uploadRichard van der Hoff2017-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | (this would only very very rarely actually be a useful thing, so the main problem was the logcontext leak...)
* | | | Merge pull request #2049 from matrix-org/rav/logcontext_leaksRichard van der Hoff2017-03-232-5/+5
|\ \ \ \ | |/ / / |/| | | Fix a couple of logcontext leaks
| * | | Fix a couple of logcontext leaksRichard van der Hoff2017-03-232-5/+5
|/ / / | | | | | | | | | | | | Use preserve_fn to correctly manage the logcontexts around things we don't want to yield on.
* | | Merge pull request #2044 from matrix-org/rav/crypto_docsRichard van der Hoff2017-03-222-4/+24
|\ \ \ | | | | | | | | fix up some key verif docstrings
| * | | fix up some key verif docstringsRichard van der Hoff2017-03-212-4/+24
| | | |
* | | | Merge pull request #2042 from matrix-org/rav/fix_key_cachingRichard van der Hoff2017-03-224-63/+225
|\ \ \ \ | |_|_|/ |/| | | Fix caching of remote servers' signature keys
| * | | Fix caching of remote servers' signature keysRichard van der Hoff2017-03-224-63/+225
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The `@cached` decorator on `KeyStore._get_server_verify_key` was missing its `num_args` parameter, which meant that it was returning the wrong key for any server which had more than one recorded key. By way of a fix, change the default for `num_args` to be *all* arguments. To implement that, factor out a common base class for `CacheDescriptor` and `CacheListDescriptor`.
* | | Merge branch 'master' into developMatthew Hodgson2017-03-213-4/+51
|\ \ \ | |/ / |/| |
| * | Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse v0.19.3Erik Johnston2017-03-2050-238/+1531
| |\ \
| | * | Bump changelog and version github/release-v0.19.3 release-v0.19.3Erik Johnston2017-03-202-1/+7
| | | |
| | * | Bump changelog and versions v0.19.3-rc2Erik Johnston2017-03-132-1/+10
| | | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3Erik Johnston2017-03-1348-237/+1483
| | |\ \
| | * \ \ Merge tag 'v0.19.3-rc1' into release-v0.19.3Erik Johnston2017-03-131-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in synapse v0.19.3-rc1 (2017-03-08) =========================================== Features: * Add some administration functionalities. Thanks to morteza-araby! (PR #1784) Changes: * Reduce database table sizes (PR #1873, #1916, #1923, #1963) * Update contrib/ to not use syutil. Thanks to andrewshadura! (PR #1907) * Don't fetch current state when sending an event in common case (PR #1955) Bug fixes: * Fix synapse_port_db failure. Thanks to Pneumaticat! (PR #1904) * Fix caching to not cache error responses (PR #1913) * Fix APIs to make kick & ban reasons work (PR #1917) * Fix bugs in the /keys/changes api (PR #1921) * Fix bug where users couldn't forget rooms they were banned from (PR #1922) * Fix issue with long language values in pushers API (PR #1925) * Fix a race in transaction queue (PR #1930) * Fix dynamic thumbnailing to preserve aspect ratio. Thanks to jkolo! (PR #1945) * Fix device list update to not constantly resync (PR #1964) * Fix potential for huge memory usage when getting device that have changed (PR #1969)
| | | * | | Bump changelog and version v0.19.3-rc1Erik Johnston2017-03-082-1/+33
| | | | | |
| | * | | | Bump changelog and versionErik Johnston2017-03-082-1/+33
| | |/ / /
| * | | | Merge pull request #2028 from majewsky/readme-fix-1Matthew Hodgson2017-03-181-3/+3
| |\ \ \ \ | | |/ / / | |/| | | README.md: fix link to client list on matrix.org/docs
| | * | | README.md: fix link to client list on matrix.org/docsStefan Majewsky2017-03-181-3/+3
| |/ / /
* | | | Merge pull request #2033 from matrix-org/erikj/repl_speedErik Johnston2017-03-215-54/+39
|\ \ \ \ | | | | | | | | | | Don't send the full event json over replication
| * | | | Fix unit testErik Johnston2017-03-201-1/+1
| | | | |
| * | | | PEP8Erik Johnston2017-03-202-3/+0
| | | | |
| * | | | Don't send the full event json over replicationErik Johnston2017-03-174-50/+38
| | | | |
* | | | | Merge pull request #2035 from matrix-org/rav/debug_federationRichard van der Hoff2017-03-211-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Add some debug to help diagnose weird federation issue
| * | | | | Add some debug to help diagnose weird federation issueRichard van der Hoff2017-03-201-1/+8
|/ / / / /
* | | | | Merge pull request #2026 from matrix-org/rav/logcontext_docsRichard van der Hoff2017-03-202-8/+449
|\ \ \ \ \ | | | | | | | | | | | | Logcontext docs
| * | | | | log_contexts.rst: fix formatting of Note blockRichard van der Hoff2017-03-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Apparently the github RST renderer doesn't like Note blocks.
| * | | | | log_contexts.rst: fix typosRichard van der Hoff2017-03-181-2/+2
| | | | | |
| * | | | | Logcontext docsRichard van der Hoff2017-03-172-8/+449
| |/ / / /
* | | | | Merge pull request #2027 from matrix-org/rav/logcontext_leaksRichard van der Hoff2017-03-2012-62/+147
|\ \ \ \ \ | | | | | | | | | | | | A few fixes to logcontext things
| * | | | | Stop preserve_fn leaking context into the reactorRichard van der Hoff2017-03-183-34/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in ``logcontext.preserve_fn`` which made it leak context into the reactor, and add a test for it. Also, get rid of ``logcontext.reset_context_after_deferred``, which tried to do the same thing but had its own, different, set of bugs.
| * | | | | Run the reactor with the sentinel logcontextRichard van der Hoff2017-03-188-16/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a class of 'Unexpected logcontext' messages, which were happening because the logcontext was somewhat arbitrarily swapping between the sentinel and the `run` logcontext.
| * | | | | Remove broken use of clock.call_laterRichard van der Hoff2017-03-181-12/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background_updates was using `call_later` in a way that leaked the logcontext into the reactor. We could have rewritten it to do it properly, but given that we weren't using the fancier facilities provided by `call_later`, we might as well just use `async.sleep`, which does the logcontext stuff properly.
* | | | | Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejectionsRichard van der Hoff2017-03-206-84/+278
|\ \ \ \ \ | |/ / / / |/| | | | Avoid resetting state on rejected events
| * | | | Avoid resetting state on rejected eventsRichard van der Hoff2017-03-172-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a rejected event, give it the same state_group as its prev_event, rather than no state_group at all. This should fix https://github.com/matrix-org/synapse/issues/1935.
| * | | | Refactoring and cleanupsRichard van der Hoff2017-03-175-80/+264
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few non-functional changes: * A bunch of docstrings to document types * Split `EventsStore._persist_events_txn` up a bit. Hopefully it's a bit more readable. * Rephrase `EventFederationStore._update_min_depth_for_room_txn` to avoid mind-bending conditional. * Rephrase rejected/outlier conditional in `_update_outliers_txn` to avoid mind-bending conditional.
* | | | Merge pull request #2016 from matrix-org/rav/queue_pdus_during_joinRichard van der Hoff2017-03-172-24/+69
|\ \ \ \ | | | | | | | | | | Queue up federation PDUs while a room join is in progress
| * | | | Queue up federation PDUs while a room join is in progressRichard van der Hoff2017-03-151-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just takes the existing `room_queues` logic and moves it out to `on_receive_pdu` instead of `_process_received_pdu`, which ensures that we don't start trying to fetch prev_events and whathaveyou until the join has completed.
| * | | | Implement reset_context_after_deferredRichard van der Hoff2017-03-151-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | to correctly reset the context when we fire off a deferred we aren't going to wait for.
* | | | | Merge pull request #2022 from matrix-org/erikj/no_op_syncErik Johnston2017-03-1610-52/+93
|\ \ \ \ \ | | | | | | | | | | | | Implement no op for room stream in sync
| * | | | | CommentsErik Johnston2017-03-162-2/+4
| | | | | |
| * | | | | CommentErik Johnston2017-03-161-3/+8
| | | | | |
| * | | | | Don't recreate so many setsErik Johnston2017-03-1610-51/+42
| | | | | |
| * | | | | Implement no op for room stream in syncErik Johnston2017-03-161-4/+47
|/ / / / /
* | | | | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presenceErik Johnston2017-03-152-2/+5
|\ \ \ \ \ | | | | | | | | | | | | Add fallback to last_active_ts if it beats the last sync time on a presence timeout.
| * | | | | Modify test_user_sync so it doesn't look at last_active_ts over ↵Will Hunt2017-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | last_user_sync_ts
| * | | | | Add a great comment to handle_timeout for active vs sync times.Will Hunt2017-03-151-0/+2
| | | | | |
| * | | | | Add fallback to last_active_ts if it beats the last sync time.Will Hunt2017-03-151-1/+2
| | | | | |
* | | | | | Merge pull request #2013 from matrix-org/erikj/presence_FASTERErik Johnston2017-03-157-53/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | Format presence events on the edges instead of reformatting them multiple times
| * | | | | | CommentErik Johnston2017-03-151-1/+3
| | | | | | |
| * | | | | | Cache set of users whose presence the other user should seeErik Johnston2017-03-151-13/+27
| | | | | | |
| * | | | | | CommentErik Johnston2017-03-152-0/+6
| | | | | | |
| * | | | | | Remove unused importErik Johnston2017-03-151-1/+0
| | | | | | |
| * | | | | | Format presence events on the edges instead of reformatting them multiple timesErik Johnston2017-03-157-39/+80
|/ / / / / /
* | | | | | Merge pull request #1997 from matrix-org/dbkr/cas_partialdownloadDavid Baker2017-03-151-1/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Handle PartialDownloadError in CAS login
| * | | | | Handle PartialDownloadError in CAS loginDavid Baker2017-03-141-1/+8
| | | | | |
* | | | | | Merge pull request #2010 from matrix-org/rav/fix_txnq_wedgeRichard van der Hoff2017-03-156-5/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix assertion to stop transaction queue getting wedged
| * | | | | | Fix assertion to stop transaction queue getting wedgedRichard van der Hoff2017-03-156-5/+29
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and update some docstrings to correctly reflect the types being used. get_new_device_msgs_for_remote can return a long under some circumstances, which was being stored in last_device_list_stream_id_by_dest, and was then upsetting things on the next loop.
* | | | | | Merge pull request #2008 from matrix-org/erikj/notifier_statsErik Johnston2017-03-151-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add some metrics on notifier
| * | | | | | Add some metrics on notifierErik Johnston2017-03-151-0/+6
|/ / / / / /
* | | | | | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2Erik Johnston2017-03-159-50/+412
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Phone number registration / login support v2
| * | | | | Use extend instead of +=David Baker2017-03-141-4/+4
| | | | | |
| * | | | | Oops, remove printDavid Baker2017-03-141-1/+0
| | | | | |
| * | | | | Fix registration for broken clientsDavid Baker2017-03-131-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | Only offer msisdn flows if the x_show_msisdn option is given.
| * | | | | Support registration / login with phone numberDavid Baker2017-03-139-50/+395
| | | | | | | | | | | | | | | | | | | | | | | | Changes from https://github.com/matrix-org/synapse/pull/1971
* | | | | | Merge pull request #1992 from matrix-org/rav/fix_media_loopRichard van der Hoff2017-03-144-24/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix routing loop when fetching remote media
| * | | | | | kick jenkinsRichard van der Hoff2017-03-140-0/+0
| | | | | | |
| * | | | | | Address review commentsRichard van der Hoff2017-03-142-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't blindly proxy all HTTPRequestExceptions - log unexpected exceptions at error - avoid `isinstance` - improve docs on `from_http_response_exception`
| * | | | | | re-refactor exception heirarchyRichard van der Hoff2017-03-141-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give CodeMessageException back its `msg` attribute, and use that to hold the HTTP status message for HttpResponseException.
| * | | | | | Fix routing loop when fetching remote mediaRichard van der Hoff2017-03-134-14/+102
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we proxy a media request to a remote server, add a query-param, which will tell the remote server to 404 if it doesn't recognise the server_name. This should fix a routing loop where the server keeps forwarding back to itself. Also improves the error handling on remote media fetches, so that we don't always return a rather obscure 502.
* | | | | | Merge pull request #2002 from matrix-org/erikj/dont_sync_by_defaultErik Johnston2017-03-141-13/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reduce number of spurious sync result generations.
| * | | | | | Reduce spurious calls to generate syncErik Johnston2017-03-141-13/+31
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1989 from matrix-org/erikj/public_list_speedErik Johnston2017-03-147-33/+76
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Speed up public room list
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-03-1426-592/+492
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | erikj/public_list_speed
* | | | | | Merge pull request #1996 from matrix-org/erikj/fix_current_stateErik Johnston2017-03-141-3/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix current_state_events table to not lie
| * | | | | | Fix current_state_events table to not lieErik Johnston2017-03-141-3/+28
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | If we try and persist two state events that have the same ancestor we calculate the wrong current state when persisting those events.
* | | | | | Merge pull request #1993 from matrix-org/luke/delete-devicesLuke Barnard2017-03-144-0/+139
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Implement delete_devices API
| * | | | | Implement _simple_delete_many_txn, use it to delete devicesLuke Barnard2017-03-134-11/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (But this doesn't implement the same for deleting access tokens or e2e keys. Also respond to code review.
| * | | | | FlakeLuke Barnard2017-03-131-0/+2
| | | | | |
| * | | | | Implement delete_devices APILuke Barnard2017-03-131-0/+47
| | |/ / / | |/| | | | | | | | | | | | | This implements the proposal here https://docs.google.com/document/d/1C-25Gqz3TXy2jIAoeOKxpNtmme0jI4g3yFGqv5GlAAk for deleting multiple devices at once in a single request.
* | | | | Merge pull request #1990 from matrix-org/rav/log_config_commentsRichard van der Hoff2017-03-132-7/+11
|\ \ \ \ \ | |/ / / / |/| | | | Add helpful texts to logger config options
| * | | | Bring example log config into line with defaultRichard van der Hoff2017-03-131-2/+4
| | | | |
| * | | | Add helpful texts to logger config optionsRichard van der Hoff2017-03-131-5/+7
| | | | |
* | | | | Merge pull request #1978 from matrix-org/rav/refactor_received_pduRichard van der Hoff2017-03-132-163/+207
|\ \ \ \ \ | |/ / / / |/| | | | Refactor FederationServer._handle_new_pdu
| * | | | Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pduRichard van der Hoff2017-03-1322-423/+160
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1983 from matrix-org/rav/no_redirect_stdioRichard van der Hoff2017-03-139-14/+38
|\ \ \ \ \ | | | | | | | | | | | | Add an option to disable stdio redirect
| * | | | | Add an option to disable stdio redirectRichard van der Hoff2017-03-101-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | This makes it tractable to run synapse under pdb.
| * | | | | Refactor logger config for workersRichard van der Hoff2017-03-109-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | - to make it easier to add more config options.
* | | | | | Merge pull request #1982 from matrix-org/rav/sighup_for_logconfigRichard van der Hoff2017-03-131-10/+19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Reread log config on SIGHUP
| * | | | | Reread log config on SIGHUPRichard van der Hoff2017-03-101-10/+19
| |/ / / / | | | | | | | | | | | | | | | When we are using a log_config file, reread it on SIGHUP.
* | | | | Revert "Support registration & login with phone number"Erik Johnston2017-03-139-395/+50
| | | | |
| | * | | Move FederationServer._handle_new_pdu to FederationHandlerRichard van der Hoff2017-03-092-198/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately this significantly increases the size of the already-rather-big FederationHandler, but the code fits more naturally here, and it paves the way for the tighter integration that I need between handling incoming PDUs and doing the join dance. Other than renaming the existing `FederationHandler.on_receive_pdu` to `_process_received_pdu` to make way for it, this just consists of the move, and replacing `self.handler` with `self` and `self` with `self.replication_layer`.
| | * | | Move sig check out of _handle_new_pduRichard van der Hoff2017-03-091-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | When we receive PDUs via `get_missing_events`, we have already checked their sigs, so there is no need to do it again.
| | * | | Factor _get_missing_events_for_pdu out of _handle_new_pduRichard van der Hoff2017-03-091-62/+82
| |/ / / | | | | | | | | | | | | | | | | This should be functionally identical: it just seeks to improve readability by reducing indentation.
| | * | Add new storage function to slave storeErik Johnston2017-03-131-0/+4
| | | |
| | * | CommentsErik Johnston2017-03-131-0/+12
| | | |
| | * | Assume rooms likely haven't changedErik Johnston2017-03-132-8/+14
| | | |
| | * | Get current state by using current_state_events tableErik Johnston2017-03-105-31/+52
| |/ / |/| |
* | | Merge pull request #1976 from matrix-org/erikj/device_delete_syncErik Johnston2017-03-103-4/+46
|\ \ \ | | | | | | | | Noop repated delete device inbox calls from /sync
| * | | Fix it for the workersErik Johnston2017-03-101-0/+8
| | | |
| * | | Noop repated delete device inbox calls from /syncErik Johnston2017-03-102-4/+38
|/ / /
* / / Add setdefault key to ExpiringCacheErik Johnston2017-03-101-0/+7
|/ /
* | Fix docstringRichard van der Hoff2017-03-091-2/+1
| |
* | Merge pull request #1971 from matrix-org/dbkr/msisdn_signinDavid Baker2017-03-099-50/+395
|\ \ | | | | | | Support registration & login with phone number
| * | Comment when our 3pids would be incompleteDavid Baker2017-03-081-0/+2
| | |
| * | DocsDavid Baker2017-03-081-0/+13
| | |
| * | Incorrectly copied copyrightDavid Baker2017-03-081-1/+0
| | | | | | | | | | | | This file post-dates OM
| * | Not any more, it doesn'tDavid Baker2017-03-081-1/+0
| | |
| * | Better error messageDavid Baker2017-03-081-1/+3
| | |
| * | pep8David Baker2017-03-082-1/+2
| | |
| * | Add msisdn util fileDavid Baker2017-03-081-0/+27
| | |
| * | Pull out datastore in initialiserDavid Baker2017-03-081-5/+10
| | |
| * | Minor fixes from PR feedbackDavid Baker2017-03-082-5/+3
| | |
| * | Fix log lineDavid Baker2017-03-081-1/+1
| | |
| * | TyposDavid Baker2017-03-081-2/+2
| | |
| * | Refector out assert_params_in_requestDavid Baker2017-03-083-37/+27
| | | | | | | | | | | | and replace requestEmailToken where we meant requestMsisdnToken
| * | Factor out msisdn canonicalisationDavid Baker2017-03-084-41/+11
| | | | | | | | | | | | Plus a couple of other minor fixes
| * | Fix pep8David Baker2017-03-084-7/+7
| | |
| * | Support new login formatDavid Baker2017-03-071-6/+91
| | | | | | | | | | | | https://docs.google.com/document/d/1-6ZSSW5YvCGhVFDyD2QExAUAdpCWjccvJT5xiyTTG2Y/edit#
| * | Add msisdns as 3pids during registrationDavid Baker2017-03-031-0/+47
| | | | | | | | | | | | and support binding them with the bind_msisdn param
| * | Just return the deferred straight offDavid Baker2017-03-011-4/+2
| | | | | | | | | | | | | | | defer.returnValue doth not maketh a generator: it would need a yield to be a generator, and this doesn't need a yield.
| * | Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signinDavid Baker2017-03-0141-193/+816
| |\ \
| * | | WIP support for msisdn 3pid proxy methodsDavid Baker2017-02-146-19/+228
| | | |
* | | | Remove spurious SQL logging (#1972)Richard van der Hoff2017-03-081-8/+0
| | | | | | | | | | | | | | | | | | | | looks like the upsert function was accidentally sending sql logging to the general logger. We already log the sql in `txn.execute`.
* | | | Merge pull request #1969 from matrix-org/erikj/get_distinct_devicesErik Johnston2017-03-061-1/+1
|\ \ \ \ | | | | | | | | | | Select distinct devices from DB
| * | | | Select distinct devices from DBErik Johnston2017-03-061-1/+1
|/ / / / | | | | | | | | | | | | | | | | Otherwise we might pull out tonnes of duplicate user_ids and this can make synapse sad.
* | | | Merge pull request #1964 from matrix-org/erikj/device_list_update_fixErik Johnston2017-03-031-47/+123
|\ \ \ \ | | | | | | | | | | Fix device list update to not constantly resync
| * | | | Don't keep around old stream IDs foreverErik Johnston2017-03-031-2/+9
| | | | |
| * | | | SpellingErik Johnston2017-03-031-2/+2
| | | | |
| * | | | Fix device list update to not constantly resyncErik Johnston2017-03-011-46/+115
| | | | |
* | | | | Merge pull request #1963 from matrix-org/erikj/delete_old_device_streamsErik Johnston2017-03-032-0/+34
|\ \ \ \ \ | |_|_|/ / |/| | | | Clobber old device list stream entries
| * | | | Fix upErik Johnston2017-03-032-8/+8
| | | | |
| * | | | Add index to device_lists_streamErik Johnston2017-03-013-4/+28
| | | | |
| * | | | Clobber old device list stream entriesErik Johnston2017-03-011-0/+10
| |/ / /
* | | | kick jenkinsPaul "LeoNerd" Evans2017-03-010-0/+0
| | | |
* | | | Merge pull request #1960 from matrix-org/paul/sytest-integrationPaul Evans2017-03-012-6/+22
|\ \ \ \ | |/ / / |/| | | Prepare a script for Jenkins to run sytest via dendron+haproxy
| * | | Added also a control script to run via the crazy dendron+haproxy hybrid ↵Paul "LeoNerd" Evans2017-02-281-0/+22
| | | | | | | | | | | | | | | | we're temporarily using
| * | | No longer need to request all the sub-components to be split when running ↵Paul "LeoNerd" Evans2017-02-281-6/+0
|/ / / | | | | | | | | | sytest+dendron
* | | Don't log unknown cache warnings in workersErik Johnston2017-02-281-1/+3
| | |
* | | Merge pull request #1959 from matrix-org/erikj/intern_onceErik Johnston2017-02-281-3/+2
|\ \ \ | | | | | | | | Intern table column names once
| * | | Intern table column names onceErik Johnston2017-02-281-3/+2
| | | |
* | | | Merge pull request #1957 from matrix-org/device_poke_indexErik Johnston2017-02-282-1/+17
|\ \ \ \ | |/ / / |/| | | Add stream_id index to device_lists_outbound_pokes
| * | | Add stream_id index to device_lists_outbound_pokesErik Johnston2017-02-282-1/+17
|/ / / | | | | | | | | | As this is used for replication streaming
* | | Fix up txn nameErik Johnston2017-02-281-1/+1
| | |
* | | Pop with default value to stop throwingErik Johnston2017-02-281-1/+1
| | |
* | | merge in right archlinux package, thanks to @saram-kon from ↵Matthew Hodgson2017-02-281-1/+1
| | | | | | | | | | | | https://github.com/matrix-org/synapse/pull/1956
* | | Merge pull request #1955 from matrix-org/erikj/current_state_query_bypassErik Johnston2017-02-271-0/+15
|\ \ \ | | | | | | | | Don't fetch current state in common case
| * | | Remove needless checkErik Johnston2017-02-271-2/+0
| | | |
| * | | It should be allErik Johnston2017-02-271-1/+1
| | | |
| * | | Don't fetch current state in common caseErik Johnston2017-02-271-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Currently we fetch the list of current state events whenever we send something in a room. This is overkill for the common case of persisting a simple chain of non-state events, so lets handle that case specially.
* | | | Pop rather than del from dictErik Johnston2017-02-271-1/+1
|/ / /
* | | Merge pull request #1904 from Pneumaticat/patch-1Erik Johnston2017-02-271-0/+1
|\ \ \ | | | | | | | | Fix synapse_port_db failure (fixes #1902)
| * | | Fix typoKevin Liu2017-02-111-1/+1
| | | | | | | | | | | | This is what I get for not proofreading
| * | | Fix synapse_port_db failure (fixes #1902)Kevin Liu2017-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | See https://matrix.to/#/!cURbafjkfsMDVwdRDQ:matrix.org/$148686272020hCgRD:potatofrom.space Signed-off-by: Kevin Liu <kevin@potatofrom.space>
* | | | Merge pull request #1954 from matrix-org/erikj/cache_device2Erik Johnston2017-02-271-45/+73
|\ \ \ \ | | | | | | | | | | Cache get_user_devices_from_cache
| * | | | Cache get_user_devices_from_cacheErik Johnston2017-02-271-45/+73
| | | | |
* | | | | Merge pull request #1951 from enckse/developMatthew Hodgson2017-02-271-3/+2
|\ \ \ \ \ | | | | | | | | | | | | the aur package is no longer there, community package in arch does exist
| * | | | | the aur package is no longer there, community package in arch does existSean Enck2017-02-271-3/+2
|/ / / / /
* | | | | Merge pull request #1945 from jkolo/fix_dynamic_thumbnails_aspectErik Johnston2017-02-271-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix #1677 (dynamic thumbnails aspect)
| * | | | | Fix dynamic thumbnails aspectJurek2017-02-241-0/+3
| | | | | |
* | | | | | Merge pull request #1939 from matrix-org/erikj/strip_sql_newlinesErik Johnston2017-02-231-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Strip newlines from SQL queries
| * | | | | | Strip newlines from SQL queriesErik Johnston2017-02-231-0/+6
|/ / / / / /
* | | | | | Remove lock from rotate notifsErik Johnston2017-02-221-3/+0
| | | | | |
* | | | | | Ensure we pass positive ints to delay functionErik Johnston2017-02-221-1/+2
| |/ / / / |/| | | |
* | | | | Store looping callErik Johnston2017-02-211-1/+3
| | | | |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-02-212-1/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse v0.19.2Erik Johnston2017-02-214-4/+13
| |\ \ \ \
| | * | | | Bump version and changelog github/release-v0.19.2 release-v0.19.2Erik Johnston2017-02-212-1/+8
| | | | | |
| | * | | | Remove unused paramErik Johnston2017-02-202-2/+1
| | | | | |
| | * | | | Fix /context/ visibiltiy rulesErik Johnston2017-02-201-1/+4
| |/ / / /
* | | | | Merge pull request #1930 from matrix-org/rav/fix_txnq_raceRichard van der Hoff2017-02-211-9/+21
|\ \ \ \ \ | | | | | | | | | | | | Fix a race in transaction queue
| * | | | | Fix a race in transaction queueRichard van der Hoff2017-02-201-9/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | It was theoretically possible for a PDU to get queued and not sent for ages. On closer inspection I think there were bigger problems elsewhere, but we might as well fix this since it's easy.
* | | | | Merge pull request #1929 from matrix-org/erikj/context_fixErik Johnston2017-02-202-3/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix /context/ visibiltiy rules
| * | | | | Remove unused paramErik Johnston2017-02-202-2/+1
| | | | | |
| * | | | | Fix /context/ visibiltiy rulesErik Johnston2017-02-201-1/+4
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2017-02-201-11/+21
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Update metrics-howto.rstRichard van der Hoff2017-02-191-0/+2
| | | | |
| * | | | Update metrics-howto.rstRichard van der Hoff2017-02-191-12/+18
| | | | |
| * | | | Update metrics-howto.rstRichard van der Hoff2017-02-191-2/+4
| | | | |
* | | | | Fix up notif rotationErik Johnston2017-02-181-14/+22
| | | | |
* | | | | Merge pull request #1926 from matrix-org/rav/example_log_configRichard van der Hoff2017-02-171-0/+48
|\ \ \ \ \ | | | | | | | | | | | | Add an example log_config file
| * | | | | Update example_log_config.yamlRichard van der Hoff2017-02-171-1/+1
| | | | | | | | | | | | | | | | | | add trailing NL
| * | | | | Add an example log_config fileRichard van der Hoff2017-02-171-0/+48
| | | | | |
* | | | | | Merge pull request #1925 from matrix-org/dbkr/pushers_lang_lengthenDavid Baker2017-02-171-0/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make the pushers lang field column longer
| * | | | | | Use TEXT rather than VARCHARDavid Baker2017-02-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While we're changing anyway
| * | | | | | Make the pushers lang field column longerDavid Baker2017-02-171-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To accommodate things like zh-Hans-CN Fixes https://github.com/vector-im/riot-ios/issues/1031
* | | | | | | Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_banDavid Baker2017-02-171-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Allow forgetting rooms you're banned from
| * | | | | | Allow forgetting rooms you're banned fromDavid Baker2017-02-151-1/+3
| | | | | | |
* | | | | | | Merge pull request #1923 from matrix-org/erikj/push_action_compressErik Johnston2017-02-161-11/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Store the default push actions in a more efficient manner
| * | | | | | | CommentErik Johnston2017-02-161-1/+4
| | | | | | | |
| * | | | | | | CommentErik Johnston2017-02-161-7/+14
| | | | | | | |
| * | | | | | | Store the default push actions in a more efficient mannerErik Johnston2017-02-161-11/+40
|/ / / / / / /
* | | | | | | Merge pull request #1916 from matrix-org/erikj/push_actions_deleteErik Johnston2017-02-165-57/+340
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Aggregate event push actions
| * | | | | | | Less aggressive timersErik Johnston2017-02-141-2/+2
| | | | | | | |
| * | | | | | | Aggregate event push actionsErik Johnston2017-02-145-57/+340
| | | | | | | |
* | | | | | | | Merge pull request #1921 from matrix-org/rav/fix_key_changesRichard van der Hoff2017-02-153-11/+58
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix bugs in the /keys/changes api
| * | | | | | | Fix bugs in the /keys/changes apiRichard van der Hoff2017-02-143-11/+58
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `get_forward_extremeties_for_room` takes a numeric `stream_ordering`. We were passing a `RoomStreamToken`, which meant that it returned the *current* extremities, rather than those corresponding to the `from_token`. However: * `get_state_ids_for_events` required a second ('types') parameter; this meant that a `TypeError` was thrown and we ended up acting as though there was *no* prev state. * `get_state_ids_for_events` actually returns a map from event_id to state dictionary - just looking up the state keys in it again meant that we acted as though there was no prev state. We now check if each member's state has changed since *any* of the extremities. Also add/fix some comments.
* | | | | | | Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_workDavid Baker2017-02-141-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Make kick & ban reasons work
| * | | | | | Make kick & ban reasons workDavid Baker2017-02-141-0/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We somehow specced APIs with reason strings, preserve the content in the events and even have the clients display them, but failed to actually pass the parameter through to the event content.
* | | | | | Merge pull request #1873 from matrix-org/erikj/delete_push_actionsErik Johnston2017-02-141-3/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Be more agressive about purging old room event_push_actions
| * | | | | Be more agressive about purging old room event_push_actionsErik Johnston2017-02-011-3/+8
| | | | | |
* | | | | | Merge pull request #1914 from matrix-org/erikj/cache_presenceErik Johnston2017-02-133-5/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cache get_presence storage
| * | | | | | Cache get_presence storageErik Johnston2017-02-133-5/+15
| | | | | | |
* | | | | | | Merge pull request #1913 from matrix-org/kegan/dont-cache-errorsErik Johnston2017-02-131-3/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | http txns: Do not cache error responses
| * | | | | | Ordering is important on errbacks so add the cleanup func before creating an ↵Kegan Dougal2017-02-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ObservableDeferred
| * | | | | | Pop the txn from the map in case it has already been deleted somehowKegan Dougal2017-02-131-1/+1
| | | | | | |
| * | | | | | Don't cache errors at allKegan Dougal2017-02-131-10/+9
| | | | | | |
| * | | | | | http txns: Do not cache error responsesKegan Dougal2017-02-131-1/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Previously we did. This meant that, amongst other errors, rate-limiting errors would be cached and prevent messages with that txn ID being sent.
* | | | | | Merge pull request #1912 from matrix-org/markjh/roominitialsyncErik Johnston2017-02-132-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add db functions needed for room initial sync to slave
| * | | | | | Add db functions needed for room initial sync to slaveMark Haines2017-02-132-0/+10
| | | | | | |
* | | | | | | Merge pull request #1907 from andrewshadura/developErik Johnston2017-02-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use signedjson.sign instead of syutil.crypto.jsonsign
| * | | | | | | Use signedjson.sign instead of syutil.crypto.jsonsignAndrew Shadura2017-02-131-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Signed-off-by: Andrew Shadura <andrew@shadura.me>
* | | | | | | Merge pull request #1906 from tyler-smith/TS_fix_config_documentationErik Johnston2017-02-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix typo in config comments.
| * | | | | | Fix typo in config comments.Tyler Smith2017-02-111-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Tyler Smith <tylersmith.me@gmail.com>
* | | | | | Merge pull request #1896 from DanielDent/patch-1Erik Johnston2017-02-091-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update CAPTCHA_SETUP.rst X-Forwarded-For docs
| * | | | | | Update CAPTCHA_SETUP.rst X-Forwarded-For docsDaniel Dent2017-02-081-3/+2
| | | | | | | | | | | | | | | | | | | | | It looks like CAPTCHA_SETUP.rst contains information relevant to an old version of Synapse, but Synapse now has a different approach to configuring use of the X-Forwarded-For header.
* | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-02-092-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'release-v0.19.1' of github.com:matrix-org/synapse v0.19.1Erik Johnston2017-02-093-10/+14
| |\ \ \ \ \
| | * | | | | Update version and changelog github/release-v0.19.1 release-v0.19.1Erik Johnston2017-02-092-1/+8
| | | | | | |
* | | | | | | Make None check explicitErik Johnston2017-02-081-1/+1
| | | | | | |
* | | | | | | Merge pull request #1892 from matrix-org/erikj/rejection_fwd_extremErik Johnston2017-02-081-9/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | Ignore new rejected events when working out forward extremities.
| * | | | | Ignore new rejected events when working out forward extremeties.Erik Johnston2017-02-081-9/+6
| |/ / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-22 05:20:45 +0000