summary refs log tree commit diff
path: root/tests (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Update the filters to match the latest spec.Mark Haines2015-10-121-6/+6
| | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response.
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-0211-98/+391
|\
| * synapse/storage/_base.py:_simple_selectupdate_one was unusedMark Haines2015-09-231-20/+0
| |
| * Move NullSource out of synapse and into tests since it is only used by the testsMark Haines2015-09-221-1/+17
| |
| * Implement configurable stats reportingDaniel Wagner-Hall2015-09-224-54/+213
| | | | | | | | | | | | | | | | | | | | SYN-287 This requires that HS owners either opt in or out of stats reporting. When --generate-config is passed, --report-stats must be specified If an already-generated config is used, and doesn't have the report_stats key, it is requested to be set.
| * Merge pull request #276 from ↵Mark Haines2015-09-211-7/+7
| |\ | | | | | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left.
| | * Allow users to GET individual state events for rooms that they have leftMark Haines2015-09-101-5/+5
| | |
| | * Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-091-2/+2
| | | | | | | | | | | | they left
| * | Merge pull request #256 from matrix-org/authDaniel Wagner-Hall2015-09-146-16/+154
| |\ \ | | | | | | | | Attempt to validate macaroons
| | * | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-015-15/+15
| | | |
| | * | Turn TODO into thing which actually will failDaniel Wagner-Hall2015-08-261-6/+9
| | | |
| | * | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-266-27/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of weird caveats: * If we can't validate your macaroon, we fall back to checking that your access token is in the DB, and ignoring the failure * Even if we can validate your macaroon, we still have to hit the DB to get the access token ID, which we pretend is a device ID all over the codebase. This mostly adds the interesting code, and points out the two pieces we need to delete (and necessary conditions) in order to fix the above caveats.
* | | | Merge branch 'erikj/check_room_exists' into erikj/unfederatableErik Johnston2015-09-011-8/+29
|\| | |
| * | | Fix testsErik Johnston2015-09-011-8/+29
| | |/ | |/|
* / | Check against sender rather than event_idErik Johnston2015-09-011-1/+1
|/ /
* / Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-261-0/+13
|/ | | | This reduces our ~8 second sequential test time down to ~7 seconds
* Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-257-18/+2
|
* Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-257-20/+4
| | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
* Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-201-1/+2
|\ | | | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-1/+2
| |\ | | | | | | Changes for unique emails
| | * Fix testsDavid Baker2015-08-041-1/+2
| | |
* | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-201-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them.
* | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-208-34/+34
| | | | | | | | | | | | We're about to have two kinds of token, access and refresh
* | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-201-7/+7
| | | | | | | | | | | | | | | I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two.
* | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-191-4/+4
| | |
* | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-181-4/+4
| | |
* | | Fix units in testDaniel Wagner-Hall2015-08-181-1/+1
| | | | | | | | | | | | I made the non-test seconds instead of ms, but not the test
* | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-181-1/+1
| | |
* | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-184-5/+104
|\| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-121-2/+2
| |\ \ | | | | | | | | | | | | erikj/dictionary_cache
| | * | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
| | | |
| * | | Move all the caches into their own package, synapse.util.cachesErik Johnston2015-08-113-5/+3
| | | |
| * | | Change Cache to not use *args in its interfaceErik Johnston2015-08-071-6/+6
| | | |
| * | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-061-4/+7
| |\ \ \
| * | | | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-051-1/+1
| | | | |
| * | | | Move DictionaryCacheErik Johnston2015-08-041-1/+1
| | | | |
| * | | | Add basic dictionary cacheErik Johnston2015-08-041-0/+101
| | |_|/ | |/| |
* | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-182-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information
* | | | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
| |_|/ |/| |
* | | Change Cache to not use *args in its interfaceErik Johnston2015-08-071-6/+6
| |/ |/|
* | Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferredsErik Johnston2015-08-061-0/+134
|\|
| * Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-291-1/+3
| | | | | | | | Namely this means using registration_handler.appservice_register.
| * Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-0/+132
| | | | | | | | | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
* | Make @cached cache deferreds rather than the deferreds' valuesErik Johnston2015-08-061-4/+7
|/
* Fix test.Erik Johnston2015-07-071-1/+11
|
* Consolidate duplicate code in notifierErik Johnston2015-07-021-10/+10
|
* Add receipts_key to StreamTokenErik Johnston2015-07-021-2/+2
|
* Fix bug where synapse was sending AS user queries incorrectly.Kegan Dougal2015-06-171-0/+43
| | | | | | Bug introduced in 92b20713d7c6346aeb20dc09963081e472752bb5 which reversed the comparison when checking if a user existed in the users table. Added UTs to prevent this happening again.
* Fix testsErik Johnston2015-06-121-0/+2
|
* Merge pull request #180 from matrix-org/erikj/prev_state_contextErik Johnston2015-06-031-0/+2
|\ | | | | Don't needlessly compute prev_state
| * Don't needlessly compute prev_stateErik Johnston2015-06-031-0/+2
| |
* | Merge pull request #179 from matrix-org/erikj/state_group_outliersErik Johnston2015-06-031-2/+2
|\ \ | | | | | | Don't compute EventContext for outliers.
| * | Don't needlessly compute contextErik Johnston2015-06-031-2/+2
| |/
* / Caches should be bound to instances.Erik Johnston2015-06-032-36/+50
|/ | | | | Before, caches were global and so different instances of the stores would share caches. This caused problems in the unit tests.
* Fix the presence testsMark Haines2015-05-223-17/+23
|
* Merge pull request #157 from matrix-org/markjh/presence_performanceMark Haines2015-05-222-10/+6
|\ | | | | Improve presence performance in loadtest
| * Fix the presence testsMark Haines2015-05-202-10/+6
| |
* | Make the appservice use 'users_in_room' rather than get_room_members since ↵Mark Haines2015-05-221-12/+3
| | | | | | | | it is cached
* | Oops, get_rooms_for_user returns a namedtuple, not a room_idMark Haines2015-05-211-1/+6
| |
* | Merge pull request #155 from matrix-org/erikj/perfErik Johnston2015-05-211-1/+2
|\ \ | |/ |/| Bulk and batch retrieval of events.
| * Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into ↵Erik Johnston2015-05-182-48/+13
| |\ | | | | | | | | | erikj/perf
| * | Fix daedlockErik Johnston2015-05-151-1/+2
| | |
* | | Merge branch 'develop' into notifier_performanceMark Haines2015-05-182-48/+13
|\ \ \ | | |/ | |/|
| * | Remove unused arguments and doc PresenceHandler.push_update_to_clientsMark Haines2015-05-142-48/+13
| |/
* | Discard unused NotifierUserStreamsMark Haines2015-05-132-0/+4
| |
* | Don't bother checking for updates if the stream token hasn't advanced for a userMark Haines2015-05-135-17/+24
|/
* Add support for using executemanyErik Johnston2015-05-051-2/+2
|
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-284-13/+13
|\
| * Merge branch 'develop' into csauthDavid Baker2015-04-241-0/+65
| |\ | | | | | | | | | | | | Conflicts: synapse/http/server.py
| * \ Merge branch 'develop' into csauthDavid Baker2015-04-177-61/+677
| |\ \
| * | | Fix testsDavid Baker2015-03-245-14/+14
| | | |
| * | | Don't test exact equality of the list: as long as it has the fields we ↵David Baker2015-03-241-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.
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-271-0/+65
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove users from the remote_offline_serials list (and clean up empty ↵Paul "LeoNerd" Evans2015-04-231-0/+27
| | | | | | | | | | | | | | | | elements) when they go online again
| * | | Store a list of the presence serial number at which remote users went ↵Paul "LeoNerd" Evans2015-04-231-0/+38
| | |/ | |/| | | | | | | offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-172-8/+24
|\| |
| * | Various minor fixes to unit-test structure around typing notificationsPaul "LeoNerd" Evans2015-04-152-2/+11
| | |
| * | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵Paul "LeoNerd" Evans2015-04-152-7/+14
| | | | | | | | | | | | deferred, for consistency and extensibility
* | | Fix tests after commit 9a0579Erik Johnston2015-04-081-0/+6
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-075-56/+691
|\| |
| * | Merge branch 'develop' into application-services-registration-scriptKegan Dougal2015-04-011-0/+13
| |\ \
| | * | Fix thinko whereby events *for the AS specifically* were not passed on.Kegan Dougal2015-03-311-0/+13
| | | | | | | | | | | | | | | | | | | | This was caused by not explicitly checking the service.sender field. This has now been fixed and a regression test has been added.
| * | | Use a sender localpart instead of a user ID.Kegan Dougal2015-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | 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.
| * | | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests.Kegan Dougal2015-03-311-15/+23
| | | |
| * | | Fix tests and missing returns on deferreds.Kegan Dougal2015-03-311-12/+29
| | | |
| * | | Remove more reg/unreg methods. Read config not database for cache.Kegan Dougal2015-03-311-39/+0
| |/ /
| * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-263-3/+75
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py
| | * | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()Paul "LeoNerd" Evans2015-03-251-0/+22
| | | |
| | * | Unit-test that Cache() key eviction is orderedPaul "LeoNerd" Evans2015-03-251-0/+18
| | |/
| | * Pull out the cache logic from the @cached wrapper into its own class we can ↵Paul "LeoNerd" Evans2015-03-201-1/+33
| | | | | | | | | | | | reuse
| * | Implement ServiceQueuer with tests.Kegan Dougal2015-03-161-7/+47
| | |
| * | Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ↵Kegan Dougal2015-03-161-73/+27
| | | | | | | | | | | | and add stub tests for ServiceQueuer.
| * | Minor PR comment tweaks.Kegan Dougal2015-03-161-5/+5
| | |
| * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-165-10/+171
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/storage/appservice.py
| * | | Use event IDs instead of dumping event content in the txns table.Kegan Dougal2015-03-091-13/+17
| | | |
| * | | Use seconds; start gluing in the AS scheduler into the AS handler.Kegan Dougal2015-03-092-7/+10
| | | |
| * | | Finish appservice txn storage impl and tests.Kegan Dougal2015-03-091-0/+68
| | | |
| * | | Implement create_appservice_txn with tests.Kegan Dougal2015-03-091-0/+67
| | | |
| * | | Partially implement txn store methods with tests.Kegan Dougal2015-03-091-2/+169
| | | |
| * | | Update UTsKegan Dougal2015-03-061-5/+5
| | | |
| * | | Apply clarity and docstringsKegan Dougal2015-03-061-1/+1
| | | |
| * | | Finish synapse.appservice.scheduler implementation.Kegan Dougal2015-03-061-2/+113
| | | | | | | | | | | | | | | | | | | | With tests to assert behaviour. Not hooked up yet. Stub datastore methods not implemented yet.
| * | | Flesh out more stub functions.Kegan Dougal2015-03-061-2/+3
| | | |
| * | | Add more tests; fix bugs.Kegan Dougal2015-03-061-7/+47
| | | |
| * | | Start adding some testsKegan Dougal2015-03-061-0/+106
| | | |
* | | | Make work in both Maria and SQLite. Fix testsErik Johnston2015-04-0110-52/+83
| |_|/ |/| |
* | | Tidy up _simple_... methodsErik Johnston2015-03-202-2/+2
| |/ |/|
* | Add an .inc_by() method to CounterMetric; implement DistributionMetric a ↵Paul "LeoNerd" Evans2015-03-121-3/+2
| | | | | | | | neater way
* | Rename TimerMetric to DistributionMetric; as it could count more than just timePaul "LeoNerd" Evans2015-03-121-12/+12
| |
* | Export CacheMetric as hits+total, rather than hits+misses, as it's easier to ↵Paul "LeoNerd" Evans2015-03-121-3/+3
| | | | | | | | derive hit ratio from that
* | Prometheus needs "escaped" label valuesPaul "LeoNerd" Evans2015-03-121-27/+27
| |
* | Bugfix to rendering output of vectored TimerMetricsPaul "LeoNerd" Evans2015-03-121-4/+4
| |
* | Rename Metrics' "keys" to "labels"Paul "LeoNerd" Evans2015-03-121-3/+3
| |
* | Initial hack at a TimerMetric; for storing counts + duration accumulatorsPaul "LeoNerd" Evans2015-03-121-1/+35
| |
* | Implement vector CallbackMetricsPaul "LeoNerd" Evans2015-03-121-1/+17
| |
* | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric ↵Paul "LeoNerd" Evans2015-03-121-9/+15
| | | | | | | | component to give the size of the cache
* | Initial attempt at a scalar callback-based metric to give instantaneous ↵Paul "LeoNerd" Evans2015-03-121-1/+21
| | | | | | | | snapshot gauges
* | Create the concept of a cachecounter metric; generating two counters ↵Paul "LeoNerd" Evans2015-03-121-1/+26
| | | | | | | | specific to caches
* | Initial tiny attempt at (vectorable) counter metricsPaul "LeoNerd" Evans2015-03-122-0/+61
| |
* | Fix testsErik Johnston2015-03-093-10/+10
|/
* Merge pull request #93 from matrix-org/application-services-exclusiveKegsay2015-03-022-19/+80
|\ | | | | Application services exclusive flag support
| * Add more unit tests for exclusive namespaces.Kegan Dougal2015-02-272-2/+50
| |
| * Update unit tests to use new format.Kegan Dougal2015-02-272-19/+32
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-03-022-0/+113
|\ \
| * | Fix unit testsKegan Dougal2015-02-271-0/+3
| |/
| * Use cache.pop() instead of a separate membership test + del []Paul "LeoNerd" Evans2015-02-231-0/+7
| |
| * Merge remote-tracking branch 'origin/develop' into ↵Paul "LeoNerd" Evans2015-02-232-0/+2
| |\ | | | | | | | | | performance-cache-improvements
| * | Allow @cached-wrapped functions to have a prefill method for setting entriesPaul "LeoNerd" Evans2015-02-231-0/+14
| | |
| * | Take named arguments to @cached() decorator, add a 'max_entries' limitPaul "LeoNerd" Evans2015-02-191-0/+89
| | |
* | | Fix presence testsErik Johnston2015-02-231-15/+28
| |/ |/|
* | Update testsErik Johnston2015-02-192-0/+2
|/
* Use git aware version string in User-Agent and Server headersErik Johnston2015-02-181-2/+8
|
* Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-137-1/+532
|\ | | | | Application Services
| * Fix tests which broke when event caching was introduced.Kegan Dougal2015-02-111-1/+4
| |
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-1126-362/+200
| |\
| * | Notify ASes for events sent by other users in a room which an AS user is a ↵Kegan Dougal2015-02-111-0/+25
| | | | | | | | | | | | part of.
| * | Remove unused imports.Kegan Dougal2015-02-091-2/+2
| | |
| * | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-093-1/+145
| | | | | | | | | | | | | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens)
| * | Dependency inject ApplicationServiceApi when creating ↵Kegan Dougal2015-02-051-7/+3
| | | | | | | | | | | | ApplicationServicesHandler.
| * | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-1/+4
| |\ \
| * | | Fix unit tests.Kegan Dougal2015-02-051-2/+5
| | | |
| * | | Add unit test for appservice_handler.query_room_alias_existsKegan Dougal2015-02-051-1/+30
| | | |
| * | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when ↵Kegan Dougal2015-02-051-0/+1
| | | | | | | | | | | | | | | | searching for services by alias.
| * | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-051-4/+6
| | | |
| * | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-043-5/+193
| | | |
| * | | Begin to add unit tests for appservice glue and regex testing.Kegan Dougal2015-02-043-0/+140
| | | |
* | | | Merge pull request #62 from matrix-org/state-chacheErik Johnston2015-02-111-1/+6
|\ \ \ \ | |_|_|/ |/| | | State chache
| * | | Fix testsErik Johnston2015-02-091-1/+6
| | |/ | |/|
* | | Add a cache for get_eventMark Haines2015-02-112-2/+4
| | |
* | | Add a lru cache classMark Haines2015-02-111-0/+56
| | |
* | | Factor out some of the common homeserver setup code into aMark Haines2015-02-1125-360/+140
|/ / | | | | | | setup_test_homeserver function in utils.
* / Try to ensure we don't persist an event we have already persisted. In ↵Erik Johnston2015-02-031-1/+4
|/ | | | persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.
* Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-303-3/+614
|\ | | | | | | | | Conflicts: synapse/storage/schema/im.sql
| * Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-303-3/+614
| |\ | | | | | | Client v2 filter
| | * Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-51/+57
| | | | | | | | | | | | | | | split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event
| | * Merge in auth changes from developMark Haines2015-01-291-0/+1
| | |
| | * Merge changes from developMark Haines2015-01-295-4/+20
| | |\
| | * | Add filter_room_state unit tests.Kegan Dougal2015-01-291-0/+56
| | | |
| | * | Add basic filtering public API unit tests. Use defers in the right places.Kegan Dougal2015-01-291-1/+53
| | | |
| | * | Add more unit tests for the filter algorithm.Kegan Dougal2015-01-291-5/+259
| | | |
| | * | Implement filter algorithm. Add basic event type unit tests to assert it works.Kegan Dougal2015-01-291-1/+44
| | | |
| | * | Add filter JSON sanity checks.Kegan Dougal2015-01-281-4/+20
| | | |
| | * | Initial stab at real SQL storage implementation of user filter definitionsPaul "LeoNerd" Evans2015-01-271-1/+18
| | | |
| | * | More unit-testing of REST errorsPaul "LeoNerd" Evans2015-01-271-1/+35
| | | |
| | * | Move storage of user filters into real datastore layer; now have to mock it ↵Paul "LeoNerd" Evans2015-01-272-3/+27
| | | | | | | | | | | | | | | | out in the REST-level tests
| | * | Have the Filtering API return Deferreds, so we can do the Datastore ↵Paul "LeoNerd" Evans2015-01-271-2/+3
| | | | | | | | | | | | | | | | implementation nicely
| | * | Initial trivial unittest of Filtering objectPaul "LeoNerd" Evans2015-01-271-0/+67
| | | |
| | * | Use new V2AlphaRestTestCasePaul "LeoNerd" Evans2015-01-271-38/+2
| | | |
| | * | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-271-0/+45
| | |\ \
| | * | | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵Paul "LeoNerd" Evans2015-01-271-5/+7
| | | | | | | | | | | | | | | | | | | | shareable
| | * | | Initial trivial REST test of v2_alpha filter APIPaul "LeoNerd" Evans2015-01-261-0/+74
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-3026-418/+415
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | new_state_resolution
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-306-4/+80
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
| * | | | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-285-4/+20
| |\ \ \ \ | | |_|_|/ | |/| | | Extract the device id and token id from the access token when autheniticating users
| | * | | Extract the id token of the token when authing users, include the token and ↵Mark Haines2015-01-284-2/+18
| | | | | | | | | | | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events
| | * | | Return the device_id from get_auth_by_reqMark Haines2015-01-282-2/+2
| | | |/ | | |/|
| * / | Initial cut of a shared base class for REST unit testsPaul "LeoNerd" Evans2015-01-271-0/+45
| |/ /
| * | Create (empty) v2_alpha REST tests directoryPaul "LeoNerd" Evans2015-01-261-0/+15
| | |
* | | Initial implementation of auth conflict resolutionErik Johnston2015-01-291-0/+2
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-2324-416/+337
|\| | | |/ |/|
| * Replace hs.parse_roomalias with RoomAlias.from_stringMark Haines2015-01-234-13/+8
| |
| * Replace hs.parse_roomid with RoomID.from_stringMark Haines2015-01-235-11/+12
| |
| * Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-2316-70/+74
| |
| * Merge pull request #31 from matrix-org/client_api_resourceMark Haines2015-01-232-4/+9
| |\ | | | | | | Merge rest servlets into the client json resource object
| | * Merge rest servlets into the client json resource objectMark Haines2015-01-232-4/+9
| | |
| * | Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it ↵Paul "LeoNerd" Evans2015-01-221-3/+3
| | | | | | | | | | | | is still presence-specific
| * | Much merging of test case setUp() methods to make them much morePaul "LeoNerd" Evans2015-01-221-273/+193
| |/ | | | | | | shareable
| * Move client rest tests back under restMark Haines2015-01-229-5/+19
| |
| * Move rest APIs back under the rest directoryMark Haines2015-01-223-16/+16
| |
| * Move client v1 api rest servlets into a "client/v1" directoryMark Haines2015-01-228-21/+35
| |
| * Fix manifest. Ignore contrib and docs directories when checking manifest ↵Mark Haines2015-01-221-5/+0
| | | | | | | | against source control.
| * Abstract out the room ID from presence tests, so it's stored in selfPaul "LeoNerd" Evans2015-01-211-8/+10
| |
| * Use common base class for two Presence unit-tests, avoiding boilerplate ↵Paul "LeoNerd" Evans2015-01-211-54/+25
| | | | | | | | copypasta
* | Implement new state resolution algorithmErik Johnston2015-01-211-71/+357
|/
* Finish renaming "context" to "room_id" in federation codebaseMark Haines2015-01-161-2/+2
|
* Have MockClock detect attempts to cancel expired timers, to prevent a repeat ↵Paul "LeoNerd" Evans2015-01-131-4/+16
| | | | of SYN-230
* Remove unused functionsMark Haines2015-01-131-11/+0
|
* Check that setting typing notification still works after explicit timeout at ↵Paul "LeoNerd" Evans2015-01-121-1/+50
| | | | REST layer - SYN-230
* Don't make @unittest.DEBUG print the huge amount of verbosity generated by ↵Paul "LeoNerd" Evans2015-01-121-0/+2
| | | | the synapse.storage loggers
* Check that setting typing notification still works after explicit timeout - ↵Paul "LeoNerd" Evans2015-01-121-0/+26
| | | | SYN-230
* Update testsKegan Dougal2015-01-071-1/+1
|
* Mock ratelimiter to make tests pass.Kegan Dougal2014-12-192-4/+16
|
* Supply auth_chain along with current state in '/state/', fetch auth events ↵Mark Haines2014-12-181-0/+2
| | | | from a remote server if we are missing some of them
* Replace distributor deferred list, with a simple for loop until I understand ↵Mark Haines2014-12-181-8/+19
| | | | why the former breaks and the latter doesn't
* Construct the EventContext in the state handler rather than constructing one ↵Mark Haines2014-12-163-36/+34
| | | | and then immediately calling state_handler.annotate_context_with_state
* Remove annotate_event_with_state as nothing was using it. Update state tests ↵Mark Haines2014-12-161-69/+39
| | | | to call annotate_context_with_state
* Kill off synapse.api.events.*Erik Johnston2014-12-169-284/+35
|
* Rename MessageHandler.handle_event. Add a few comments.Erik Johnston2014-12-151-2/+3
|
* Get current member state from current_state snapshot. Fix leave test.Erik Johnston2014-12-151-1/+12
|
* Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-154-26/+287
|\ | | | | | | | | Conflicts: tests/handlers/test_room.py
| * Send list of typing user IDs as 'user_ids' list within 'content', so that ↵Paul "LeoNerd" Evans2014-12-122-6/+18
| | | | | | | | m.typing stream events have a toplevel content, for consistency with others
| * Add a 'user_left_room' distributor signal analogous to 'user_joined_room'Paul "LeoNerd" Evans2014-12-111-3/+41
| |
| * Actually auth-check to ensure people can only send typing notifications for ↵Paul "LeoNerd" Evans2014-12-111-0/+10
| | | | | | | | rooms they're actually in
| * Move typing-notification REST tests into their own .py filePaul "LeoNerd" Evans2014-12-112-83/+113
| |
| * Actually unit-test the event stream around REST typing testsPaul "LeoNerd" Evans2014-12-111-0/+14
| |
| * Initial hack at unit tests of room typing REST APIPaul "LeoNerd" Evans2014-12-111-3/+68
| |
| * Hook up the event stream to typing notificationsPaul "LeoNerd" Evans2014-12-101-0/+60
| |
| * Store serial numbers per room for typing event stream purposesPaul "LeoNerd" Evans2014-12-101-30/+16
| |
| * First hack at implementing timeouts in typing notification handlerPaul "LeoNerd" Evans2014-12-101-3/+33
| |
* | Fix tests and remove debug loggingErik Johnston2014-12-121-2/+7
| |
* | Fix membership handler testErik Johnston2014-12-121-82/+97
| |
* | Fix test.Erik Johnston2014-12-121-1/+1
| |
* | Fix stream test. Make sure we add join to auth_events for invitiationsErik Johnston2014-12-121-4/+0
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-112-0/+99
|\| | | | | | | | | Conflicts: setup.py
| * Implement .cancel_call_later() in MockClockPaul "LeoNerd" Evans2014-12-102-2/+23
| |
| * Implement .call_later() in MockClockPaul "LeoNerd" Evans2014-12-102-0/+48
| |
| * Trivial test of MockClock()Paul "LeoNerd" Evans2014-12-101-0/+30
| |
* | Fix replication testsErik Johnston2014-12-111-12/+6
| |
* | Fix federation testErik Johnston2014-12-111-18/+24
| |
* | Fix room creation testErik Johnston2014-12-111-34/+34
| |
* | Fix prev_contentErik Johnston2014-12-111-3/+2
| |
* | Fix redaction testsErik Johnston2014-12-111-6/+8
| |
* | Fix redactions. Fix 'age' keyErik Johnston2014-12-111-3/+3
| |
* | Fix some testsErik Johnston2014-12-105-130/+120
|/
* Add newline back inErik Johnston2014-12-101-0/+1
|
* Remove whitespaceErik Johnston2014-12-101-1/+1
|
* fix UTs by telling all the mock stores about the new methods for tracking ↵Matthew Hodgson2014-12-094-3/+23
| | | | retries
* Fix bugs when joining a remote room that has dodgy event graphs. This should ↵Erik Johnston2014-11-271-1/+5
| | | | also fix the number of times a HS will trigger a GET /event/
* Fix tests.Erik Johnston2014-11-261-1/+1
|
* Fix bugs in invite/join dances.Erik Johnston2014-11-252-7/+21
| | | | | We now do more implement more of the auth on the events so that we don't reject valid events.
* SYN-163: Add an order by rowid to selects.Erik Johnston2014-11-241-4/+8
| | | | | | | This should fix the bug where the edges of the graph get returned in a different order than they were inserted in, and so no get_event no longer returned the exact same JSON as was inserted. This meant that signature checks failed.
* Fix tests from prev commitErik Johnston2014-11-191-1/+0
|
* Initialise UserPresenceCache instances to always contain a 'presence' keyPaul "LeoNerd" Evans2014-11-191-2/+8
|
* replace user_id with senderMark Haines2014-11-192-1/+5
|
* Include room members' presence in room initialSyncPaul "LeoNerd" Evans2014-11-181-0/+14
|
* Include 'messages' snapshot in room initialSyncPaul "LeoNerd" Evans2014-11-181-0/+4
|
* Merge branch 'develop' into room-initial-syncPaul "LeoNerd" Evans2014-11-1721-1203/+748
|\ | | | | | | | | Conflicts: synapse/handlers/message.py
| * Merge PDUs and Events into one objectMark Haines2014-11-142-6/+7
| |
| * Validate signatures on incoming eventsMark Haines2014-11-141-1/+3
| |
| * Merge branch 'develop' into request_loggingMark Haines2014-11-1420-1166/+687
| |\ | | | | | | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py