| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Limit number of extremeties in backfill request | Erik Johnston | 2016-08-16 | 1 | -4/+5 |
| | | | | | | This works around a bug where if we make a backfill request with too many extremeties it causes the request URI to be too long. | ||||
| * | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ↵ | Erik Johnston | 2016-08-16 | 1 | -1/+2 |
| |\ | | | | | | | Ralith-fix_integrity_retry | ||||
| | * | Add missing database corruption recovery case | Benjamin Saunders | 2016-08-14 | 1 | -1/+2 |
| | | | | | | | | | Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com> | ||||
| * | | Merge pull request #1009 from matrix-org/erikj/event_split | Erik Johnston | 2016-08-15 | 24 | -92/+367 |
| |\ \ | | | | | | | Split out /events to synchrotron | ||||
| | * | | Doc get_next() context manager usage | Erik Johnston | 2016-08-15 | 1 | -0/+4 |
| | | | | |||||
| | * | | Rename table. Add docs. | Erik Johnston | 2016-08-15 | 4 | -6/+16 |
| | | | | |||||
| | * | | Remove broken cache stuff | Erik Johnston | 2016-08-15 | 2 | -21/+0 |
| | | | | |||||
| | * | | Use cached version of get_aliases_for_room | Erik Johnston | 2016-08-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Implement cache replication stream | Erik Johnston | 2016-08-15 | 5 | -30/+92 |
| | | | | |||||
| | * | | Add some invalidations to a cache_stream | Erik Johnston | 2016-08-15 | 7 | -31/+117 |
| | | | | |||||
| | * | | Always run txn.after_callbacks | Erik Johnston | 2016-08-15 | 1 | -7/+8 |
| | | | | |||||
| | * | | Make synchrotron accept /events | Erik Johnston | 2016-08-12 | 5 | -18/+66 |
| | | | | |||||
| | * | | Dont invoke get_handlers fromClientV1RestServlet | Erik Johnston | 2016-08-12 | 9 | -1/+86 |
| | | | | | | | | | | | | | | | | | | | hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets. | ||||
| * | | | Log the value which is observed in the first place. | Daniel Ehlers | 2016-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The name 'result' is of bool type and has no len property, resulting in a TypeError. Futhermore in the flow control conn.response is observed and hence should be reported. Signed-off-by: Daniel Ehlers <sargon@toppoint.de> | ||||
| * | | | Fix AttributeError when bind_dn is not defined. | Daniel Ehlers | 2016-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case one does not define bind_dn in ldap configuration, filter attribute is not declared. Since auth code only uses ldap_filter attribute when according LDAP mode is selected, it is safe to only declare the attribute in that case. Signed-off-by: Daniel Ehlers <sargon@toppoint.de> | ||||
| * | | | Only process one local membership event per room at a time | Erik Johnston | 2016-08-12 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #997 from Half-Shot/develop | Erik Johnston | 2016-08-11 | 3 | -5/+8 |
| |\ \ | | | | | | | Don't change status_msg on /sync | ||||
| | * | | Synced up synchrotron set_state with PresenceHandler set_state | Will Hunt | 2016-08-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Don't change status_msg on /sync | Will Hunt | 2016-08-10 | 2 | -4/+7 |
| | | | | |||||
| * | | | Include prev_content in redacted state events | Erik Johnston | 2016-08-11 | 1 | -0/+2 |
| | | | | |||||
| * | | | PEP8 | Erik Johnston | 2016-08-10 | 1 | -1/+3 |
| | | | | |||||
| * | | | Clean up TransactionQueue | Erik Johnston | 2016-08-10 | 4 | -221/+162 |
| | | | | |||||
| * | | | Merge pull request #999 from matrix-org/erikj/measure_more | Erik Johnston | 2016-08-10 | 2 | -5/+21 |
| |\ \ \ | | | | | | | | | Measure federation send transaction resources | ||||
| | * | | | Measure federation send transaction resources | Erik Johnston | 2016-08-10 | 2 | -5/+21 |
| | |/ / | |||||
| * | | | Don't stop on 4xx series errors | Erik Johnston | 2016-08-10 | 1 | -11/+1 |
| | | | | |||||
| * | | | Also check if server is in the room | Erik Johnston | 2016-08-10 | 1 | -2/+7 |
| | | | | |||||
| * | | | Also pull out rejected events | Erik Johnston | 2016-08-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Correctly auth /event/ requests | Erik Johnston | 2016-08-10 | 1 | -5/+6 |
| | | | | |||||
| * | | | Only resign our own events | Erik Johnston | 2016-08-10 | 1 | -9/+10 |
| | | | | |||||
| * | | | Store if we fail to fetch an event from a destination | Erik Johnston | 2016-08-10 | 1 | -1/+36 |
| |/ / | |||||
| * | | Merge pull request #996 from matrix-org/erikj/tls_error | Erik Johnston | 2016-08-10 | 2 | -13/+19 |
| |\ \ | | | | | | | Don't print stack traces when failing to get remote keys | ||||
| | * | | Don't print stack traces when failing to get remote keys | Erik Johnston | 2016-08-10 | 2 | -13/+19 |
| | | | | |||||
| * | | | /login: Respond with a 403 when we get an invalid m.login.token | Richard van der Hoff | 2016-08-09 | 1 | -3/+3 |
| |/ / | |||||
| * | | Merge pull request #995 from matrix-org/rav/clean_up_cas_login | David Baker | 2016-08-09 | 1 | -125/+33 |
| |\ \ | | | | | | | Clean up CAS login code | ||||
| | * | | Clean up CAS login code | Richard van der Hoff | 2016-08-08 | 1 | -125/+33 |
| | |/ | | | | | | | | | | | | | Remove some apparently unused code. Clean up parse_cas_response, mostly to catch the exception if the CAS response isn't valid XML. | ||||
| * | | Merge pull request #994 from matrix-org/rav/fix_cas_login | David Baker | 2016-08-08 | 1 | -0/+1 |
| |\ \ | | | | | | | Fix CAS login | ||||
| | * | | Fix CAS login | Richard van der Hoff | 2016-08-08 | 1 | -0/+1 |
| | |/ | | | | | | | Attempting to log in with CAS was giving a 500 error. | ||||
| * | | Merge pull request #993 from matrix-org/rav/fix_token_login | Richard van der Hoff | 2016-08-08 | 3 | -28/+38 |
| |\ \ | |/ |/| | Fix token login | ||||
| | * | Fix login with m.login.token | Richard van der Hoff | 2016-08-08 | 3 | -28/+38 |
| | | | | | | | | | | | login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401. | ||||
| * | | Bump changelog and version | Erik Johnston | 2016-08-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-08 | 12 | -68/+123 |
| |\| | |||||
| | * | Make psutil optional | Erik Johnston | 2016-08-08 | 3 | -6/+16 |
| | | | |||||
| | * | Merge pull request #991 from matrix-org/erikj/retry_make | Erik Johnston | 2016-08-05 | 1 | -11/+24 |
| | |\ | | | | | | | Retry joining via other servers if first one failed. Fix some other bugs. | ||||
| | | * | Fix a couple of python bugs | Erik Johnston | 2016-08-05 | 1 | -6/+8 |
| | | | | |||||
| | | * | Retry joining via other servers if first one failed | Erik Johnston | 2016-08-05 | 1 | -5/+16 |
| | | | | |||||
| | * | | Merge pull request #990 from matrix-org/erikj/fed_vers | Erik Johnston | 2016-08-05 | 6 | -49/+80 |
| | |\ \ | | |/ | |/| | Add federation /version API | ||||
| | | * | Add federation /version API | Erik Johnston | 2016-08-05 | 6 | -9/+25 |
| | | | | |||||
| | | * | Change the way we specify if we require auth or not | Erik Johnston | 2016-08-05 | 1 | -40/+55 |
| | | | | |||||
| | * | | Merge pull request #989 from matrix-org/erikj/raise_404 | Erik Johnston | 2016-08-05 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | Raise 404 when couldn't find event | ||||
| | | * | | Raise 404 when couldn't find event | Erik Johnston | 2016-08-05 | 1 | -1/+1 |
| | | |/ | |||||
| | * / | Don't include html comments in description | Erik Johnston | 2016-08-05 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-05 | 1 | -21/+50 |
| |\| | |||||
| | * | Fix backfill auth events | Erik Johnston | 2016-08-05 | 1 | -21/+50 |
| | | | |||||
| * | | Bump version and changelog | Erik Johnston | 2016-08-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-05 | 14 | -145/+573 |
| |\| | |||||
| | * | Fix typo | Erik Johnston | 2016-08-05 | 1 | -1/+1 |
| | | | |||||
| | * | Check if we already have the events returned by /state/ | Erik Johnston | 2016-08-05 | 1 | -2/+16 |
| | | | |||||
| | * | Delete more tables | Erik Johnston | 2016-08-05 | 1 | -0/+5 |
| | | | |||||
| | * | Fallback to /state/ on both 400 and 404 | Erik Johnston | 2016-08-05 | 1 | -1/+1 |
| | | | |||||
| | * | Tweak integrity error recovery to work as intended | Benjamin Saunders | 2016-08-04 | 2 | -1/+4 |
| | | | |||||
| | * | Merge pull request #973 from matrix-org/erikj/xpath_fix | Erik Johnston | 2016-08-04 | 1 | -14/+72 |
| | |\ | | | | | | | Change the way we summarize URLs | ||||
| | | * | Typo | Erik Johnston | 2016-08-04 | 1 | -1/+1 |
| | | | | |||||
| | | * | Test summarization | Erik Johnston | 2016-08-04 | 1 | -52/+54 |
| | | | | |||||
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix | Erik Johnston | 2016-08-04 | 13 | -125/+411 |
| | | |\ | |||||
| | | * | | Don't infer paragrahs from newlines | Erik Johnston | 2016-08-02 | 1 | -2/+1 |
| | | | | | |||||
| | | * | | Comment on why we clone | Erik Johnston | 2016-08-02 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Spelling. | Erik Johnston | 2016-08-02 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Make it actually compile | Erik Johnston | 2016-08-02 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Change the way we summarize URLs | Erik Johnston | 2016-08-02 | 1 | -11/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using XPath is slow on some machines (for unknown reasons), so use a different approach to get a list of text nodes. Try to generate a summary that respect paragraph and then word boundaries, adding ellipses when appropriate. | ||||
| | * | | | Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error | Erik Johnston | 2016-08-04 | 1 | -4/+66 |
| | |\ \ \ | | |_|/ | |/| | | Retry event persistence on IntegrityError | ||||
| | | * | | Fix typo | Erik Johnston | 2016-08-04 | 1 | -3/+4 |
| | | | | | |||||
| | | * | | Retry event persistence on IntegrityError | Erik Johnston | 2016-08-04 | 1 | -4/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in the porting script some backfilled events were not correctly persisted, causing irrecoverable IntegrityErrors on future attempts to persist those events. This commit adds a retry mechanism invoked upon IntegrityError, where when retried the tables are purged for all references to the events being persisted. | ||||
| | * | | | Fix typos. | Erik Johnston | 2016-08-04 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api | Erik Johnston | 2016-08-04 | 11 | -124/+260 |
| | |\| | | |||||
| | | * | | keys/query: Omit device displayname if null | Richard van der Hoff | 2016-08-04 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | ... which makes it more consistent with user displaynames. | ||||
| | | * | | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -10/+10 |
| | | | | | |||||
| | | * | | Include device name in /keys/query response | Richard van der Hoff | 2016-08-03 | 2 | -20/+51 |
| | | | | | | | | | | | | | | | | | Add an 'unsigned' section which includes the device display name. | ||||
| | | * | | keys/query: return all users which were asked for | Richard van der Hoff | 2016-08-03 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | In the situation where all of a user's devices get deleted, we want to indicate this to a client, so we want to return an empty dictionary, rather than nothing at all. | ||||
| | | * | | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 4 | -5/+23 |
| | | |\ \ | |||||
| | | | * | | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 |
| | | | | | | |||||
| | | | * | | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 4 | -5/+23 |
| | | | |/ | | | | | | | | | | | | | | | | | | | | | It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device". | ||||
| | | * | | Merge branch 'rav/refactor_device_query' into develop | Richard van der Hoff | 2016-08-03 | 6 | -82/+167 |
| | | |\ \ | |||||
| | | | * | | E2eKeysHandler: minor tweaks | Richard van der Hoff | 2016-08-03 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | PR feedback | ||||
| | | | * | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 15 | -64/+427 |
| | | | |\| | |||||
| | | | * | | E2E keys: Make federation query share code with client query | Richard van der Hoff | 2016-08-02 | 3 | -47/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the e2e query handler to separate out the local query, and then make the federation handler use it. | ||||
| | | | * | | Move e2e query logic into a handler | Richard van der Hoff | 2016-08-01 | 4 | -60/+102 |
| | | | | | | |||||
| | | * | | | Remove other bit of deduplication | Erik Johnston | 2016-08-03 | 1 | -19/+0 |
| | | | | | | |||||
| | | * | | | Ensure we only persist an event once at a time | Erik Johnston | 2016-08-03 | 1 | -1/+18 |
| | | | |/ | | |/| | |||||
| | * | | | Tidy up get_events | Erik Johnston | 2016-08-04 | 1 | -12/+10 |
| | | | | | |||||
| | * | | | Rename fields to _ids | Erik Johnston | 2016-08-03 | 2 | -4/+4 |
| | | | | | |||||
| | * | | | Fix copy + paste fails | Erik Johnston | 2016-08-03 | 2 | -6/+11 |
| | | | | | |||||
| | * | | | Actually call get_room_state | Erik Johnston | 2016-08-03 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Fix syntax error | Erik Johnston | 2016-08-03 | 1 | -1/+8 |
| | | | | | |||||
| | * | | | Comment | Erik Johnston | 2016-08-03 | 1 | -0/+14 |
| | | | | | |||||
| | * | | | Add /state_ids federation API | Erik Johnston | 2016-08-03 | 4 | -3/+125 |
| | |/ / | | | | | | | | | | | | | The new API only returns the event_ids for the state, as most requesters will already have the vast majority of the events already. | ||||
| * | | | Bump version and changelog v0.17.0-rc3 | Erik Johnston | 2016-08-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-02 | 18 | -110/+643 |
| |\| | | |||||
| | * | | Don't double wrap 200 | Erik Johnston | 2016-08-02 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix response cache | Erik Johnston | 2016-08-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge pull request #940 from matrix-org/erikj/fed_state_cache | Erik Johnston | 2016-08-02 | 5 | -32/+60 |
| | |\ \ | | | | | | | | | Cache federation state responses | ||||
| | | * | | Cache federation state responses | Erik Johnston | 2016-07-21 | 5 | -32/+60 |
| | | | | | |||||
| | * | | | Merge pull request #967 from matrix-org/erikj/fed_reader | Erik Johnston | 2016-08-02 | 7 | -18/+342 |
| | |\ \ \ | | | | | | | | | | | Split out the federation reading portions into a separate. | ||||
| | | * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-08-02 | 3 | -3/+23 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 1 | -4/+31 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 37 | -295/+929 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Add destination retry to slave store | Erik Johnston | 2016-07-28 | 2 | -0/+32 |
| | | | | | | | | | |||||
| | | * | | | | | | Add slace storage functions for public room list | Erik Johnston | 2016-07-28 | 3 | -0/+48 |
| | | | | | | | | | |||||
| | | * | | | | | | Add get_auth_chain to slave store | Erik Johnston | 2016-07-28 | 1 | -0/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | Add more key storage funcs into slave store | Erik Johnston | 2016-07-28 | 2 | -24/+26 |
| | | | | | | | | | |||||
| | | * | | | | | | Split out a FederationReader process | Erik Johnston | 2016-07-21 | 4 | -0/+238 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into dbkr/fix_add_email_on_register | Mark Haines | 2016-08-02 | 3 | -3/+23 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | | Ignore AlreadyCalled errors on timer cancel | Erik Johnston | 2016-07-31 | 2 | -3/+16 |
| | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | | Merge pull request #958 from matrix-org/paul/SYN-738 | Paul Evans | 2016-07-29 | 1 | -0/+7 |
| | | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | Forbid non-ASes from registering users whose names begin with '_' | ||||
| | | | * | | | | Forbid non-ASes from registering users whose names begin with '_' (SYN-738) | Paul "LeoNerd" Evans | 2016-07-27 | 1 | -0/+7 |
| | | | | | | | | |||||
| | * | | | | | | Fix adding emails on registration | David Baker | 2016-07-29 | 1 | -9/+7 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Synapse was not adding email addresses to accounts registered with an email address, due to too many different variables called 'result'. Rename both of them. Also remove the defer.returnValue() with no params because that's not a thing. | ||||
| | * | | | | | Merge pull request #964 from matrix-org/erikj/fed_join_fix | Erik Johnston | 2016-07-29 | 1 | -4/+31 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Handle the case of missing auth events when joining a room | ||||
| | | * | | | | Mention that func will fetch auth events | Erik Johnston | 2016-07-29 | 1 | -0/+2 |
| | | | | | | | |||||
| | | * | | | | Update docstring | Erik Johnston | 2016-07-29 | 1 | -0/+6 |
| | | | | | | | |||||
| | | * | | | | Handle the case of missing auth events when joining a room | Erik Johnston | 2016-07-28 | 1 | -4/+23 |
| | | | | | | | |||||
| | * | | | | | Fix SQL to supply arguments in the same order | Mark Haines | 2016-07-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Create separate methods for getting messages to push | Mark Haines | 2016-07-28 | 4 | -51/+163 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the email and http pushers rather than trying to make a single method that will work with their conflicting requirements. The http pusher needs to get the messages in ascending stream order, and doesn't want to miss a message. The email pusher needs to get the messages in descending timestamp order, and doesn't mind if it misses messages. | ||||
| | * | | | | | Comment get_unread_push_actions_for_user_in_range function | Kegan Dougal | 2016-07-28 | 1 | -2/+26 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-28 | 1 | -1/+1 |
| | |\| | | | | |||||
| | * | | | | | Merge pull request #962 from matrix-org/markjh/retry | Mark Haines | 2016-07-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fix retry utils to check if the exception is a subclass of CME | ||||
| | | * | | | | | Fix retry utils to check if the exception is a subclass of CME | Mark Haines | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #941 from matrix-org/erikj/key_client_fix | Erik Johnston | 2016-07-28 | 1 | -3/+9 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Send the correct host header when fetching keys | ||||
| * | | | | | | | Bump changeog and version | Erik Johnston | 2016-08-02 | 1 | -1/+1 |
| | |_|/ / / / |/| | | | | | |||||
| * | | | | | | 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 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Bump version and changelog | Erik Johnston | 2016-07-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-07-28 | 7 | -14/+85 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name | Erik Johnston | 2016-07-28 | 1 | -1/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | Don't include name of room for invites in push | ||||
| | | * | | | | Don't include name of room for invites in push | David Baker | 2016-07-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Avoids insane pushes like, "Bob invited you to invite from Bob" | ||||
| | * | | | | | Merge pull request #960 from matrix-org/rav/support_r0.2 | Richard van der Hoff | 2016-07-28 | 1 | -1/+5 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Add r0.2.0 to the "supported versions" list | ||||
| | | * | | | | Add r0.1.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | Add r0.2.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | Typo | David Baker | 2016-07-28 | 1 | -1/+1 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload | Richard van der Hoff | 2016-07-27 | 4 | -11/+75 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Make the device id on e2e key upload optional | ||||
| | | * | | | key upload tweaks | Richard van der Hoff | 2016-07-27 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add v2_alpha URL back in, since things seem to be using it. 2. Don't reject the request if the device_id in the upload request fails to match that in the access_token. | ||||
| | | * | | | SQL syntax fix | Richard van der Hoff | 2016-07-27 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 3 | -4/+28 |
| | | | | | | |||||
| | | * | | | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 2 | -12/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should now be able to get our device_id from the access_token, so the device_id on the upload request is optional. Where it is supplied, we should check that it matches. For active access_tokens without an associated device_id, we ought to register the device in the devices table. Also update the table on upgrade so that all of the existing e2e keys are associated with real devices. | ||||
| * | | | | | Bump CHANGES and version | Erik Johnston | 2016-07-27 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'develop' into markjh/verify | Mark Haines | 2016-07-27 | 2 | -3/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #954 from matrix-org/markjh/even_more_fixes | Mark Haines | 2016-07-27 | 2 | -9/+11 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix a couple of bugs in the transaction and keyring code | ||||
| | | * | | | | Fix a couple of bugs in the transaction and keyring code | Mark Haines | 2016-07-26 | 2 | -9/+11 |
| | | |/ / / | |||||
| * | / / / | Clean up verify_json_objects_for_server | Mark Haines | 2016-07-27 | 1 | -68/+75 |
| |/ / / / | |||||
| * | | | | Merge pull request #952 from matrix-org/markjh/more_fixes | Mark Haines | 2016-07-26 | 1 | -0/+4 |
| |\ \ \ \ | |/ / / |/| | | | Check if the user is banned when handling 3pid invites | ||||
| | * | | | Check if the user is banned when handling 3pid invites | Mark Haines | 2016-07-26 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 7 | -49/+79 |
| |/ / / | | | | | | | | | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
| * | | | Fix typo | Richard van der Hoff | 2016-07-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device | Richard van der Hoff | 2016-07-26 | 2 | -55/+113 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #951 from matrix-org/rav/flake8 | Richard van der Hoff | 2016-07-26 | 1 | -5/+3 |
| | |\ \ \ | | | | | | | | | | | Fix flake8 noise | ||||
| | | * | | | Fix flake8 violation | Richard van der Hoff | 2016-07-26 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently flake8 v3 puts the error on a different line to v2. Easiest way to make sure that happens is by putting the whole statement on one line :) | ||||
| | * | | | | Merge pull request #948 from matrix-org/markjh/auth_fixes | Mark Haines | 2016-07-26 | 1 | -50/+110 |
| | |\ \ \ \ | | |/ / / | |/| | | | Don't add rejections to the state_group, persist all rejections | ||||
| | | * | | | Fix how push_actions are redacted. | Mark Haines | 2016-07-26 | 1 | -8/+10 |
| | | | | | | |||||
| | | * | | | Don't add rejected events if we've seen them befrore. Add some comments to ↵ | Mark Haines | 2016-07-26 | 1 | -5/+48 |
| | | | | | | | | | | | | | | | | | | | | | explain what the code is doing mechanically | ||||
| | | * | | | Only update the events and event_json tables for rejected events | Mark Haines | 2016-07-25 | 2 | -52/+63 |
| | | | | | | |||||
| | | * | | | Don't add the events to forward extremities if the event is rejected | Mark Haines | 2016-07-25 | 1 | -3/+6 |
| | | | | | | |||||
| | | * | | | Don't add rejections to the state_group, persist all rejections | Mark Haines | 2016-07-25 | 2 | -5/+6 |
| | | | | | | |||||
| * | | | | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 2 | -15/+49 |
| |/ / / / | |||||
| * | | | | Merge pull request #949 from matrix-org/rav/update_devices | David Baker | 2016-07-26 | 10 | -22/+213 |
| |\ \ \ \ | | | | | | | | | | | Implement updates and deletes for devices | ||||
| | * | | | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 3 | -8/+67 |
| | | | | | | | | | | | | | | | | | | | | | You can update the displayname of devices now. | ||||
| | * | | | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 9 | -15/+146 |
| | | | | | | |||||
| | * | | | | Log when adding listeners | Richard van der Hoff | 2016-07-25 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | typo | Matthew Hodgson | 2016-07-26 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostname | David Baker | 2016-07-25 | 1 | -2/+11 |
| |\ \ \ \ | |/ / / |/| | | | Log the hostname the reCAPTCHA was completed on | ||||
| | * | | | Use get to avoid KeyErrors | David Baker | 2016-07-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Log the hostname the reCAPTCHA was completed on | David Baker | 2016-07-22 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | This could be useful information to have in the logs. Also comment about how & why we don't verify the hostname. | ||||
| * | | | | fix: defer.returnValue takes one argument | Mark Haines | 2016-07-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | background updates: fix assert again | Richard van der Hoff | 2016-07-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | background updates: Fix assertion to do something | Richard van der Hoff | 2016-07-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix background_update tests | Richard van der Hoff | 2016-07-25 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | A bit of a cleanup for background_updates, and make sure that the real background updates have run before we start the unit tests, so that they don't interfere with the tests. | ||||
| * | | | | PEP8 | Richard van der Hoff | 2016-07-22 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Create index on user_ips in the background | Richard van der Hoff | 2016-07-22 | 3 | -12/+80 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | user_ips is kinda big, so really we want to add the index in the background once we're running. Replace the schema delta with one which will do that. I've done this in a way that's reasonably easy to reuse as there a few other indexes I need, and I don't suppose they will be the last. | ||||
| * | / | make /devices return a list | Richard van der Hoff | 2016-07-21 | 1 | -5/+5 |
| | |/ |/| | | | | | Turns out I specced this to return a list of devices rather than a dict of them | ||||
| * | | Merge pull request #943 from matrix-org/rav/get_device_api | David Baker | 2016-07-21 | 2 | -9/+62 |
| |\ \ | | | | | | | Implement GET /device/{deviceId} | ||||
| | * | | Fix PEP8 errors | Richard van der Hoff | 2016-07-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 2 | -9/+62 |
| | | | | |||||
| * | | | Merge pull request #942 from matrix-org/rav/fix_register_deviceid | David Baker | 2016-07-21 | 1 | -11/+10 |
| |\ \ \ | |/ / |/| | | Preserve device_id from first call to /register | ||||
| | * | | Preserve device_id from first call to /register | Richard van der Hoff | 2016-07-21 | 1 | -11/+10 |
| | |/ | | | | | | | | | device_id may only be passed in the first call to /register, so make sure we fish it out of the register `params` rather than the body of the final call. | ||||
| * | | storage/client_ips: remove some dead code | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 |
| | | | |||||
| * | | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 4 | -22/+67 |
| |\| | | | | | | | (pick up PR #938 in the hope of fixing the UTs) | ||||
| | * | Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ips | Richard van der Hoff | 2016-07-20 | 2 | -7/+25 |
| | |\ | | | | | | | Record device_id in client_ips | ||||
| | | * | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 2 | -7/+25 |
| | | | | | | | | | | | | | | | | Record the device_id when we add a client ip; it's somewhat redundant as we could get it via the access_token, but it will make querying rather easier. | ||||
| | * | | Don't explode if we have no snapshots yet | Erik Johnston | 2016-07-20 | 1 | -0/+3 |
| | | | | |||||
| | * | | Merge pull request #937 from matrix-org/rav/register_device_on_register | David Baker | 2016-07-20 | 1 | -15/+39 |
| | |\ \ | | |/ | |/| | Register a device_id in the /v2/register flow. | ||||
| | | * | Register a device_id in the /v2/register flow. | Richard van der Hoff | 2016-07-20 | 1 | -15/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't cover *all* of the registration flows, but it does cover the most common ones: in particular: shared_secret registration, appservice registration, and normal user/pass registration. Pull device_id from the registration parameters. Register the device in the devices table. Associate the device with the returned access and refresh tokens. Profit. | ||||
| * | | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 7 | -5/+198 |
| |/ / | | | | | | | | | | | | | implement a GET /devices endpoint which lists all of the user's devices. It also returns the last IP where we saw that device, so there is some dancing to fish that out of the user_ips table. | ||||
| * / | More doc-comments | Richard van der Hoff | 2016-07-20 | 2 | -10/+14 |
| |/ | | | | Fix some more comments on some things | ||||
| * | Merge pull request #936 from matrix-org/erikj/log_rss | Erik Johnston | 2016-07-20 | 4 | -1/+50 |
| |\ | | | | | Add metrics for psutil derived memory usage | ||||
| | * | Add metrics for psutil derived memory usage | Erik Johnston | 2016-07-20 | 4 | -1/+50 |
| | | | |||||
| * | | Merge pull request #935 from matrix-org/erikj/backfill_notifs | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
| |\ \ | | | | | | | Don't notify pusher pool for backfilled events | ||||
| | * | | Don't notify pusher pool for backfilled events | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
| | |/ | |||||
| * | | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 6 | -0/+46 |
| |\ \ | | | | | | | Type annotations | ||||
| | * | | Type annotations | Richard van der Hoff | 2016-07-19 | 6 | -0/+46 |
| | | | | | | | | | | | | | | | | Add some type annotations to help PyCharm (in particular) to figure out the types of a bunch of things. | ||||
| * | | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 4 | -21/+52 |
| |\ \ \ | |_|/ |/| | | Further registration refactoring | ||||
| | * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 4 | -21/+52 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change. | ||||
| * | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 6 | -9/+239 |
| |\ \ | |/ |/| | Feature: Add filter to /messages. Add 'contains_url' to filter. | ||||
| | * | Comment | Erik Johnston | 2016-07-20 | 1 | -0/+4 |
| | | | |||||
| | * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 2 | -5/+22 |
| | | | |||||
| | * | Add support for filters in paginate_room_events | Erik Johnston | 2016-07-14 | 1 | -1/+51 |
| | | | |||||
| | * | Add 'contains_url' to filter | Erik Johnston | 2016-07-14 | 1 | -3/+20 |
| | | | |||||
| | * | Add sender and contains_url field to events table | Erik Johnston | 2016-07-14 | 2 | -0/+142 |
| | | | |||||
| * | | Merge pull request #931 from matrix-org/rav/refactor_register | David Baker | 2016-07-19 | 1 | -78/+102 |
| |\ \ | | | | | | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | ||||
| | * | | Don't bind email unless threepid contains expected fields | Richard van der Hoff | 2016-07-19 | 1 | -28/+25 |
| | | | | |||||
| | * | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | Richard van der Hoff | 2016-07-19 | 1 | -75/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to be an *almost* non-functional change, with the exception that it fixes what looks a lot like a bug in that it only calls `auth_handler.add_threepid` and `add_pusher` once instead of three times. The idea is to move the generation of the `access_token` out of `registration_handler.register`, because `access_token`s now require a device_id, and we only want to generate a device_id once registration has been successful. | ||||
| * | | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login | Richard van der Hoff | 2016-07-19 | 10 | -24/+265 |
| |\ \ \ | |/ / |/| | | Add device_id support to /login | ||||
| | * | | schema fix | Richard van der Hoff | 2016-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | device_id should be text, not bigint. | ||||
| | * | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 10 | -24/+265 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed. | ||||
| * | | | Summary line | Mark Haines | 2016-07-19 | 1 | -2/+1 |
| | | | | |||||
| * | | | Update docstring on Handlers. | Mark Haines | 2016-07-19 | 1 | -3/+15 |
| |/ / | | | | | | | To indicate it is deprecated. | ||||
| * | | Merge pull request #928 from matrix-org/rav/refactor_login | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 |
| |\ \ | | | | | | | Refactor login flow | ||||
| | * | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we have the canonical user_id *before* calling get_login_tuple_for_user_id. Replace login_with_password with a method which just validates the password, and have the caller call get_login_tuple_for_user_id. This brings the password flow into line with the other flows, and will give us a place to register the device_id if necessary. | ||||
| * | | | Merge pull request #924 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-18 | 1 | -19/+15 |
| |\ \ \ | | | | | | | | | Fix /purge_history bug | ||||
| | * | | | Fix /purge_history bug | Erik Johnston | 2016-07-15 | 1 | -19/+15 |
| | | | | | | | | | | | | | | | | | This was caused by trying to insert duplicate backward extremeties | ||||
| * | | | | Merge pull request #925 from matrix-org/markjh/auth_fix | Mark Haines | 2016-07-18 | 1 | -0/+5 |
| |\ \ \ \ | | | | | | | | | | | Fix 500 ISE when sending alias event without a state_key | ||||
| | * | | | | Fix 500 ISE when sending alias event without a state_key | Mark Haines | 2016-07-15 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Merge pull request #927 from Half-Shot/develop | Erik Johnston | 2016-07-18 | 1 | -5/+6 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Fall back to 'username' if 'user' is not given for appservice registration. | ||||
| | * | | | | Use body.get to check for 'user' | Will Hunt | 2016-07-16 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | Fall back to 'username' if 'user' is not given for appservice reg. | Will Hunt | 2016-07-16 | 1 | -3/+5 |
| | |/ / / | |||||
| * / / / | Fix a doc-comment | Richard van der Hoff | 2016-07-18 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | The `store` in a handler is a generic DataStore, not just an events.StateStore. | ||||
| * | | | Merge pull request #923 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-15 | 2 | -2/+13 |
| |\| | | | | | | | | Various purge_history fixes | ||||
| | * | | Pull out min stream_ordering from ex_outlier_stream | Erik Johnston | 2016-07-15 | 1 | -1/+2 |
| | | | | |||||
| | * | | event_backwards_extremeties may not be empty | Erik Johnston | 2016-07-15 | 1 | -1/+11 |
| | | | | |||||
| * | | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 3 | -5/+35 |
| |\ \ \ | |/ / |/| | | Various auth.py fixes. | ||||
| | * | | Comment | Erik Johnston | 2016-07-15 | 2 | -0/+6 |
| | | | | |||||
| | * | | Check sender signed event | Erik Johnston | 2016-07-14 | 3 | -6/+12 |
| | | | | |||||
| | * | | Check if alias event's state_key matches sender's domain | Erik Johnston | 2016-07-13 | 1 | -0/+11 |
| | | | | |||||
| | * | | Check creation event's room_id domain matches sender's | Erik Johnston | 2016-07-13 | 1 | -0/+7 |
| | | | | |||||
| * | | | Merge pull request #921 from matrix-org/erikj/account_deactivate | Erik Johnston | 2016-07-14 | 1 | -0/+44 |
| |\ \ \ | | | | | | | | | Feature: Add an /account/deactivate endpoint | ||||
| | * | | | Add hs object | Erik Johnston | 2016-07-14 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Only accept password auth | Erik Johnston | 2016-07-14 | 1 | -12/+0 |
| | | | | | |||||
| | * | | | Add an /account/deactivate endpoint | Erik Johnston | 2016-07-14 | 1 | -0/+55 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 4 | -6/+10 |
| |\ \ \ | |/ / |/| | | Bug fix: expire invalid access tokens | ||||
| | * | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 4 | -6/+10 |
| | |/ | |||||
| * | | Merge pull request #915 from matrix-org/dbkr/more_requesttokens | David Baker | 2016-07-13 | 3 | -30/+103 |
| |\ \ | |/ |/| | Add requestToken endpoints | ||||
| | * | be more pythonic | David Baker | 2016-07-12 | 1 | -1/+1 |
| | | | |||||
| | * | on_OPTIONS isn't neccessary | David Baker | 2016-07-12 | 2 | -10/+1 |
| | | | |||||
| | * | Remove other debug logging | David Baker | 2016-07-12 | 1 | -2/+0 |
| | | | |||||
| | * | Separate out requestTokens to separate handlers | David Baker | 2016-07-11 | 2 | -65/+93 |
| | | | |||||
| | * | Oops, remove debug logging | David Baker | 2016-07-11 | 1 | -4/+0 |
| | | | |||||
| | * | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 2 | -0/+60 |
| | | | |||||
| * | | Add a comment explaining allow_none | Mark Haines | 2016-07-08 | 1 | -0/+2 |
| | | | |||||
| * | | Ensure that the guest user is in the database when upgrading accounts | Mark Haines | 2016-07-08 | 1 | -0/+13 |
| |/ | |||||
| * | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 5 | -9/+25 |
| |\ | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |