Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove ultimately unused feature of saving params from the first call in the ↵ | David Baker | 2015-04-23 | 1 | -2/+10 |
| | | | | session: it's probably too open to abuse. | ||||
* | Password reset, finally. | David Baker | 2015-04-17 | 1 | -1/+7 |
| | |||||
* | pep8 | David Baker | 2015-04-17 | 3 | -8/+5 |
| | |||||
* | make add3pid servlet work | David Baker | 2015-04-17 | 1 | -0/+7 |
| | |||||
* | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 5 | -48/+93 |
|\ | |||||
| * | Filter typing nofication events to only those rooms the requesting user is a ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -2/+14 |
| | | | | | | | | member of (SYN-328) | ||||
| * | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -1/+1 |
| | | | | | | | | deferred, for consistency and extensibility | ||||
| * | typo | Erik Johnston | 2015-04-08 | 1 | -1/+1 |
| | | |||||
| * | Don't yield on notifying all listeners | Erik Johnston | 2015-04-08 | 1 | -4/+36 |
| | | |||||
| * | Fix more AS sender ID thinkos. | Kegan Dougal | 2015-04-01 | 1 | -1/+8 |
| | | | | | | | | | | | | Specifically, the ASes own user ID wasn't being treated as 'exclusive' so a human could nab it. Also, the HS would needlessly send user queries to the AS for its own user ID. | ||||
| * | Remove more reg/unreg methods. Read config not database for cache. | Kegan Dougal | 2015-03-31 | 1 | -37/+0 |
| | | |||||
| * | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-26 | 4 | -9/+34 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
| | * | Reduce activity timer granularity to avoid too many quick updates (SYN-247) | Paul "LeoNerd" Evans | 2015-03-23 | 1 | -0/+8 |
| | | | |||||
| * | | Set the service ID as soon as it is known. | Kegan Dougal | 2015-03-16 | 1 | -1/+1 |
| | | | |||||
| * | | Minor PR comment tweaks. | Kegan Dougal | 2015-03-16 | 1 | -2/+8 |
| | | | |||||
| * | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-16 | 5 | -11/+20 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/appservice.py | ||||
| * | | | Use seconds; start gluing in the AS scheduler into the AS handler. | Kegan Dougal | 2015-03-09 | 2 | -4/+21 |
| | | | | |||||
* | | | | Need to yield the username check, otherwise very very weird things happen. | David Baker | 2015-04-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Oops, left debugging in. | David Baker | 2015-04-16 | 1 | -6/+0 |
| | | | | |||||
* | | | | Return user ID in use error straight away | David Baker | 2015-04-16 | 3 | -64/+65 |
| | | | | |||||
* | | | | Dummy login so we can do the first POST request to get login flows without ↵ | David Baker | 2015-04-15 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | it just succeeding | ||||
* | | | | Regstration with email in v2 | David Baker | 2015-04-15 | 4 | -22/+116 |
| | | | | |||||
* | | | | Completely replace fallback auth for C/S V2: | David Baker | 2015-04-01 | 1 | -21/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now. | ||||
* | | | | pep8 | David Baker | 2015-03-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 2 | -14/+87 |
| | | | | |||||
* | | | | Delete pushers when changing password | David Baker | 2015-03-26 | 1 | -0/+3 |
| | | | | |||||
* | | | | pep8 / pyflakes | David Baker | 2015-03-23 | 1 | -5/+1 |
| | | | | |||||
* | | | | Implement password changing (finally) along with a start on making ↵ | David Baker | 2015-03-23 | 3 | -44/+116 |
| |_|/ |/| | | | | | | | | client/server auth more general. | ||||
* | | | Merge pull request #109 from matrix-org/default_registration | Erik Johnston | 2015-03-18 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Disable registration by default. Add script to register new users. | ||||
| * | | | Factor out user id validation checks | Erik Johnston | 2015-03-18 | 1 | -0/+8 |
| | | | | |||||
* | | | | Clean out event_forward_extremities table when the server rejoins the room | Erik Johnston | 2015-03-18 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #110 from matrix-org/fix_ban | Erik Johnston | 2015-03-16 | 2 | -8/+6 |
|\ \ \ \ | | | | | | | | | | | Fix ban | ||||
| * | | | | Revert incorrect changes to where we send events | Erik Johnston | 2015-03-16 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Remove concept of context.auth_events, instead use context.current_state | Erik Johnston | 2015-03-16 | 2 | -8/+6 |
| | | | | | |||||
| * | | | | Send all membership events to the remote homeserver | Erik Johnston | 2015-03-16 | 1 | -4/+3 |
| | |/ / | |/| | | |||||
* | | | | Don't block waiting on waking up all the listeners when sending an event. | Erik Johnston | 2015-03-16 | 1 | -1/+10 |
| |_|/ |/| | | |||||
* | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+3 |
| | | | |||||
* | | | Use _ instead of . as a metric namespacing separator, for Prometheus | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Add a scalar gauge metric on the size of the presence user cachemap | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+7 |
| |/ |/| | |||||
* | | Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This ↵ | Erik Johnston | 2015-03-09 | 5 | -11/+12 |
|/ | | | | uses the a storage api that is cached. | ||||
* | When setting display name more graciously handle failures to update room state. | Erik Johnston | 2015-03-06 | 1 | -7/+13 |
| | |||||
* | Add some randomness to the user specified timeout on event streams to ↵ | Erik Johnston | 2015-03-06 | 1 | -0/+9 |
| | | | | mitigate against thundering herds problems | ||||
* | Merge pull request #93 from matrix-org/application-services-exclusive | Kegsay | 2015-03-02 | 2 | -7/+18 |
|\ | | | | | Application services exclusive flag support | ||||
| * | Implement exclusive namespace checks. | Kegan Dougal | 2015-02-27 | 2 | -7/+18 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-03-02 | 3 | -12/+27 |
|\ \ | |||||
| * | | Finish impl to get new events for AS. ASes should now be able to poll /events | Kegan Dougal | 2015-02-26 | 1 | -1/+3 |
| | | | |||||
| * | | Add stub functions and work out execution flow to implement AS event stream ↵ | Kegan Dougal | 2015-02-25 | 2 | -12/+25 |
| |/ | | | | | | | polling. | ||||
| * | %s for strings otherwise you end up sending 'u"foo"' | David Baker | 2015-02-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-02-23 | 1 | -1/+1 |
|\| | |||||
| * | Add missing comma so that it generates a dict and not a set | Erik Johnston | 2015-02-20 | 1 | -1/+1 |
| | | |||||
* | | Implement and use new batched get missing pdu | Erik Johnston | 2015-02-23 | 1 | -0/+23 |
| | | |||||
* | | Initial stab at implementing a batched get_missing_pdus request | Erik Johnston | 2015-02-19 | 1 | -4/+5 |
|/ | |||||
* | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-17 | 2 | -5/+5 |
|\ | |||||
| * | We do want to consumeError | Erik Johnston | 2015-02-17 | 1 | -1/+1 |
| | | |||||
| * | Use consumeErrors=True on all DeferredLists. | Erik Johnston | 2015-02-17 | 1 | -4/+4 |
| | | | | | | | | | | | | This is so that the DeferredLists actually consume the error instead of propogating down the non-existent errback chain. This should reduce the number of unhandled errors we are seeing. | ||||
* | | Change some debug logging to info | Erik Johnston | 2015-02-17 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-16 | 1 | -1/+1 |
|\| | |||||
| * | resolve_events expect lists, not dicts | Erik Johnston | 2015-02-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
|\| | |||||
| * | Fix wrong variable name | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 5 | -47/+393 |
|\ \ | |/ |/| | Application Services | ||||
| * | PEP8-ify | Kegan Dougal | 2015-02-11 | 1 | -3/+0 |
| | | |||||
| * | Notify ASes for events sent by other users in a room which an AS user is a ↵ | Kegan Dougal | 2015-02-11 | 1 | -5/+16 |
| | | | | | | | | part of. | ||||
| * | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 5 | -25/+50 |
| |\ | |||||
| * \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 3 | -62/+105 |
| |\ \ | |||||
| * | | | Fix bugs so lazy room joining works as intended. | Kegan Dougal | 2015-02-09 | 2 | -9/+20 |
| | | | | |||||
| * | | | Register a user account for the AS when the AS registers. Add 'sender' ↵ | Kegan Dougal | 2015-02-09 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | column to AS table. | ||||
| * | | | Add errcodes for appservice registrations. | Kegan Dougal | 2015-02-06 | 1 | -4/+7 |
| | | | | |||||
| * | | | Pyflakes: unused variable. | Kegan Dougal | 2015-02-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Grant ASes the ability to delete aliases in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -5/+23 |
| | | | | |||||
| * | | | Grant ASes the ability to create alias in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -12/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace. | ||||
| * | | | Add m.login.application_service registration procedure. | Kegan Dougal | 2015-02-05 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s). | ||||
| * | | | Dependency inject ApplicationServiceApi when creating ↵ | Kegan Dougal | 2015-02-05 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | ApplicationServicesHandler. | ||||
| * | | | Prevent user IDs in AS namespaces being created/deleted by humans. | Kegan Dougal | 2015-02-05 | 1 | -0/+16 |
| | | | | |||||
| * | | | Prevent aliases in AS namespaces being created/deleted by users. Check with ↵ | Kegan Dougal | 2015-02-05 | 1 | -9/+33 |
| | | | | | | | | | | | | | | | | ASes when queried for room aliases via federation. | ||||
| * | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 4 | -90/+143 |
| |\ \ \ | |||||
| * | | | | Fix user query checks. HS>AS pushing now works. | Kegan Dougal | 2015-02-05 | 1 | -13/+31 |
| | | | | | |||||
| * | | | | Glue AS work to general event notifications. Add more exception handling ↵ | Kegan Dougal | 2015-02-05 | 1 | -14/+25 |
| | | | | | | | | | | | | | | | | | | | | when poking ASes. | ||||
| * | | | | Add unknown room alias check. Call it from directory_handler.get_association | Kegan Dougal | 2015-02-05 | 2 | -43/+61 |
| | | | | | |||||
| * | | | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when ↵ | Kegan Dougal | 2015-02-05 | 1 | -5/+19 |
| | | | | | | | | | | | | | | | | | | | | searching for services by alias. | ||||
| * | | | | Add hs_token column and generate a different token f.e application service. | Kegan Dougal | 2015-02-05 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | Impl push_bulk function | Kegan Dougal | 2015-02-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Modify API for SimpleHttpClient.get_json and update usages. | Kegan Dougal | 2015-02-04 | 2 | -37/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would only return the HTTP body as JSON, and discard other response information (e.g. the HTTP response code). This has now been changed to throw a CodeMessageException on a non-2xx response, with the response code and body, which can then be parsed as JSON. Affected modules include: - Registration/Login (when using an email for IS auth) | ||||
| * | | | | Add query_user/alias APIs. | Kegan Dougal | 2015-02-04 | 1 | -10/+16 |
| | | | | | |||||
| * | | | | Begin to add unit tests for appservice glue and regex testing. | Kegan Dougal | 2015-02-04 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | Add stub ApplicationServiceApi and glue it with the handler. | Kegan Dougal | 2015-02-04 | 1 | -3/+15 |
| | | | | | |||||
| * | | | | Add appservice package and move ApplicationService into it. | Kegan Dougal | 2015-02-03 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Implement restricted namespace checks. Begin fleshing out the main hook for ↵ | Kegan Dougal | 2015-02-03 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | notifying application services. | ||||
| * | | | | Add namespace constants. Add restrict_to option to limit namespace checks. | Kegan Dougal | 2015-02-03 | 1 | -10/+15 |
| | | | | | |||||
| * | | | | Implement regex checks for app services. | Kegan Dougal | 2015-02-03 | 1 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Expose handler.get_services_for_event which manages the checks for all services. | ||||
| * | | | | Implement txns for AS (un)registration. | Kegan Dougal | 2015-02-02 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 7 | -154/+848 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| * | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵ | Kegan Dougal | 2015-01-28 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | store to read from it. | ||||
| * | | | | | Log when ASes are registered/unregistered. | Kegan Dougal | 2015-01-27 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Use ApplicationService when registering. | Kegan Dougal | 2015-01-27 | 1 | -8/+5 |
| | | | | | | |||||
| * | | | | | Add stub methods, TODOs and docstrings for application services. | Kegan Dougal | 2015-01-27 | 1 | -3/+22 |
| | | | | | | |||||
| * | | | | | Add appservice handler and store. Glue together rest > handler > store. | Kegan Dougal | 2015-01-27 | 2 | -0/+51 |
| | | | | | | |||||
* | | | | | | pyflakes | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | When we see a difference in current state, actually use state conflict ↵ | Erik Johnston | 2015-02-13 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | resolution algorithm | ||||
* | | | | | | Reindent code to be less human-readable to keep pep8 from complaining | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Appease pyflakes | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Can now remove the FIXME too | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -10/+3 |
| | | | | | | |||||
* | | | | | | Only attempt to fetch presence state of JOINed members in room initialSync ↵ | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | (SYN-202) | ||||
* | | | | | | Remove more debug logging | Erik Johnston | 2015-02-11 | 1 | -2/+0 |
| | | | | | | |||||
* | | | | | | Remove debug logging | Erik Johnston | 2015-02-11 | 2 | -12/+0 |
| | | | | | | |||||
* | | | | | | Don't unfreeze when using FreezeEvent.get_dict, as we are using a ↵ | Erik Johnston | 2015-02-11 | 2 | -2/+17 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | JSONEncoder that understands FrozenDict | ||||
* | | | | | Fix code-style | Mark Haines | 2015-02-10 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Code-style fixes | Mark Haines | 2015-02-10 | 2 | -6/+11 |
| | | | | | |||||
* | | | | | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-10 | 1 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵ | Mark Haines | 2015-02-06 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room | ||||
| * | | | | | Explicitly list the RejectedReasons that we can prove | Erik Johnston | 2015-02-06 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | During room intial sync, only calculate current state once. | Erik Johnston | 2015-02-09 | 2 | -13/+28 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | don't give up if we can't create default avatars during tests | Matthew Hodgson | 2015-02-07 | 1 | -9/+12 |
| | | | | | |||||
* | | | | | ...and here's the actual impl. git fail. | Matthew Hodgson | 2015-02-07 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵ | Mark Haines | 2015-02-06 | 1 | -1/+3 |
|/ / / / | | | | | | | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room | ||||
* | | | | Don't query auth if the only difference is events that were rejected due to ↵ | Erik Johnston | 2015-02-06 | 1 | -56/+72 |
| | | | | | | | | | | | | | | | | auth. | ||||
* | | | | Make seen_ids a set | Erik Johnston | 2015-02-06 | 1 | -1/+3 |
| | | | | |||||
* | | | | Handle the fact the list.remove raises if element doesn't exist | Erik Johnston | 2015-02-06 | 1 | -4/+10 |
| |_|/ |/| | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-05 | 1 | -5/+12 |
|\ \ \ | | | | | | | | | | | | | federation_client_retries | ||||
| * | | | SYN-202: Log as WARN the 404 'Presence information not visible' errors ↵ | Erik Johnston | 2015-02-05 | 1 | -5/+12 |
| | |/ | |/| | | | | | | | instead of as ERROR since they were spamming the logs | ||||
* | | | Pass through list of room hosts from room alias query to federation so that ↵ | Erik Johnston | 2015-02-05 | 2 | -14/+18 |
| | | | | | | | | | | | | it can retry against different room hosts | ||||
* | | | Merge branch 'signature_failures' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-04 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | | | | | federation_client_retries | ||||
| * | | | Change context.auth_events to what the auth_events would be bases on ↵ | Erik Johnston | 2015-02-04 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | context.current_state, rather than based on the auth_events from the event. | ||||
* | | | | Apply sanity to the transport client interface. Convert 'make_join' and ↵ | Erik Johnston | 2015-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | 'send_join' to accept iterables of destinations | ||||
* | | | | When returning lists of servers from alias lookups, put the current server ↵ | Erik Johnston | 2015-02-04 | 1 | -1/+10 |
|/ / / | | | | | | | | | | first in the list | ||||
* | | | Rearrange persist_event so that do all the queries that need to be done ↵ | Erik Johnston | 2015-02-04 | 1 | -0/+2 |
| | | | | | | | | | | | | before returning early if we have already persisted that event. | ||||
* | | | Neaten the handling of state and auth_chain up a bit | Erik Johnston | 2015-02-03 | 1 | -27/+30 |
| | | | |||||
* | | | Don't completely die if get auth_chain or querying auth_chain requests fail | Erik Johnston | 2015-02-03 | 1 | -63/+72 |
| | | | |||||
* | | | Set combinations is | and not + | Erik Johnston | 2015-02-03 | 1 | -2/+2 |
| | | | |||||
* | | | Spelling | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | | |||||
* | | | Give exception better message | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | | |||||
* | | | Add FIXME note. | Erik Johnston | 2015-02-03 | 1 | -0/+2 |
| | | | |||||
* | | | Return rejected events if asked for it over federation. | Erik Johnston | 2015-02-03 | 1 | -0/+1 |
| | | | |||||
* | | | Try to ensure we don't persist an event we have already persisted. In ↵ | Erik Johnston | 2015-02-03 | 1 | -14/+28 |
|/ / | | | | | | | persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering. | ||||
* | | Resign events when we return them via /query_auth/ | Erik Johnston | 2015-01-30 | 1 | -0/+9 |
| | | |||||
* | | Return empty list rather than None when there are no emphemeral events for a ↵ | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | | | | | | | | room | ||||
* | | Fix bug where accepting invite over federation didn't work. Add logging. | Erik Johnston | 2015-01-30 | 1 | -8/+49 |
| | | |||||
* | | Merge pull request #43 from matrix-org/rejections | Erik Johnston | 2015-01-30 | 1 | -119/+310 |
|\ \ | | | | | | | Rejections | ||||
| * | | Only auth_events with event if event in event.auth_events | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| | | | |||||
| * | | Fix bug where we superfluously asked for current state. Change API of ↵ | Erik Johnston | 2015-01-30 | 1 | -33/+18 |
| | | | | | | | | | | | | /query_auth/ so that we don't duplicate events in the response. | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 5 | -43/+75 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| * | | | Update the current state of an event if we update auth events. | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| | | | | |||||
| * | | | Fix regression where we no longer correctly handled the case of gaps in our ↵ | Erik Johnston | 2015-01-30 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | event graph | ||||
| * | | | Initial implementation of auth conflict resolution | Erik Johnston | 2015-01-29 | 1 | -75/+132 |
| | | | | |||||
| * | | | Start implementing auth conflict res | Erik Johnston | 2015-01-28 | 1 | -35/+176 |
| | | | | |||||
* | | | | Add doc string for __nonzero__ overrides for sync results, raise not ↵ | Mark Haines | 2015-01-30 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | implemented if the client attempts to do a gapless sync | ||||
* | | | | Check if the user has joined the room between incremental syncs | Mark Haines | 2015-01-30 | 1 | -4/+27 |
| | | | | |||||
* | | | | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 1 | -2/+3 |
| | | | | |||||
* | | | | Fix token formatting | Mark Haines | 2015-01-30 | 1 | -3/+3 |
| | | | | |||||
* | | | | Filter the recent events before applying the limit when doing an initial sync | Mark Haines | 2015-01-30 | 1 | -11/+10 |
| | | | | |||||
* | | | | Filter the recent events before applying the limit when doing an incremental ↵ | Mark Haines | 2015-01-30 | 1 | -15/+38 |
| | | | | | | | | | | | | | | | | sync with a gap | ||||
* | | | | Update todo for the filtering on sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | | | | |||||
* | | | | Fix indent | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 1 | -5/+7 |
| | | | | |||||
* | | | | Fix check for empty room update | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix v2 initial sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | | | | |||||
* | | | | Use get_room_events_stream to get changes to the rooms if the number of ↵ | Mark Haines | 2015-01-29 | 1 | -11/+45 |
| | | | | | | | | | | | | | | | | changes is small | ||||
* | | | | Remove typing TODO | Mark Haines | 2015-01-29 | 1 | -1/+0 |
| | | | | |||||
* | | | | Add typing notifications to sync | Mark Haines | 2015-01-29 | 1 | -9/+21 |
| | | | | |||||
* | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 4 | -34/+51 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 1 | -1/+11 |
| |\ \ \ | | | | | | | | | | | Extract the device id and token id from the access token when autheniticating users | ||||
| | * | | | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 1 | -1/+11 |
| | | |/ | | |/| | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
| * | | | Merge branch 'master' into develop | David Baker | 2015-01-28 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Add matrix.org as a trusted ID server because it's now passed through on ↵ | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address). | ||||
| * | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 9 | -47/+68 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| * | | | | Reset badge count to zero when last active time is bumped | David Baker | 2015-01-28 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Oops, remove debugging | David Baker | 2015-01-27 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | or of course we could just return the deferred | David Baker | 2015-01-27 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in ↵ | David Baker | 2015-01-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | the cb gets executed. | ||||
| * | | | | Unbreak bad presence merge - don't add these blocks together with an and: ↵ | David Baker | 2015-01-27 | 1 | -12/+14 |
| | | | | | | | | | | | | | | | | | | | | they're different things. | ||||
| * | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 4 | -12/+14 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| * | | | | | Don't make the pushers' event streams cause people to appear online | David Baker | 2015-01-15 | 1 | -21/+22 |
| | | | | | | |||||
* | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 1 | -8/+5 |
| | | | | | | |||||
* | | | | | | Wait for events if the incremental sync is empty and a timeout is given | Mark Haines | 2015-01-27 | 1 | -7/+12 |
| | | | | | | |||||
* | | | | | | Start implementing incremental initial sync | Mark Haines | 2015-01-27 | 1 | -25/+208 |
| | | | | | | |||||
* | | | | | | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 2 | -25/+64 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 3 | -9/+24 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 3 | -9/+24 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed. | ||||
* / | | | | Add handler for /sync API | Mark Haines | 2015-01-26 | 1 | -0/+110 |
|/ / / / | |||||
* | | | | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 1 | -1/+2 |
| | | | | |||||
* | | | | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+0 |
| | | | | |||||
* | | | | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 8 | -35/+42 |
| |/ / |/| | | |||||
* | | | Finish renaming "context" to "room_id" in federation codebase | Mark Haines | 2015-01-16 | 2 | -8/+6 |
| | | | |||||
* | | | Remove temporary debug logging that was accidentally committed | Mark Haines | 2015-01-16 | 1 | -2/+0 |
| | | | |||||
* | | | Don't try to cancel already-expired timers - SYN-230 | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -2/+8 |
|/ / | |||||
* | | Use float rather than integer divisions to turn msec into sec - so timeouts ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+1 |
| | | | | | | | | under 1000msec will actually work | ||||
* | | Make typing notification timeouts print a (debug) logging message | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+7 |
| | | |||||
* | | Add raw query param for scrollback. | Kegan Dougal | 2015-01-08 | 1 | -2/+5 |
| | | |||||
* | | Return the raw federation event rather than adding extra keys for federation ↵ | Kegan Dougal | 2015-01-08 | 2 | -4/+5 |
| | | | | | | | | data. | ||||
* | | Add missing continuation indent. | Erik Johnston | 2015-01-08 | 1 | -1/+2 |
| | | |||||
* | | Add 'raw' query parameter to expose the event graph and signatures to savvy ↵ | Kegan Dougal | 2015-01-08 | 2 | -4/+9 |
| | | | | | | | | clients. | ||||
* | | PEP8 and pyflakes warnings | Kegan Dougal | 2015-01-07 | 2 | -2/+4 |
| | | |||||
* | | SYN-154: Tweak how the m.room.create check is done. | Kegan Dougal | 2015-01-07 | 1 | -2/+11 |
| | | | | | | | | | | Don't perform the check in auth.is_host_in_room but instead do it in _do_join and also assert that there are no m.room.members in the room before doing so. | ||||
* | | SYN-154: Better error messages when joining an unknown room by ID. | Kegan Dougal | 2015-01-07 | 2 | -5/+7 |
|/ | | | | | | The simple fix doesn't work here because room creation also involves unknown room IDs. The check relies on the presence of m.room.create for rooms being created, whereas bogus room IDs have no state events at all. | ||||
* | RoomsForUser now has sender instead of user_id | Erik Johnston | 2015-01-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-06 | 1 | -5/+5 |
|\ | |||||
| * | We don't need the full events for get_rooms_for_user_where_membership_is | Erik Johnston | 2015-01-06 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #28 from matrix-org/erikj-perf | Mark Haines | 2015-01-06 | 1 | -8/+5 |
|\| | | | | | Database performance improvements. | ||||
| * | Add RoomMemberStore.get_users_in_room, so that we can get the list of joined ↵ | Erik Johnston | 2015-01-06 | 1 | -8/+5 |
| | | | | | | | | users without having to retrieve the full events | ||||
* | | Update copyright notices | Mark Haines | 2015-01-06 | 13 | -13/+13 |
|/ | |||||
* | Rate limit display names and avatar urls per request rather than per event. | Kegan Dougal | 2014-12-19 | 1 | -2/+4 |
| | |||||
* | Set a state_key for the topic and room name, otherwise they won't be treated ↵ | Mark Haines | 2014-12-19 | 1 | -0/+2 |
| | | | | as room state | ||||
* | bump_presence_active_time when sending a message event | Mark Haines | 2014-12-19 | 1 | -0/+6 |
| | |||||
* | Don't ratelimit room create events | Mark Haines | 2014-12-19 | 2 | -3/+4 |
| | |||||
* | Set display name when joining via alias | Mark Haines | 2014-12-19 | 1 | -0/+5 |
| | |||||
* | s/user_id/sender/ | Mark Haines | 2014-12-19 | 1 | -1/+1 |
| | |||||
* | Supply auth_chain along with current state in '/state/', fetch auth events ↵ | Mark Haines | 2014-12-18 | 1 | -23/+32 |
| | | | | from a remote server if we are missing some of them | ||||
* | Don't yield on sending the event accross federation. | Mark Haines | 2014-12-18 | 1 | -2/+2 |
| | |||||
* | Fix where we pulled in event.state_events from hotfixes branch | Erik Johnston | 2014-12-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-12-16 | 1 | -2/+6 |
|\ | | | | | | | release-v0.6.0 | ||||
| * | Add FIXME | Erik Johnston | 2014-12-16 | 1 | -0/+1 |
| | | |||||
| * | Fix bug where we did not send the full auth chain to people that joined over ↵ | Erik Johnston | 2014-12-16 | 1 | -2/+5 |
| | | | | | | | | federation | ||||
* | | Make error messages slightly more helpful | Erik Johnston | 2014-12-16 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'release-v0.6.0' into develop | Mark Haines | 2014-12-16 | 1 | -0/+5 |
|\ \ | |||||
| * | | Enable rate limiting for all events | Erik Johnston | 2014-12-16 | 1 | -0/+5 |
| | | | |||||
* | | | Remove send_message since nothing was calling it. Remove Snapshot because ↵ | Mark Haines | 2014-12-16 | 1 | -38/+0 |
| | | | | | | | | | | | | only send_message was using it | ||||
* | | | Construct the EventContext in the state handler rather than constructing one ↵ | Mark Haines | 2014-12-16 | 2 | -19/+6 |
| | | | | | | | | | | | | and then immediately calling state_handler.annotate_context_with_state | ||||
* | | | clean up coding style a bit | Mark Haines | 2014-12-16 | 4 | -12/+8 |
|/ / | |||||
* | | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 4 | -30/+25 |
| | | |||||
* | | Add fixme to raising of AuthError in federation land | Erik Johnston | 2014-12-16 | 1 | -0/+1 |
| | | |||||
* | | User.is_mine is no longer a thing. Use hs.is_mine instead. | Erik Johnston | 2014-12-15 | 1 | -1/+1 |
| | | |||||
* | | Rename MessageHandler.handle_event. Add a few comments. | Erik Johnston | 2014-12-15 | 5 | -7/+24 |
| | | |||||
* | | Get current member state from current_state snapshot. Fix leave test. | Erik Johnston | 2014-12-15 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-15 | 2 | -20/+112 |
|\ \ | | | | | | | | | | | | | Conflicts: tests/handlers/test_room.py | ||||
| * | | Still send typing notifications to myself if I'm the only one in the room ↵ | Paul "LeoNerd" Evans | 2014-12-15 | 1 | -2/+1 |
| | | | | | | | | | | | | (it's a lonely life...) | ||||
| * | | Send list of typing user IDs as 'user_ids' list within 'content', so that ↵ | Paul "LeoNerd" Evans | 2014-12-12 | 1 | -1/+3 |
| | | | | | | | | | | | | m.typing stream events have a toplevel content, for consistency with others | ||||
| * | | When users leave rooms mark them as no longer typing in them | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+8 |
| | | | |||||
| * | | Add a 'user_left_room' distributor signal analogous to 'user_joined_room' | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+7 |
| | | | |||||
| * | | Actually auth-check to ensure people can only send typing notifications for ↵ | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+4 |
| | | | | | | | | | | | | rooms they're actually in | ||||
| * | | Add a sprinkling of logger.debug() into typing notification handler | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+8 |
| | | | |||||
| * | | Initial hack at unit tests of room typing REST API | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+7 |
| | | | |||||
| * | | Avoid cyclic dependency in handler setup | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -4/+10 |
| | | | |||||
| * | | Hook up the event stream to typing notifications | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -2/+22 |
| | | | |||||
| * | | Store serial numbers per room for typing event stream purposes | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -13/+28 |
| | | | |||||
| * | | First hack at implementing timeouts in typing notification handler | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -3/+19 |
| | | | |||||
* | | | Validate message, topic and name event contents | Erik Johnston | 2014-12-12 | 1 | -1/+1 |
| | | | |||||
* | | | Fix federation test | Erik Johnston | 2014-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | Fix public room joining by making sure replaces_state never points to itself. | Erik Johnston | 2014-12-11 | 1 | -7/+7 |
| | | | |||||
* | | | .from_string() no longer takes a HS | Erik Johnston | 2014-12-10 | 1 | -2/+2 |
| | | | |||||
* | | | Remove dead code | Erik Johnston | 2014-12-10 | 1 | -2/+0 |
| | | | |||||
* | | | Add some basic event validation | Erik Johnston | 2014-12-10 | 1 | -2/+6 |
| | | | |||||
* | | | Fix bug where we clobbered old state group values | Erik Johnston | 2014-12-10 | 1 | -0/+9 |
| | | | |||||
* | | | Fix bug when uploading state with empty state_key | Erik Johnston | 2014-12-10 | 2 | -76/+5 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-10 | 1 | -0/+7 |
|\| | | |||||
| * | | fix a million stupid bugs and make it actually work | Matthew Hodgson | 2014-12-08 | 1 | -1/+2 |
| | | | |||||
| * | | actually reset retry schedule if we can successfuly talk to it | Matthew Hodgson | 2014-12-08 | 1 | -0/+6 |
| | | | |||||
* | | | Fix AttributeError | Erik Johnston | 2014-12-10 | 1 | -1/+1 |
| | | | |||||
* | | | Make depth increase. | Erik Johnston | 2014-12-10 | 1 | -1/+1 |
| | | | |||||
* | | | Try and figure out how and why signatures are being changed. | Erik Johnston | 2014-12-10 | 3 | -9/+53 |
| | | | |||||
* | | | PEP8 | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | |