Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #129 from matrix-org/key_distribution | Erik Johnston | 2015-04-29 | 15 | -76/+966 |
|\ | | | | | Key distribution v2 | ||||
| * | bump database schema version | Mark Haines | 2015-04-29 | 2 | -1/+1 |
| | | |||||
| * | Use a defer.gatherResults to collect results from the perspective servers | Mark Haines | 2015-04-29 | 1 | -11/+21 |
| | | |||||
| * | Use bytea rather than BLOB | Mark Haines | 2015-04-29 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 95 | -1011/+3332 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | | Update the query format used by keyring to match current key v2 spec | Mark Haines | 2015-04-29 | 1 | -1/+12 |
| | | | |||||
| * | | Implement minimum_valid_until_ts in the remote key resource | Mark Haines | 2015-04-29 | 2 | -4/+56 |
| | | | |||||
| * | | And don't bump the schema version unnecessarily | Mark Haines | 2015-04-28 | 1 | -1/+1 |
| | | | |||||
| * | | Add server_keys.sql to the current delta rather than creating a new delta | Mark Haines | 2015-04-28 | 1 | -0/+0 |
| | | | |||||
| * | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-27 | 4 | -22/+63 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py | ||||
| * | | | Add config for setting the perspective servers | Mark Haines | 2015-04-24 | 3 | -5/+27 |
| | | | | |||||
| * | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * | | | | | Add a config file for perspective servers | Mark Haines | 2015-04-24 | 2 | -0/+30 |
| | | | | | | |||||
| * | | | | | Copyright notice | Mark Haines | 2015-04-24 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 9 | -67/+160 |
| |\ \ \ \ \ | |||||
| * | | | | | | Move the key related config parser into a separate file | Mark Haines | 2015-04-24 | 3 | -85/+113 |
| | | | | | | | |||||
| * | | | | | | Better help for the old-signing-key option | Mark Haines | 2015-04-24 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Update to match the specification for key/v2 | Mark Haines | 2015-04-23 | 3 | -21/+26 |
| | | | | | | | |||||
| * | | | | | | Implement remote key lookup api | Mark Haines | 2015-04-22 | 7 | -61/+252 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-21 | 9 | -296/+258 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-20 | 4 | -19/+28 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Implement v2 key lookup | Mark Haines | 2015-04-20 | 2 | -18/+254 |
| | | | | | | | | | |||||
| * | | | | | | | | Add methods for storing and retrieving the raw key json | Mark Haines | 2015-04-15 | 2 | -3/+59 |
| | | | | | | | | | |||||
| * | | | | | | | | Fail quicker for 4xx responses in the key client, optional hit a different ↵ | Mark Haines | 2015-04-15 | 1 | -6/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API path | ||||
| * | | | | | | | | Return a sha256 fingerprint rather than the entire tls certificate | Mark Haines | 2015-04-14 | 3 | -3/+33 |
| | | | | | | | | | |||||
| * | | | | | | | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 6 | -2/+179 |
| | | | | | | | | | |||||
* | | | | | | | | | Make postgres database error slightly more helpful | Erik Johnston | 2015-04-29 | 2 | -13/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Use __all__ instead of assert to stop pyflakes from warning about unused ↵ | Erik Johnston | 2015-04-29 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import in __init__ | ||||
* | | | | | | | | | Merge branch 'develop' into erikj/postgres_charset_check | Mark Haines | 2015-04-29 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Delete ugly commented out log line. | Mark Haines | 2015-04-29 | 1 | -1/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Appease PEP8 | Erik Johnston | 2015-04-29 | 1 | -0/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Check that postgres database has correct charset set | Erik Johnston | 2015-04-29 | 5 | -1/+43 |
|/ / / / / / / / | |||||
* | | | | | | | | comment out ugly test logline | Matthew Hodgson | 2015-04-29 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Ensure we never miss any presence updates | Erik Johnston | 2015-04-28 | 1 | -1/+7 |
| | | | | | | | | |||||
* | | | | | | | | Fix typo | Erik Johnston | 2015-04-28 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Ensure the serial returned by presence is always an integer | Erik Johnston | 2015-04-28 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Remove unused imports | Erik Johnston | 2015-04-28 | 1 | -2/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-28 | 30 | -287/+1310 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 26 | -264/+1267 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Client / Server Auth Refactor | ||||
| | * | | | | | | | | Add commentage. | David Baker | 2015-04-27 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | pep8 | David Baker | 2015-04-27 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | logging args | David Baker | 2015-04-27 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Change to https for ID server communication | David Baker | 2015-04-24 | 1 | -3/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | More underscores | David Baker | 2015-04-24 | 2 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use underscores instead of camelcase for id server stuff | David Baker | 2015-04-24 | 3 | -14/+14 |
| | | | | | | | | | | |||||
| | * | | | | | | | | pep8 | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 13 | -367/+337 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| | * | | | | | | | | | Dedicated error code for failed 3pid auth verification | David Baker | 2015-04-23 | 2 | -1/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | 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. | ||||
| | * | | | | | | | | | Add an error code to 'missing token' response. | David Baker | 2015-04-23 | 2 | -1/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Remove now-redundant email config | David Baker | 2015-04-23 | 2 | -44/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | pep8 | David Baker | 2015-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Password reset, finally. | David Baker | 2015-04-17 | 3 | -7/+38 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add endpoint to get threepids from server | David Baker | 2015-04-17 | 2 | -0/+23 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | pep8 | David Baker | 2015-04-17 | 4 | -9/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | make add3pid servlet work | David Baker | 2015-04-17 | 4 | -12/+82 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | just the once would probably be fine | David Baker | 2015-04-17 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 32 | -473/+970 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Register the 3pid servlet | David Baker | 2015-04-17 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | password -> account servlet and add start of an 'add 3pid' endpoint | David Baker | 2015-04-17 | 2 | -2/+17 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | 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 | 4 | -66/+88 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Dummy login so we can do the first POST request to get login flows without ↵ | David Baker | 2015-04-15 | 4 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it just succeeding | ||||
| | * | | | | | | | | | | Regstration with email in v2 | David Baker | 2015-04-15 | 6 | -29/+123 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add app service auth back in to v2 register | David Baker | 2015-04-02 | 2 | -5/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Throw sensible errors on not-json when allowing empty body | David Baker | 2015-04-02 | 1 | -1/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 | David Baker | 2015-04-02 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 2 | -12/+61 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Explain how I justified to myself making JsonResource not always send JSON. | David Baker | 2015-04-01 | 1 | -0/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Completely replace fallback auth for C/S V2: | David Baker | 2015-04-01 | 5 | -25/+275 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
| | * | | | | | | | | | | Make docs a bit more true | David Baker | 2015-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Grammar and deduplication | David Baker | 2015-03-31 | 1 | -5/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 | David Baker | 2015-03-31 | 3 | -4/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 8 | -16/+192 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 | David Baker | 2015-03-26 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Delete pushers when changing password | David Baker | 2015-03-26 | 3 | -37/+31 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 blank lines | David Baker | 2015-03-25 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵ | David Baker | 2015-03-25 | 5 | -28/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag in the API. | ||||
| | * | | | | | | | | | | unused import | David Baker | 2015-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 8 | -26/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it. | ||||
| | * | | | | | | | | | | Make deleting other access tokens when you change your password actually work | David Baker | 2015-03-24 | 2 | -6/+15 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 / pyflakes | David Baker | 2015-03-23 | 2 | -7/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Implement password changing (finally) along with a start on making ↵ | David Baker | 2015-03-23 | 7 | -49/+236 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/server auth more general. | ||||
| * | | | | | | | | | | | Merge pull request #133 from matrix-org/invite_power_level | Mark Haines | 2015-04-28 | 2 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Invite power level | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into invite_power_level | Paul "LeoNerd" Evans | 2015-04-27 | 13 | -67/+206 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Also remember to check 'invite' level for changes | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Create an 'invite' powerlevel when making new rooms | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Initial implementation of an 'invite' power_level | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #130 from matrix-org/server_rename_check | Mark Haines | 2015-04-28 | 2 | -1/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for SYN-266 | ||||
| | * | | | | | | | | | | | | pep8 | David Baker | 2015-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | pep8 | David Baker | 2015-04-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Run database check before daemonizing, at the cost of database hygiene. | David Baker | 2015-04-27 | 3 | -27/+18 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | rename db method to be more informative | David Baker | 2015-04-27 | 2 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | pep8 | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Check users in our table aren't on a different domain to the one we're ↵ | David Baker | 2015-04-24 | 2 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured with to try & fix SYN-266 | ||||
| * | | | | | | | | | | | | | Output vim style mode markers into the yaml config file | Mark Haines | 2015-04-28 | 1 | -3/+4 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except ↵ | Erik Johnston | 2015-04-28 | 32 | -289/+289 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for a limit | ||||
* | | | | | | | | | | | | | Remove unused import | Erik Johnston | 2015-04-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Move database configuration into config module | Erik Johnston | 2015-04-27 | 2 | -33/+25 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Ensure check_same_thread is enabled for sqlite3 | Erik Johnston | 2015-04-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Make get_max_token into inlineCallbacks so that the lock works. | Erik Johnston | 2015-04-27 | 1 | -3/+4 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-27 | 20 | -385/+482 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix newlines | Erik Johnston | 2015-04-27 | 1 | -2/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Pull inner function out. | Erik Johnston | 2015-04-27 | 1 | -76/+77 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Implement locks using create_observer for fetching media and server keys | Erik Johnston | 2015-04-27 | 2 | -60/+82 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Implement create_observer. | Erik Johnston | 2015-04-27 | 1 | -0/+19 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `create_observer` takes a deferred and create a new deferred that *observers* the original deferred. Any callbacks added to the observing deferred will *not* affect the origin deferred. | ||||
| * | | | | | | | | | / | Make one-to-one rule an underride otherwise bings don't work in one-to-one ↵ | David Baker | 2015-04-24 | 1 | -21/+21 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrooms. Likewise a couple of other rules. | ||||
| * | | | | | | | | | | Fix spelling | Mark Haines | 2015-04-24 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Call the super classes when generating config | Mark Haines | 2015-04-24 | 1 | -0/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Copyright notices | Mark Haines | 2015-04-24 | 6 | -0/+84 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | No commas here, otherwise our error string constants become tuples. | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Remove users from the remote_offline_serials list (and clean up empty ↵ | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements) when they go online again | ||||
| * | | | | | | | Don't let the remote offline serial list grow arbitrarily large | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Store a list of the presence serial number at which remote users went ↵ | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261) | ||||
| * | | | | | | | Generate presence event-stream JSON structures directly | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -8/+9 |
| | | | | | | | | |||||
| * | | | | | | | Neater fetching of user's auth level in a room - squash to int() at access ↵ | Paul "LeoNerd" Evans | 2015-04-22 | 1 | -35/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time (SYN-353) | ||||
| * | | | | | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-04-22 | 1 | -1/+0 |
| |/ / / / / / | |||||
| * | | | | | | Much neater fetching of defined powerlevels from m.room.power_levels state event | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -31/+21 |
| | | | | | | | |||||
| * | | | | | | Remove debugging print statement accidentally committed | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Sanitise a user's powerlevel to an int() before numerical comparison, ↵ | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+7 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | because otherwise Python is "helpful" with it (SYN-351) | ||||
| * | | | | | Bump syutil version to 0.0.5 | Mark Haines | 2015-04-21 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #128 from matrix-org/unify_http_wrappers | Mark Haines | 2015-04-21 | 7 | -289/+251 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Unify http wrappers | ||||
| | * | | | | | Set a version_string in BaseMediaResource so that the request_handler ↵ | Mark Haines | 2015-04-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper works | ||||
| | * | | | | | Combine the request wrappers in rest/media/v1 and http/server into a single ↵ | Mark Haines | 2015-04-21 | 7 | -198/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper decorator | ||||
| | * | | | | | Split out the JsonResource request logging and error handling into a ↵ | Mark Haines | 2015-04-21 | 1 | -94/+113 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | separate wrapper function | ||||
| * / | | | | SYN-350: Don't ratelimit the individual events generated during room creation | Mark Haines | 2015-04-21 | 1 | -4/+4 |
| |/ / / / | |||||
* | | | | | Shuffle operations so that locking upsert happens last in the txn. This ↵ | Erik Johnston | 2015-04-27 | 5 | -56/+56 |
| | | | | | | | | | | | | | | | | | | | | ensures the lock is held for the least amount of time possible. | ||||
* | | | | | Handle the fact that postgres databases can be restarted from under us | Erik Johnston | 2015-04-27 | 3 | -1/+33 |
| | | | | | |||||
* | | | | | Revert needless change to rest.profile | Erik Johnston | 2015-04-17 | 1 | -6/+1 |
| | | | | | |||||
* | | | | | Revert needless change to storage.profile | Erik Johnston | 2015-04-17 | 1 | -6/+1 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-17 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-04-17 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Bump version | Erik Johnston | 2015-04-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Update --database-path metavar to SQLITE_DATABASE_PATH | Erik Johnston | 2015-04-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-17 | 2 | -15/+24 |
|\| | | | | |||||
| * | | | | 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 | ||||
| * | | | | Neater implementation of membership change auth checks, ensuring we can't ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -18/+10 |
| | | | | | | | | | | | | | | | | | | | | forget to check if the calling user is a member of the room | ||||
| * | | | | Ensure that non-room-members cannot ban others, even if they do have enough ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | powerlevel (SYN-343) | ||||
* | | | | | Add unique index to room_aliases, remove duplicates on upgrade. Convert some ↵ | Erik Johnston | 2015-04-17 | 7 | -4/+19 |
| | | | | | | | | | | | | | | | | | | | | columns back to TEXT from bytea | ||||
* | | | | | PEP8 | Erik Johnston | 2015-04-16 | 3 | -6/+0 |
| | | | | | |||||
* | | | | | Go back to storing JSON in TEXT | Erik Johnston | 2015-04-16 | 11 | -41/+20 |
| | | | | | |||||
* | | | | | Move encoding and decoding of JSON into storage layer | Erik Johnston | 2015-04-16 | 2 | -27/+7 |
| | | | | | |||||
* | | | | | Remove mysql/maria support | Erik Johnston | 2015-04-15 | 4 | -61/+2 |
| | | | | | |||||
* | | | | | Change full_schemas/11 to work with postgres | Erik Johnston | 2015-04-15 | 13 | -84/+90 |
| | | | | | |||||
* | | | | | Remove debug logging | Erik Johnston | 2015-04-15 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Add missing yield | Erik Johnston | 2015-04-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | pushers table requires a unique id. | Erik Johnston | 2015-04-15 | 2 | -3/+11 |
| | | | | | |||||
* | | | | | Make LruCache thread safe, as its used for event cache | Erik Johnston | 2015-04-15 | 1 | -0/+20 |
| | | | | | |||||
* | | | | | Don't pass in removed flag | Erik Johnston | 2015-04-15 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Change from exception to warn | Erik Johnston | 2015-04-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Don't wait on federation_handler.handle_new_event | Erik Johnston | 2015-04-15 | 1 | -3/+7 |
| | | | | | |||||
* | | | | | Remove run_on_reactor()s | Erik Johnston | 2015-04-15 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | Postgres does not allow you to continue using a cursor after a DB exception ↵ | Erik Johnston | 2015-04-15 | 1 | -11/+14 |
| | | | | | | | | | | | | | | | | | | | | has been raised, so move _simple_insert or_ignore flag out of transaction | ||||
* | | | | | Do more parellelization for initialSync | Erik Johnston | 2015-04-15 | 1 | -7/+11 |
| | | | | | |||||
* | | | | | Parellelize initial sync | Erik Johnston | 2015-04-15 | 1 | -2/+8 |
| | | | | | |||||
* | | | | | Turn off persistance of sent_transactions.response_json | Erik Johnston | 2015-04-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add index on events (topological_ordering, stream_ordering) to help with ↵ | Erik Johnston | 2015-04-15 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | ORDER BY clauses | ||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-15 | 6 | -5/+33 |
|\| | | | | |||||
| * | | | | Update syutil version to 0.0.4 | Mark Haines | 2015-04-14 | 2 | -4/+4 |
| | |_|/ | |/| | | |||||
| * | | | Move server key api into rest/key/v1 | Mark Haines | 2015-04-14 | 4 | -1/+29 |
| | | | | |||||
* | | | | Use try..finally in contextlib.contextmanager | Erik Johnston | 2015-04-15 | 1 | -3/+5 |
| | | | | |||||
* | | | | Use True for True rather than 1 | Erik Johnston | 2015-04-15 | 1 | -5/+7 |
| | | | | |||||
* | | | | Add missing yield in storage func | Erik Johnston | 2015-04-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Correctly identify deadlocks | Erik Johnston | 2015-04-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add postgres database engine | Erik Johnston | 2015-04-14 | 1 | -0/+44 |
| | | | | |||||
* | | | | Rename user_ips.user -> user_id | Erik Johnston | 2015-04-14 | 3 | -8/+8 |
| | | | | |||||
* | | | | Add support for postgres instead of mysql. Change sql accourdingly. blob + ↵ | Erik Johnston | 2015-04-14 | 21 | -140/+153 |
| | | | | | | | | | | | | | | | | varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS. | ||||
* | | | | Correctly increment the _next_id initially | Erik Johnston | 2015-04-14 | 1 | -2/+4 |
| | | | | |||||
* | | | | For backwards compat, make state_groups.id have a type of int, not varchar | Erik Johnston | 2015-04-13 | 2 | -2/+2 |
| | | | | |||||
* | | | | Remove duplicate rows | Erik Johnston | 2015-04-10 | 1 | -0/+9 |
| | | | | |||||
* | | | | Use case sensitive collations | Erik Johnston | 2015-04-10 | 2 | -3/+2 |
| | | | | |||||
* | | | | DROP indexes before recreating them | Erik Johnston | 2015-04-10 | 2 | -1/+9 |
| | | | | |||||
* | | | | Use LONGBLOB and TEXT for arbitary length rows | Erik Johnston | 2015-04-10 | 12 | -34/+34 |
| | | | | |||||
* | | | | Handle the fact that in sqlite binary data might be stored as unicode or bytes | Erik Johnston | 2015-04-10 | 5 | -5/+20 |
| | | | | |||||
* | | | | Bump schema version | Erik Johnston | 2015-04-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use unsigned bigint | Erik Johnston | 2015-04-10 | 19 | -50/+50 |
| | | | | |||||
* | | | | SQLite wants INTEGER and not BIGINT for primary keys | Erik Johnston | 2015-04-10 | 6 | -9/+9 |
| | | | | |||||
* | | | | Update full_schemas/16 to match delta files. Add delta/16 scripts | Erik Johnston | 2015-04-10 | 6 | -0/+245 |
| | | | | |||||
* | | | | Revert non-trivial changes to upgrade scripts | Erik Johnston | 2015-04-10 | 3 | -5/+5 |
| | | | | |||||
* | | | | Fix schema again | Erik Johnston | 2015-04-10 | 2 | -3/+3 |
| | | | | |||||
* | | | | Revert non-trivial schema changes and move them to a new schema version. | Erik Johnston | 2015-04-10 | 19 | -27/+636 |
| | | | | |||||
* | | | | Remove unused import | Erik Johnston | 2015-04-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove spurious spaces | Erik Johnston | 2015-04-09 | 15 | -50/+50 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-09 | 4 | -27/+62 |
|\| | | | |||||
| * | | | Add comment | Mark Haines | 2015-04-09 | 1 | -0/+1 |
| | | | | |||||
| * | | | Unset the timer in the timeout callback so that we don't try to cancel it if ↵ | Mark Haines | 2015-04-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | it has been called | ||||
| * | | | SYN-339: Cancel the notifier timeout when the notifier fires | Mark Haines | 2015-04-09 | 1 | -4/+26 |
| | | | | |||||
| * | | | Merge pull request #114 from matrix-org/improve_get_event_cache | Mark Haines | 2015-04-08 | 3 | -23/+34 |
| |\ \ \ | | | | | | | | | | | Improve get event cache | ||||
| | * | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-03-26 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Implement the main getEvent cache using Cache() instead of a custom ↵ | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -12/+7 |
| | | | | | | | | | | | | | | | | | | | | application of LruCache; also unify its two-level structure into just one | ||||
| | * | | | Use FrozenEvent's reject_reason to decide whether to return it; don't ↵ | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | include allow_rejected in the main getEvents cache key | ||||
| | * | | | Store the rejected reason in (Frozen)Event structs | Paul "LeoNerd" Evans | 2015-03-25 | 2 | -4/+12 |
| | | | | | |||||
| | * | | | Indirect invalidations of _get_event_cache via a helper method to keep all ↵ | Paul "LeoNerd" Evans | 2015-03-25 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | uses of the cache lexically within one .py file | ||||
* | | | | | Stream ordering and out of order insertions. | Erik Johnston | 2015-04-09 | 5 | -65/+153 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the fact that events can be persisted out of order, and so to get the "current max" stream token becomes non trivial - as we need to make sure that *all* stream tokens less than the current max have also successfully been persisted. | ||||
* | | | | | Use generic db exceptions rather than sqlite3 specific ones | Erik Johnston | 2015-04-08 | 2 | -6/+2 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-08 | 3 | -6/+38 |
|\| | | | | |||||
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-04-08 | 2 | -2/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bump version | Erik Johnston | 2015-04-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | SYN-338: Fix typo that caused the cache to throw an exception in some instances | Erik Johnston | 2015-04-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | typo | Erik Johnston | 2015-04-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Don't yield on notifying all listeners | Erik Johnston | 2015-04-08 | 1 | -4/+36 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-08 | 2 | -8/+48 |
|\| | | | | |||||
| * | | | | Merge pull request #117 from matrix-org/notifier-leak | Mark Haines | 2015-04-08 | 1 | -7/+46 |
| |\ \ \ \ | | | | | | | | | | | | | Fix a notifier leak | ||||
| | * | | | | Move comment into docstring | Erik Johnston | 2015-04-08 | 1 | -5/+2 |
| | | | | | | |||||
| | * | | | | Factor out loops into '_discard_if_notified' | Erik Johnston | 2015-04-08 | 1 | -15/+14 |
| | | | | | | |||||
| | * | | | | Also perform paranoia checks in 'on_new_user_event' | Erik Johnston | 2015-04-08 | 1 | -2/+16 |
| | | | | | | |||||
| | * | | | | Add paranoia checks to make sure that we evict stale NotificationListeners ↵ | Erik Johnston | 2015-04-08 | 1 | -5/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | when we are about to process them | ||||
| | * | | | | Fix bug where we didn't inform the NotificataionListeners about new rooms ↵ | Erik Johnston | 2015-04-08 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | they have been subscribed to. This meant that the listeners didn't clean themselves up fully from all the dicts | ||||
| * | | | | | Move database timer logging to seperate logger | Erik Johnston | 2015-04-08 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Retry transaction, not SQL query | Erik Johnston | 2015-04-08 | 1 | -21/+25 |
| | | | | | |||||
* | | | | | Fix maria engine to correctly recognize deadlocks | Erik Johnston | 2015-04-08 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-07 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Fix --enable-registration flag to work if you don't give a value | Erik Johnston | 2015-04-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-07 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Fix a bug which causes a send event level of 0 to not be honoured. | Kegan Dougal | 2015-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Caused by a bad if check, which incorrectly executes for both 0 and None, when None was the original intent. | ||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-07 | 21 | -455/+863 |
|\| | | | | |||||
| * | | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-04-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Report process open filehandles in metrics | Paul "LeoNerd" Evans | 2015-04-01 | 1 | -0/+34 |
| | | | | | |||||
| * | | | | Fix more AS sender ID thinkos. | Kegan Dougal | 2015-04-01 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge branch 'develop' into application-services-registration-script | Kegan Dougal | 2015-04-01 | 1 | -1/+4 |
| |\ \ \ \ | |||||
| | * | | | | Fix thinko whereby events *for the AS specifically* were not passed on. | Kegan Dougal | 2015-03-31 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by not explicitly checking the service.sender field. This has now been fixed and a regression test has been added. | ||||
| * | | | | | Add same user_id char checks as registration. | Kegan Dougal | 2015-03-31 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | Use a sender localpart instead of a user ID. | Kegan Dougal | 2015-03-31 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Form the user ID at runtime instead, This gives less room for error in AS config files since they cannot specify the domain of another HS. | ||||
| * | | | | | Pyflakes | Kegan Dougal | 2015-03-31 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests. | Kegan Dougal | 2015-03-31 | 2 | -13/+17 |
| | | | | | | |||||
| * | | | | | Fix tests and missing returns on deferreds. | Kegan Dougal | 2015-03-31 | 2 | -8/+12 |
| | | | | | | |||||
| * | | | | | Remove more reg/unreg methods. Read config not database for cache. | Kegan Dougal | 2015-03-31 | 2 | -197/+59 |
| | | | | | | |||||
| * | | | | | Remove appservice REST servlets | Kegan Dougal | 2015-03-31 | 6 | -196/+0 |
| | | | | | | |||||
| * | | | | | Add AppServiceConfig | Kegan Dougal | 2015-03-31 | 2 | -1/+33 |
| |/ / / / | |||||
| * | | | | turn --disable-registration into --enable-registration, given the default is ↵ | Matthew Hodgson | 2015-03-30 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | for registration to be disabled by default now. this is backwards incompatible by removing the old --disable-registration arg, but makes for a much more intuitive arg | ||||
| * | | | | Revert "Add another @cached wrapper, this time on get_presence_state()" | Paul "LeoNerd" Evans | 2015-03-27 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit ff1fa0fbf80cbb636e4cce59846bb5dcc91ccd03. | ||||
| * | | | | Add another @cached wrapper, this time on get_presence_state() | Paul "LeoNerd" Evans | 2015-03-27 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Fixes from PR comments | Kegan Dougal | 2015-03-26 | 2 | -3/+4 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-26 | 38 | -722/+1001 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
| | * | | | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -8/+12 |
| | | | | | |||||
| | * | | | Implement the 'key in dict' test for LruCache() | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | Reduce activity timer granularity to avoid too many quick updates (SYN-247) | Paul "LeoNerd" Evans | 2015-03-23 | 1 | -0/+8 |
| | | |/ | | |/| | |||||
| | * | | Put a cache on get_aliases_for_room | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -2/+8 |
| | | | | |||||
| | * | | Remember the 'last seen' time for a given user/IP/device combination and ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -2/+30 |
| | | | | | | | | | | | | | | | | only bother INSERTing another if it's stale | ||||
| | * | | Pull out the cache logic from the @cached wrapper into its own class we can ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -35/+54 |
| | | | | | | | | | | | | | | | | reuse | ||||
| | * | | func(*EXPR) is valid Python syntax, really... | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -2/+1 |
| | | | | |||||
| * | | | Set the service ID as soon as it is known. | Kegan Dougal | 2015-03-16 | 2 | -4/+5 |
| | | | | |||||
| * | | | Implement ServiceQueuer with tests. | Kegan Dougal | 2015-03-16 | 1 | -16/+30 |
| | | | | |||||
| * | | | Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ↵ | Kegan Dougal | 2015-03-16 | 1 | -28/+33 |
| | | | | | | | | | | | | | | | | and add stub tests for ServiceQueuer. | ||||
| * | | | Wrap polling/retry blocks in try/excepts to avoid sending to other ASes ↵ | Kegan Dougal | 2015-03-16 | 1 | -29/+39 |
| | | | | | | | | | | | | | | | | breaking permanently should an error occur. | ||||
| * | | | Minor PR comment tweaks. | Kegan Dougal | 2015-03-16 | 4 | -8/+14 |
| | | | | |||||
| * | | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-16 | 36 | -349/+1003 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/appservice.py |