Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 34 | -287/+1323 |
|\ | | | | | 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 | 18 | -368/+585 |
| |\ | | | | | | | | | | | | | 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 | 45 | -537/+1817 |
| |\ \ | |||||
| * | | | 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 | 3 | -15/+63 |
| | | | | |||||
| * | | | 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 | 6 | -26/+280 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 |
| | | | | |||||
| * | | | Update CAPTCHA_SETUP (it continues to ignore fallback, but I guess I should ↵ | David Baker | 2015-03-30 | 1 | -21/+6 |
| | | | | | | | | | | | | | | | | fix it so that doesn't need the key in two different places) | ||||
| * | | | Add original, unmodified CAPTCHA-SETUP from the webclient repo before ↵ | David Baker | 2015-03-30 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | modifying (captcha setup is now purely on the HS). | ||||
| * | | | 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. | ||||
| * | | | Fix tests | David Baker | 2015-03-24 | 5 | -14/+14 |
| | | | | |||||
| * | | | Don't test exact equality of the list: as long as it has the fields we ↵ | David Baker | 2015-03-24 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | expect, that's just fine. I added the user_id (as in database pkey) and it broke: no point testing what that comes out as: it's determined by the db. | ||||
| * | | | 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 | 17 | -73/+366 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #132 from matrix-org/observer_and_locks | Erik Johnston | 2015-04-27 | 3 | -1/+42 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Observer and locks | ||||
| * | | | | | 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. | ||||
* | | | | | Add note about updating your signing keys (ie. "the auto thing") | David Baker | 2015-04-24 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | Matrix ID server is now HTTPS | David Baker | 2015-04-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Remove ancient history | David Baker | 2015-04-24 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | Pedant: OS X has a space | David Baker | 2015-04-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | 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 | 2 | -1/+38 |
| | | | | | | | | | | | | | | | | 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 | 2 | -0/+59 |
| | | | | | | | | | | | | | | | | 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 |
| | | | | |||||
* | | | | Mumble ReST mumble ``fixed-width`` mumble | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -5/+5 |
| | | | | |||||
* | | | | Formatting / wording fixes to metrics doc | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -12/+13 |
| | | | | |||||
* | | | | prometheus/metrics howto from Leo | Matthew Hodgson | 2015-04-23 | 1 | -0/+49 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | Add info on breaking AS API changes | Kegsay | 2015-04-22 | 1 | -0/+34 |
|/ / / | |||||
* | | | 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 | ||||
* | | | | Merge pull request #127 from matrix-org/bugs/SYN-350 | Mark Haines | 2015-04-21 | 1 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | SYN-350: Don't ratelimit the events generated during create room | ||||
| * | | | SYN-350: Don't ratelimit the individual events generated during room creation | Mark Haines | 2015-04-21 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-04-17 | 2 | -2/+7 |
|\ \ \ | |||||
| * \ \ | Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 v0.8.1-r4 | Erik Johnston | 2015-04-17 | 2 | -2/+7 |
| |\ \ \ | | | | | | | | | | | Hotfixes v0.8.1-r4 | ||||
| | * | | | The new parameter to urlopen is "context" not "ctx" | Mark Haines | 2015-04-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Bump version | Erik Johnston | 2015-04-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | As of version 2.7.9, urllib2 now checks SSL certs | Erik Johnston | 2015-04-17 | 1 | -1/+6 |
| |/ / / | |||||
* | | / | Add kick users script | Kegan Dougal | 2015-04-17 | 1 | -0/+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) | ||||
* | | | Various minor fixes to unit-test structure around typing notifications | Paul "LeoNerd" Evans | 2015-04-15 | 2 | -2/+11 |
| | | | |||||
* | | | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 3 | -8/+15 |
| | | | | | | | | | | | | 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) | ||||
* | | | Merge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4 | Mark Haines | 2015-04-14 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | Update syutil version to 0.0.4 | ||||
| * | | | Update syutil version to 0.0.4 | Mark Haines | 2015-04-14 | 2 | -4/+4 |
|/ / / | |||||
* | | | Merge pull request #121 from matrix-org/key-api-restructure | Mark Haines | 2015-04-14 | 4 | -1/+29 |
|\ \ \ | | | | | | | | | Move server key api into rest/key/v1 | ||||
| * | | | Move server key api into rest/key/v1 | Mark Haines | 2015-04-14 | 4 | -1/+29 |
|/ / / | |||||
* | | | Merge pull request #120 from matrix-org/bugs/SYN-339 | Mark Haines | 2015-04-09 | 1 | -4/+28 |
|\ \ \ | | | | | | | | | SYN-339: Cancel the notifier timeout when the notifier fires | ||||
| * | | | 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 | ||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-04-08 | 2 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 v0.8.1-r3 | Erik Johnston | 2015-04-08 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Hotfixes v0.8.1 r3 | ||||
| | * | | | 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 |
| |/ / / | |||||
* | | | | Merge pull request #118 from matrix-org/dont-wait-for-notify | Erik Johnston | 2015-04-08 | 1 | -4/+36 |
|\ \ \ \ | | | | | | | | | | | Don't yield on notifying all listeners | ||||
| * | | | | 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 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 |
| | | | | | |||||
* | | | | | typo | Matthew Hodgson | 2015-04-08 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Fix --enable-registration flag to work if you don't give a value | Erik Johnston | 2015-04-07 | 2 | -3/+3 |
| | | | | |||||
* | | | | Make demo script use --enable-registration | 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. | ||||
* | | | | update leo's contribs a bit | Matthew Hodgson | 2015-04-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | potential contributing guide & author list for synapse | Matthew Hodgson | 2015-04-03 | 3 | -0/+158 |
| | | | | |||||
* | | | | 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 pull request #116 from matrix-org/application-services-registration-script | Kegsay | 2015-04-01 | 12 | -456/+160 |
|\ \ \ \ | | | | | | | | | | | Application services registration changes (PR #116) | ||||
| * \ \ \ | Merge branch 'develop' into application-services-registration-script | Kegan Dougal | 2015-04-01 | 3 | -1/+24 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Fix thinko whereby events *for the AS specifically* were not passed on. | Kegan Dougal | 2015-03-31 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by not explicitly checking the service.sender field. This has now been fixed and a regression test has been added. | ||||
* | | | | | Add note in changelog about change in config option names | Erik Johnston | 2015-03-30 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | 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 | 2 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -28/+40 |
| | | | | | |||||
| * | | | | Fix tests and missing returns on deferreds. | Kegan Dougal | 2015-03-31 | 3 | -20/+41 |
| | | | | | |||||
| * | | | | Remove more reg/unreg methods. Read config not database for cache. | Kegan Dougal | 2015-03-31 | 3 | -236/+59 |
| | | | | | |||||
| * | | | | Remove appservice REST servlets | Kegan Dougal | 2015-03-31 | 6 | -196/+0 |
| | | | | | |||||
| * | | | | Add AppServiceConfig | Kegan Dougal | 2015-03-31 | 2 | -1/+33 |
|/ / / / | |||||
* | | | | actually tell users /how/ to turn on registration | Matthew Hodgson | 2015-03-30 | 1 | -1/+2 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | Merge pull request #115 from matrix-org/allow_registration_for_federation_demo | Erik Johnston | 2015-03-27 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Allow registration in the HSes federation demo | ||||
| * | | | | Allow registration in the HSes federation demo | manuroe | 2015-03-27 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #106 from matrix-org/application-services-txn-reliability | Kegsay | 2015-03-26 | 11 | -42/+1171 |
|\ \ \ \ | |_|/ / |/| | | | Application services transaction reliability (PR #106) | ||||
| * | | | 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 | 45 | -727/+1247 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
* | | | | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() | Paul "LeoNerd" Evans | 2015-03-25 | 2 | -8/+34 |
| | | | | |||||
* | | | | Implement the 'key in dict' test for LruCache() | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -0/+7 |
| | | | | |||||
* | | | | Unit-test that Cache() key eviction is ordered | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -0/+18 |
| | | | | |||||
* | | | | 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 | 2 | -36/+87 |
| | | | | | | | | | | | | reuse | ||||
* | | | func(*EXPR) is valid Python syntax, really... | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -2/+1 |
| | | | |||||
* | | | Merge pull request #113 from matrix-org/store_rearrangement | Erik Johnston | 2015-03-20 | 20 | -621/+677 |
|\ \ \ | | | | | | | | | Store rearrangement | ||||
| * | | | PEP8 | Erik Johnston | 2015-03-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into store_rearrangement | Erik Johnston | 2015-03-20 | 3 | -14/+30 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Add the tiniest of tiny one-element caches to get_room_events_max_id() as ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | it's read every time someone hits eventstream | ||||
* | | | | Allow @cached-wrapped functions to have more or fewer than 1 argument; ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -13/+27 |
| |_|/ |/| | | | | | | | | assert on the total count of them though | ||||
| * | | Give sensible names for '_simple_...' transactions | Erik Johnston | 2015-03-20 | 13 | -38/+93 |
| | | | |||||
| * | | Start removing Tables | Erik Johnston | 2015-03-20 | 2 | -26/+29 |
| | | | |||||
| * | | Tidy up _simple_... methods | Erik Johnston | 2015-03-20 | 4 | -42/+62 |
| | | | |||||
| * | | Rearrange storage modules | Erik Johnston | 2015-03-20 | 7 | -515/+493 |
|/ / | |||||
* | | Merge pull request #112 from matrix-org/hotfixes-v0.8.1-r2 v0.8.1-r2 | Erik Johnston | 2015-03-19 | 2 | -1/+2 |
|\ \ | | | | | | | Hotfixes v0.8.1 r2 | ||||
| * | | Bump version | Erik Johnston | 2015-03-19 | 1 | -1/+1 |
| | | | |||||
| * | | Add missing servlet to list | Erik Johnston | 2015-03-19 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'hotfixes-0.8.1a' of github.com:matrix-org/synapse v0.8.1-r1 | Erik Johnston | 2015-03-19 | 2 | -2/+2 |
|\ \ | |||||
| * | | Bump version | Erik Johnston | 2015-03-19 | 1 | -1/+1 |
| | | | |||||
| * | | D'oh - setup.py used the dict directly: make it use the wrapper function. | David Baker | 2015-03-19 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'release-v0.8.1' of github.com:matrix-org/synapse v0.8.1 | Erik Johnston | 2015-03-19 | 61 | -425/+1542 |
|\ \ | |||||
| * | | Update CHANGES | Erik Johnston | 2015-03-18 | 1 | -0/+9 |
| | | | |||||
| * | | Bump version | Erik Johnston | 2015-03-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #109 from matrix-org/default_registration | Erik Johnston | 2015-03-18 | 9 | -17/+272 |
| |\ \ | | | | | | | | | Disable registration by default. Add script to register new users. | ||||
| | * | | Factor out user id validation checks | Erik Johnston | 2015-03-18 | 2 | -9/+13 |
| | | | | |||||
| | * | | Do more validation of incoming request | Erik Johnston | 2015-03-18 | 1 | -3/+3 |
| | | | | |||||
| | * | | Comment. | Erik Johnston | 2015-03-16 | 1 | -0/+3 |
| | | | | |||||
| | * | | Use 403 instead of 400 | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add note about disabling registration by default | Erik Johnston | 2015-03-13 | 1 | -0/+11 |
| | | | | |||||
| | * | | Allow enabling of registration with --disable-registration false | Erik Johnston | 2015-03-13 | 1 | -2/+8 |
| | | | | |||||
| | * | | Rename register script to 'register_new_matrix_user' | Erik Johnston | 2015-03-13 | 2 | -1/+1 |
| | | | | |||||
| | * | | Change default server url to match default ports | Erik Johnston | 2015-03-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | PEP8 | Erik Johnston | 2015-03-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add 'register_new_user' script | Erik Johnston | 2015-03-13 | 2 | -1/+150 |
| | | | | |||||
| | * | | Add missing commas | Erik Johnston | 2015-03-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | Implement registering with shared secret. | Erik Johnston | 2015-03-13 | 4 | -5/+83 |
| | | | | |||||
| | * | | Disable registration by default | Erik Johnston | 2015-03-13 | 1 | -0/+4 |
| | | | | |||||
| * | | | Clean out event_forward_extremities table when the server rejoins the room | Erik Johnston | 2015-03-18 | 2 | -0/+14 |
| | | | | |||||
| * | | | @cached() annotate get_user_by_token() - achieves a minor DB performance ↵ | Paul "LeoNerd" Evans | 2015-03-17 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | improvement | ||||
| * | | | Be polite and ensure we use @functools.wraps() when creating a function ↵ | Paul "LeoNerd" Evans | 2015-03-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | decorator | ||||
| * | | | pep8 | David Baker | 2015-03-17 | 1 | -2/+3 |
| | | | | |||||
| * | | | Wire up the webclient option | David Baker | 2015-03-17 | 3 | -8/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | It existed but was hardcoded to True. Give it an underscore for consistency. Also don't pull in syweb unless we're actually using the web client. | ||||
| * | | | Add a DistributionMetric to HTTP request/response processing time in the server | Paul "LeoNerd" Evans | 2015-03-16 | 1 | -0/+9 |
| | | | | |||||
| * | | | Add a metric for the scheduling latency of SQL queries | Paul "LeoNerd" Evans | 2015-03-16 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge pull request #110 from matrix-org/fix_ban | Erik Johnston | 2015-03-16 | 6 | -52/+32 |
| |\ \ \ | | | | | | | | | | | Fix ban | ||||
| | * | | | Fix tests | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Copy dict of context.current_state before changing it. | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | 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 | 5 | -33/+7 |
| | | | | | |||||
| | * | | | Fix test | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Send all membership events to the remote homeserver | Erik Johnston | 2015-03-16 | 1 | -4/+3 |
| | | | | | |||||
| | * | | | Make context.auth_events grap auth events from current state. Otherwise auth ↵ | Erik Johnston | 2015-03-16 | 2 | -18/+12 |
| | | | | | | | | | | | | | | | | | | | | is wrong. | ||||
| | * | | | Respect ban membership | Erik Johnston | 2015-03-16 | 1 | -5/+17 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'release-v0.8.0' of github.com:matrix-org/synapse v0.8.0 | Erik Johnston | 2015-03-09 | 91 | -925/+2909 |
|\ \ \ \ | |||||
| | * \ \ | Merge pull request #111 from matrix-org/send_event_dont_wait_on_notifier | Erik Johnston | 2015-03-16 | 1 | -1/+10 |
| | |\ \ \ | | | | | | | | | | | | | Don't block waiting on waking up all the listeners when sending an event | ||||
| | | * | | | Don't block waiting on waking up all the listeners when sending an event. | Erik Johnston | 2015-03-16 | 1 | -1/+10 |
| | |/ / / | |||||
| | | | * | 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 | 2 | -23/+77 |
| | | | | | |||||
| | | | * | Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ↵ | Kegan Dougal | 2015-03-16 | 2 | -101/+60 |
| | | | | | | | | | | | | | | | | | | | | 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 | 5 | -13/+19 |
| | | | | | |||||
| | | | * | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-16 | 45 | -373/+1193 |
| | | | |\ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: synapse/storage/appservice.py | ||||
| | * | | | add ToC and fix typoe | Matthew Hodgson | 2015-03-14 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | actually uphold the bind_host parameter. in theory should make ipv6 binds ↵ | Matthew Hodgson | 2015-03-14 | 2 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | work like bind_host: 'fe80::1%lo0' | ||||
| | * | | | uncommited WIP from MWC | Matthew Hodgson | 2015-03-14 | 2 | -12/+15 |
| | | | | | |||||
| | * | | | Merge pull request #108 from matrix-org/metrics | Paul Evans | 2015-03-13 | 20 | -44/+790 |
| | |\ \ \ | | | |/ / | | |/| | | Metrics | ||||
| | | * | | Merge remote-tracking branch 'origin/develop' into metrics | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+8 |
| | | |\ \ | |||||
| | | * | | | Appease pyflakes | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Delete unused import of NOT_READY_YET | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+0 |
| | | | | | | |||||
| | | * | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-03-12 | 9 | -27/+46 |
| | | | | | | |||||
| | | * | | | Option to serve metrics from their own localhost-only TCP port instead of ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | muxed on the main listener | ||||
| | | * | | | Fold the slightly-odd bind_port/secure_port/etc.. logic into ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -12/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | SynapseHomeServer.start_listening() | ||||
| | | * | | | Build MetricsResource as a specific HomeServer dependency | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -6/+11 |
| | | | | | | |||||
| | | * | | | Bugfix to sql_txn_timer increment - add only the per-TXN duration, not the ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | total time ever spent since boot | ||||
| | | * | | | Neater metrics from TransactionQueue | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -9/+11 |
| | | | | | | |||||
| | | * | | | Add a counter to track total number of events served by the notifier | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+3 |
| | | | | | | |||||
| | | * | | | Replace the @metrics.counted annotations in federation with ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -41/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | specifically-written counters and distributions | ||||
| | | * | | | Add an .inc_by() method to CounterMetric; implement DistributionMetric a ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -26/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | neater way | ||||
| | | * | | | Rename the timer metrics exported by synapse.storage to append _time, so the ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | meaning of ':total' is clearer | ||||
| | | * | | | Don't forbid '_' in metric basenames any more, to allow things like foo_time | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -5/+0 |
| | | | | | | |||||
| | | * | | | Rename TimerMetric to DistributionMetric; as it could count more than just time | Paul "LeoNerd" Evans | 2015-03-12 | 4 | -33/+37 |
| | | | | | |