a7927c13fd
Fix enabling & disabling push rules
2016-01-14 10:53:44 +00:00
339c8f0133
Clamp pagination limits to at most 1000
2016-01-14 10:22:02 +00:00
bce602eb4e
Use logger not logging
2016-01-14 09:56:26 +00:00
12623c99b6
Use the unread notification count to send accurate badge counts in push notifications.
2016-01-13 18:55:57 +00:00
2655d61d70
Don't change signature. Return empty list
2016-01-13 17:43:39 +00:00
fcb05b4c82
Temporarily disable notification branch
2016-01-13 17:39:58 +00:00
f6fcff3602
Don't start server if ASes are invalidly configured
2016-01-13 17:09:24 +00:00
244b356a37
Delete unused code
2016-01-13 17:03:58 +00:00
49f33f6438
Add 'event' result to 'context' endpoint
...
... because the context isn't much use without the event.
2016-01-13 16:42:14 +00:00
93afb40cd4
Skip, rather than erroring, invalid guest requests
...
Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour.
2016-01-13 16:41:42 +00:00
9c1f853d58
Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code
2016-01-13 13:32:59 +00:00
7d09ab8915
Require AS users to be registered before use
2016-01-13 13:19:47 +00:00
d9db819e23
Change default pushrules back to notifying for all messages.
2016-01-13 13:15:53 +00:00
44b4fc5f50
Use compiled regex
2016-01-13 11:47:32 +00:00
f4dad9f639
Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name
...
Conflicts:
synapse/storage/push_rule.py
2016-01-13 11:46:07 +00:00
8740e4e94a
bulk_get_push_rules should handle empty lists
2016-01-13 11:37:17 +00:00
c0a279e808
Delete the table objects from TransactionStore
2016-01-13 11:15:20 +00:00
96e400fee5
Remove the RoomsTable object
2016-01-13 11:07:32 +00:00
72ba26679b
Merge pull request #480 from matrix-org/erikj/guest_event_tightloop
...
Dont fire user_joined_room when guest hits /events
2016-01-13 11:00:50 +00:00
70dfe4dc96
Don't include old left rooms
2016-01-12 15:01:56 +00:00
a8e9e0b916
Remove the PushersTable and EventPushActionsTable objects
2016-01-12 14:41:26 +00:00
31de2953a3
Remove the PushRuleTable and PushRuleEnableTable objects
2016-01-12 14:36:16 +00:00
fd5c28dc52
Dont fire user_joined_room when guest hits /events
...
Firing the 'user_joined_room' signal everytime a guest hits /events
causes all presence for that room to be returned in the stream. This may
sound helpful, but causes clients to tightloop calling /events.
In general, guest users should get the initial presence from (room)
intial sync and so we don't require presence to sbsequently come down
the event stream.
2016-01-12 11:04:06 +00:00
42aa1f3f33
Merge pull request #478 from matrix-org/daniel/userobject
...
Introduce a User object
I'm sick of passing around more and more things as tuple items around
the whole world, and needing to edit every call site every time there is
more information about a user. So pass them around together as an
object.
This object has incredibly poorly named fields because we have a
convention that `user` indicates a UserID object, and `user_id`
indicates a string. I tried to clean up the whole repo to fix this, but
gave up. So instead, I introduce a second convention. A user_object is a
User, and a user_id_object is a UserId. I may have cried a little bit.
2016-01-11 17:50:22 +00:00
2110e35fd6
Introduce a Requester object
...
This tracks data about the entity which made the request. This is
instead of passing around a tuple, which requires call-site
modifications every time a new piece of optional context is passed
around.
I tried to introduce a User object. I gave up.
2016-01-11 17:48:45 +00:00
b5d33a656f
Postgres doesn't like booleans
2016-01-11 17:13:52 +00:00
fe56138142
Remove rogue 'admin'
2016-01-11 17:09:03 +00:00
8f8b884430
Don't log urlencoded access_tokens
2016-01-08 17:48:08 +00:00
29e595e5d4
Merge pull request #474 from matrix-org/erikj/core_dump
...
Turn on core dumps
2016-01-08 16:52:15 +00:00
c232780081
Merge pull request #456 from matrix-org/store_event_actions
...
Send unread notification counts
2016-01-08 14:47:15 +00:00
8677b7d698
Only use cropped thumbnails when asked for a cropped thumbnail.
...
Even though ones cropped with scale might be technically valid.
2016-01-07 18:57:15 +00:00
33bef689c1
Turn on core dumps
2016-01-07 15:34:30 +00:00
fcbe63eaad
Use logger not logging
2016-01-07 15:28:17 +00:00
5727922106
Merge pull request #473 from matrix-org/erikj/ssh_manhole
...
Change manhole to use ssh
2016-01-07 14:36:16 +00:00
5dc5e29b9c
s/telnet/ssh/
2016-01-07 14:02:57 +00:00
c9ae1d1ee5
Change manhole to use ssh
2016-01-07 13:59:02 +00:00
daadcf36c0
This comma is actually important
2016-01-07 10:15:35 +00:00
823b679232
more commas
2016-01-07 10:02:47 +00:00
6c28ac260c
copyrights
2016-01-07 04:26:29 +00:00
49c34dfd36
Merge pull request #472 from roblabla/patch-1
...
Config Comment mixup in captcha public/private key
2016-01-06 22:24:28 +00:00
4106477e7f
Config Comment mixup in captcha public/private key
2016-01-06 23:19:33 +01:00
11a974da21
Add /_matrix/versions to report supported versions
2016-01-06 18:08:52 +00:00
09dc9854cd
comma style
2016-01-06 17:44:10 +00:00
442fcc02f7
Merge remote-tracking branch 'origin/develop' into store_event_actions
2016-01-06 17:28:55 +00:00
b6a585348a
Adding is_guest here won't work because it just constructs a dict of uid -> password hash
2016-01-06 17:16:02 +00:00
4cec90a260
Pass whether the user was a guest to some of the event streams
2016-01-06 16:54:57 +00:00
392773ccb2
Guest users must be joined to a room to see it in /sync
2016-01-06 16:44:13 +00:00
bf32922e5a
Log when starting stats reporting
2016-01-06 14:13:34 +00:00
797691f908
Log on stats scheduling
2016-01-06 14:04:27 +00:00
5880de186b
Log when we skip daily messages
2016-01-06 13:52:16 +00:00
992928304f
Delete notifications for redacted events
2016-01-06 11:58:46 +00:00
ae1262a241
Add schema change file for is_guest flag
2016-01-06 11:58:20 +00:00
c79f221192
Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
2016-01-06 11:38:09 +00:00
eb03625626
Merge remote-tracking branch 'origin/develop' into store_event_actions
2016-01-05 18:39:50 +00:00
2ef6de928d
Skip, rather than erroring, invalid guest requests
...
Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour.
2016-01-05 18:12:37 +00:00
cfd07aafff
Allow guests to upgrade their accounts
2016-01-05 18:01:18 +00:00
8737ead008
Use larger thumbnail rather than smaller.
2016-01-05 17:30:30 +00:00
acb19068d0
Return /sync when something under the 'leave' key has changed
2016-01-05 14:49:06 +00:00
85ca8cb90c
comment typo
2016-01-05 13:32:39 +00:00
c3ea36304b
Use named args
2016-01-05 12:57:45 +00:00
1b5642604b
Support inviting 3pids in /createRoom
2016-01-05 11:56:21 +00:00
4eb7b950c8
= not == in sql
2016-01-04 18:11:17 +00:00
c77e7e60fc
Only joined rooms have unread_notif_count
2016-01-04 15:49:06 +00:00
d74c6ace24
comma
2016-01-04 15:32:00 +00:00
f1b67730fa
Add unread_notif_count in incremental_sync_with_gap
2016-01-04 14:50:36 +00:00
c914d67cda
Rename event-actions to event_push_actions as per PR request
2016-01-04 14:05:37 +00:00
d2709a5389
Bump changelog and version for v0.12.0
2016-01-04 13:57:39 +00:00
928c575c6f
Merge remote-tracking branch 'origin/develop' into store_event_actions
2016-01-04 13:39:51 +00:00
3051c9d002
Address minor PR issues
2016-01-04 13:39:29 +00:00
32d9fd0b26
Expose /login under r0
...
The spec says /login should be available at r0 and 'unstable', so make it so.
2016-01-02 17:24:28 +00:00
c6e79c84de
Bump version and update changelog for v0.12.0-rc3
2015-12-23 16:15:54 +00:00
8d6dde7825
Merge pull request #457 from matrix-org/markjh/cached_sync
...
Add a cache for initialSync responses that expires after 5 minutes
2015-12-23 16:04:52 +00:00
d12c00bdc3
Add some docstring explaining the snapshot cache does
2015-12-23 15:18:11 +00:00
f3948e001f
Missing yield on guest access auth check
...
Needs matrix-org/sytest#125 to land first
2015-12-23 14:10:06 +00:00
7fa71e3267
Add a unit test for the snapshot cache
2015-12-23 11:48:03 +00:00
517fb9a023
Move the doc string to the public facing method
2015-12-22 18:53:47 +00:00
9ac417fa88
Add a cache for initialSync responses that expires after 5 minutes
2015-12-22 18:27:56 +00:00
d2a92c6bde
Fix merge fail with anon access stuff
2015-12-22 18:25:04 +00:00
9b4cd0cd0f
pep8 & unused variable
2015-12-22 17:25:09 +00:00
140a50f641
Merge remote-tracking branch 'origin/develop' into store_event_actions
2015-12-22 17:23:35 +00:00
5645d9747b
Add some comments to areas that could be optimised.
2015-12-22 17:19:22 +00:00
4c8f6a7e42
Insert push actions in a single db query rather than one per user/profile_tag
2015-12-22 17:04:31 +00:00
0ee0138325
Include the list of bad room ids in the error
2015-12-22 15:49:32 +00:00
65c451cb38
Add bulk push rule evaluator which actually still evaluates rules one by one, but does far fewer db queries to fetch the rules
2015-12-22 15:19:34 +00:00
251aafccca
Use a list comprehension
2015-12-22 14:03:24 +00:00
c058625959
Merge remote-tracking branch 'origin/develop' into markjh/guest_access
...
Conflicts:
synapse/api/filtering.py
2015-12-22 13:58:18 +00:00
cdd04f7055
Hook up read receipts and typing notifications for guest access
2015-12-22 11:59:55 +00:00
542ab0f886
Merge branch 'develop' into markjh/guest_access
2015-12-22 11:49:12 +00:00
b9b4466d0d
Add top level filters for filtering by room id
...
Documented by matrix-org/matrix-doc#246
2015-12-22 11:40:32 +00:00
c3fff251a9
Allow guest access to /sync
2015-12-22 11:21:03 +00:00
45a9e0ae0c
Allow guest access if the user provides a list of rooms in the filter
2015-12-22 10:25:46 +00:00
489a4cd1cf
Add top level filtering by room id
2015-12-21 21:10:41 +00:00
7f3148865c
Return room avatar URLs in /publicRooms
...
Spec: https://github.com/matrix-org/matrix-doc/pull/244
Tests: https://github.com/matrix-org/sytest/pull/121
2015-12-21 19:38:04 +00:00
c061b47c57
Merge remote-tracking branch 'origin/develop' into store_event_actions
2015-12-21 15:30:26 +00:00
f73f154ec2
Only run pushers for users on this hs!
2015-12-21 15:28:54 +00:00
64b6606824
Remove accidentally committed debug logging
2015-12-21 15:22:03 +00:00
091c545c4f
pep8
2015-12-21 10:14:57 +00:00
a6ba41e078
Actually look up required remote server key IDs
...
set.union() is a side-effect-free function that returns the union of two
sets. This clearly wanted .update(), which is the side-effecting mutator
version.
2015-12-18 21:36:42 +00:00
c8ea2d5b1f
Merge pull request #450 from matrix-org/matthew/no-identicons
...
Matthew/no identicons
2015-12-18 18:14:06 +00:00
413d0d6a24
Make unread notification count sending work: put the correct count in incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user...
2015-12-18 17:47:00 +00:00
0a2d73fd60
Merge branch 'release-v0.12.0' into develop
2015-12-18 10:07:48 +00:00
ce4999268a
Fix typo that broke registration on the mobile clients
2015-12-18 10:07:28 +00:00
64374bda5b
fix indentation level
2015-12-17 23:04:53 +00:00
772ad4f715
stop generating default identicons. reverts most of 582019f870 and solves vector-web/vector-im#346
2015-12-17 23:04:20 +00:00
bdacee476d
Add display_name to 3pid invite in m.room.member invites
2015-12-17 18:55:08 +01:00
8c5f252edb
Strip address and such out of 3pid invites
...
We're not meant to leak that into the graph
2015-12-17 18:09:51 +01:00
a64f9bbfe0
Fix 500 error when back-paginating search results
...
We were mistakenly adding pagination clauses to the count query, which then
failed because the count query doesn't join to the events table.
2015-12-17 12:50:46 +00:00
42ad49f5b7
still very WIP, but now sends unread_notifications_count in the room object on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).
2015-12-16 18:42:09 +00:00
2b0f8a9482
Fix typo
2015-12-16 17:59:44 +01:00
0311612ce9
Give the IS a bunch more 3pid invite context
...
This allows it to form richer emails
2015-12-16 13:05:32 +00:00
5fc03449c8
Merge pull request #440 from matrix-org/daniel/ise
...
Include errcode on Internal Server Error
2015-12-16 11:26:55 +00:00
4fab578b43
Merge branch 'release-v0.12.0' into develop
2015-12-16 11:18:45 +00:00
dcfc70e8ed
Allow users to change which account a 3pid is bound to
2015-12-15 17:02:21 +00:00
63fdd9fe0b
Changelog and version bump for v0.12.0-rc2
2015-12-14 16:26:59 +00:00
3ddf0b9722
Fix spacing
2015-12-14 15:20:59 +00:00
2acae8300f
Fix logging to lie less
2015-12-14 15:19:37 +00:00
dbe7892e03
Fix a race between started/stopped stream
2015-12-14 15:09:41 +00:00
28c5181dfe
Add commentary for fix in PR#442
2015-12-14 14:50:51 +00:00
15e9885197
Merge branch 'release-v0.12.0' into develop
2015-12-14 14:46:55 +00:00
8505a4ddc3
Merge pull request #441 from matrix-org/markjh/fts_skip_invalid
...
Skip events that where the body, name or topic isn't a string
2015-12-14 14:42:35 +00:00
070e28e203
Combine the prev content tests
2015-12-14 14:34:04 +00:00
834924248f
Check whether prev_content or prev_sender is set before trying to rollback state
2015-12-14 14:09:21 +00:00
98dfa7d24f
Skip events that where the body, name or topic isn't a string when back populating the FTS index
2015-12-14 13:55:46 +00:00
338c0a8a69
Include errcode on Internal Server Error
2015-12-14 13:50:50 +00:00
76e69cc8de
Fix typo
2015-12-14 12:38:55 +00:00
bfc52a2342
Fix typo in sql for full text search on sqlite3
2015-12-14 11:38:11 +00:00
deeebbfcb7
Merge branch 'release-v0.12.0' into develop
2015-12-12 14:21:49 +00:00
1ee7280c4c
Do the /sync in parallel accross the rooms like /initialSync does
2015-12-11 16:48:20 +00:00
cde49d3d2b
Merge pull request #435 from matrix-org/erikj/search
...
Include approximate count of search results
2015-12-11 16:27:38 +00:00
d9a5c56930
Include approximate count of search results
2015-12-11 11:40:23 +00:00
51fb590c0e
Use more efficient query form
2015-12-11 11:12:57 +00:00
5e909c73d7
Store nothing instead of ['dont_notify'] for events with no notification required: much as it would be nice to be able to tell between the event not having been processed and there being no notification for it, this isn't worth filling up the table with ['dont_notify'] I think. Consequently treat the empty actions array as dont_notify and filter dont_notify out of the result.
2015-12-10 18:40:28 +00:00
515548a47a
Missing yield
2015-12-10 17:54:23 +00:00
aa667ee396
Save event actions to the db
2015-12-10 17:51:15 +00:00
7d6b313312
Add caches for whether a room has been forgotten by a user
2015-12-10 17:49:34 +00:00
a84a693327
Having consulted The Erikle, this should go at the end of on_receive_pdu, otherwise it will be triggered whenever we backfill too.
2015-12-10 17:18:46 +00:00
99afb4b750
Ensure that the event that gets persisted is the one that was signed
2015-12-10 17:08:21 +00:00
21f135ba76
Very first cut of calculating actions for events as they come in. Doesn't store them yet. Not very efficient.
2015-12-10 16:26:08 +00:00
a8589d1ff3
Mark the version as a -rc1 release candidate
2015-12-10 11:39:00 +00:00
05f6cb42db
Bump synapse version to v0.12.0
2015-12-09 17:48:02 +00:00
a24eedada7
pep8
2015-12-09 15:57:42 +00:00
4a728beba1
Split out the push rule evaluator into a separate file so it can be more readily reused. Should be functionally identical.
2015-12-09 15:51:34 +00:00
e4bfe50e8f
Allow filter JSON object in the filter query parameter in /sync
...
Documented by matrix-org/matrix-doc#224
2015-12-09 12:56:50 +00:00
0f826b0b0d
Merge pull request #430 from matrix-org/daniel/unstable
...
Merge pull request #430 from matrix-org/daniel/unstable
2015-12-09 11:34:22 +00:00
7c2ff8c889
Merge pull request #405 from matrix-org/erikj/search-ts
...
Change the result dict to be a list in /search response
2015-12-08 16:15:27 +00:00
7a8ba4c9a0
Actually host r0 and unstable prefixes
2015-12-08 15:26:52 +00:00
6a5ff5f223
Track the time spent in the database per request.
...
and track the number of transactions that request started.
2015-12-07 17:56:11 +00:00
f7a1cdbbc6
Merge pull request #423 from matrix-org/markjh/archived_flag
...
Only include the archived rooms if a include_leave flag in set in the…
2015-12-07 13:16:03 +00:00
d547afeae0
Merge remote-tracking branch 'origin/master' into develop
2015-12-07 13:13:43 +00:00
9c9b2829ae
also do more structured logging
2015-12-07 12:01:00 +00:00
50e5886de1
pep8
2015-12-07 11:57:48 +00:00
ba1d740239
Add logging to pushers API to log the body of the request
2015-12-07 11:52:20 +00:00
a190b2e85e
Merge pull request #427 from matrix-org/markjh/log_context
...
Add a setter for the current log context.
2015-12-07 11:00:12 +00:00
3dd1630848
Add a setter for the current log context.
...
Move the resource tracking inside that setter so that it is easier
to make sure that the resource tracking isn't double counting the
resource usage.
2015-12-07 10:51:18 +00:00
41905784f7
Take object not bool
...
Allows bool as legacy fallback
See https://github.com/matrix-org/matrix-doc/pull/212
2015-12-07 10:44:33 +00:00
660dee94af
Only include the archived rooms if a include_leave flag in set in the filter
2015-12-04 17:32:09 +00:00
262a97f02b
Merge pull request #422 from matrix-org/markjh/schema
...
Bump schema version.
2015-12-04 15:45:44 +00:00
d57c5cda71
Bump schema version.
...
As we released version 26 in v0.11.1
2015-12-04 15:28:39 +00:00
99e1d6777f
Add metrics to track the cpu on the main thread consumed by each type of request
2015-12-04 14:42:24 +00:00
3c85a317d6
Merge pull request #420 from matrix-org/markjh/resource_usage
...
Track the cpu used in the main thread by each logging context
2015-12-04 14:15:41 +00:00
5231737369
Add comments to explain why we are hardcoding RUSAGE_THREAD
2015-12-04 11:53:38 +00:00
d6059bdd2a
Fix warnings
2015-12-04 11:34:23 +00:00
48a2526d62
Track the cpu used in the main thread by each logging context
2015-12-03 21:03:01 +00:00
b29d2fd7f8
Merge pull request #419 from matrix-org/markjh/reuse_captcha_client
...
Reuse the captcha client rather than creating a new one for each request
2015-12-03 17:00:59 +00:00
edfcb83473
Flatten devices into a dict, not a list
2015-12-03 16:19:21 +00:00
478b4e3ed4
Reuse the captcha client rather than creating a new one for each request
2015-12-03 13:48:55 +00:00
b8680b82c3
Merge pull request #414 from matrix-org/erikj/if_not_exists
...
Older versions of SQLite don't like IF NOT EXISTS in virtual tables
2015-12-03 13:21:09 +00:00
ac213c2e08
Merge pull request #415 from matrix-org/daniel/endpoints
...
Merge pull request #415 from matrix-org/daniel/endpoints
2015-12-03 12:19:12 +00:00
e880164c59
Merge pull request #418 from matrix-org/daniel/whois
...
Merge pull request #418 from matrix-org/daniel/whois
2015-12-03 12:18:01 +00:00
526bc33e02
Fix implementation of /admin/whois
2015-12-02 17:29:47 +00:00
e515b48929
Just replace the table definition with the one from full_schema 16
2015-12-02 17:23:52 +00:00
8810eb8c39
Fix schema delta 15 on postgres in the very unlikley event that anyone upgrades to 15...
2015-12-02 17:19:11 +00:00
491f3d16dc
Make state updates in the C+S API idempotent
2015-12-02 15:50:50 +00:00
872c134807
Update endpoints to reflect current spec
2015-12-02 15:45:04 +00:00
f721fdbf87
Merge pull request #412 from matrix-org/erikj/search
...
Search: Add prefix matching support
2015-12-02 13:56:41 +00:00
976cb5aaa8
Throw if unrecognized DB type
2015-12-02 13:50:43 +00:00
b2def42bfd
Older versions of SQLite don't like IF NOT EXISTS in virtual tables
2015-12-02 13:29:14 +00:00
b9acef5301
Fix so highlight matching works again
2015-12-02 13:28:13 +00:00
58d0927767
Merge pull request #410 from matrix-org/markjh/edu_frequency
...
Only fire user_joined_room if the user has actually joined.
2015-12-02 13:17:15 +00:00
7dd6e5efca
Remove deuplication. Add comment about regex.
2015-12-02 13:09:37 +00:00
5dc09e82c4
Merge pull request #413 from matrix-org/markjh/reuse_http_client
...
Reuse a single http client, rather than creating new ones
2015-12-02 12:56:23 +00:00
c2c70f7daf
Use the context returned by _handle_new_event
2015-12-02 12:01:24 +00:00
477da77b46
Search: Add prefix matching support
2015-12-02 11:40:52 +00:00
37b2d69bbc
Reuse a single http client, rather than creating new ones
2015-12-02 11:36:02 +00:00
addb248e0b
Merge pull request #411 from matrix-org/default_dont_notify
...
Change the m.room.message rule to be disabled by default
2015-12-02 11:32:56 +00:00
4b1281f9b7
Change the m.room.message rule to be disabled by default so we only notify for 1:1 rooms / highlights out-of-the-box
2015-12-02 11:26:49 +00:00
dede14f689
Merge branch 'develop' into markjh/edu_frequency
2015-12-02 10:57:51 +00:00
5eb4d13aaa
Fix typo in collect_presencelike_data
2015-12-02 10:50:58 +00:00
c30cdb0d68
Add comments
2015-12-02 10:49:35 +00:00
2a0ec3b89d
Merge branch 'develop' into markjh/edu_frequency
...
Conflicts:
synapse/handlers/federation.py
synapse/handlers/room.py
2015-12-02 10:40:22 +00:00
03b2a6a8aa
Merge pull request #409 from MadsRC/develop
...
Develop
2015-12-02 10:08:18 +00:00
9fbd504b4e
Merge pull request #408 from matrix-org/markjh/distributor_facade
...
Wrap calls to distributor.fire in appropriately named functions
2015-12-02 09:44:56 +00:00
9670f226e3
Merge pull request #406 from matrix-org/erikj/search
...
Search: Don't disregard grouping info in pagination tokens
2015-12-02 09:13:20 +00:00
6863466653
Added a single line to explain what the server_name is used for
2015-12-02 00:37:55 +01:00
a9526831a4
Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what
2015-12-01 20:53:04 +00:00
ed0f79bdc5
Only fire user_joined_room if the membership has changed
2015-12-01 19:46:15 +00:00
f73ea0bda2
Merge branch 'develop' into markjh/edu_frequency
2015-12-01 19:15:27 +00:00
95f30ecd1f
Add API for setting account_data globaly or on a per room basis
2015-12-01 18:41:32 +00:00
14d7acfad4
Host /unstable and /r0 versions of r0 APIs
2015-12-01 17:34:32 +00:00
27c5e1b374
Search: Don't disregard grouping info in pagination tokens
2015-12-01 16:47:18 +00:00
af96c6f4d3
Merge pull request #404 from matrix-org/markjh/trivial_rename
...
Rename presence_handler.send_invite
2015-12-01 16:11:03 +00:00
d32db0bc45
Merge pull request #402 from matrix-org/markjh/event_formatting
...
Copy rather than move the fields to shuffle between a v1 and a v2 event.
2015-12-01 16:10:24 +00:00
3d3da2b460
Only fire user_joined_room on the distributor if the user has actually joined the room
2015-12-01 16:03:08 +00:00
31069ecf6a
Rename presence_handler.send_invite to presence_handler.send_presence_invite to distinguish it from normal invites
2015-12-01 15:59:45 +00:00
71578e2bf2
Change the result tict to be a list
2015-12-01 14:48:35 +00:00
306415391d
Only add the user_id if the sender is present
2015-12-01 11:14:48 +00:00
da7dd58641
Tidy up a bit
2015-12-01 11:06:40 +00:00
bde8d78b8a
Copy rather than move the fields to shuffle between a v1 and a v2 event.
...
This should make all v1 APIs compatible with v2 clients. While still
allowing v1 clients to access the fields.
This makes the documentation easier since we can just document the v2
format and explain that some of the fields, in some of the APIs are
duplicated for backwards compatibility, rather than having to document
two separate event formats.
2015-11-30 17:46:35 +00:00
4dcaa42b6d
Allow paginating search ordered by recents
2015-11-30 17:45:31 +00:00
76936f43ae
Return words to highlight in search results
2015-11-27 16:40:42 +00:00
17dd5071ef
Allow user to redact with an equal power
...
Users only need their power level to be equal to the redact level for
them to be allowed to redact events.
2015-11-26 11:17:57 +00:00
df7cf6c0eb
Fix SQL for postgres again
2015-11-23 18:54:41 +00:00
3e573a5c6b
Fix SQL for postgres
2015-11-23 18:48:53 +00:00
7dfa455508
Remove size specifier for database column
...
Postgres doesn't support them like this.
We don't have a bool type in common between postgres and sqlite.
2015-11-23 18:35:25 +00:00
924d85a75e
Merge pull request #375 from matrix-org/daniel/guestroominitialsync
...
Clean up room initialSync for guest users
2015-11-23 16:10:49 +00:00
c6a15f5026
Merge pull request #385 from matrix-org/daniel/forgetrooms
...
Allow users to forget rooms
2015-11-20 18:07:26 +00:00
1b64cb019e
Merge branch 'erikj/perspective_limiter' into release-v0.11.1
2015-11-20 17:24:23 +00:00
0eabfa55f6
Fix typo
2015-11-20 17:17:58 +00:00
6408541075
Don't limit connections to perspective servers
2015-11-20 17:15:44 +00:00
2c1bc4392f
Bump changes and version
2015-11-20 16:35:01 +00:00
93f7bb8dd5
Merge pull request #394 from matrix-org/erikj/search
...
Add options for including state in search results
2015-11-20 16:31:24 +00:00
1d9c1d4166
Merge pull request #389 from matrix-org/rav/flatten_sync_response
...
v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
2015-11-20 15:18:55 +00:00
3f151da314
Merge pull request #391 from matrix-org/erikj/remove_token_from_flow
...
Remove m.login.token from advertised flows.
2015-11-20 14:16:59 +00:00
6b95a79724
Add option to include the current room state
2015-11-20 14:16:42 +00:00
e3dae653e8
Comment
2015-11-20 14:05:22 +00:00
9de1f328ad
Merge pull request #393 from matrix-org/erikj/destination_retry_max
...
Use min and not max to set an upper bound on retry interval
2015-11-20 13:41:20 +00:00
506874cca9
Optionally include historic profile info
2015-11-20 11:39:44 +00:00
2f2bbb4d06
Use min and not max to set an upper bound on retry interval
2015-11-20 09:34:58 +00:00
95c3306798
Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into daniel/forgetrooms
2015-11-19 15:00:14 -05:00
df6824a008
Ignore forgotten rooms in v2 sync
2015-11-19 14:54:47 -05:00
dd11bf8a79
Merge branch 'develop' into rav/flatten_sync_response
2015-11-19 17:21:03 +00:00
1cfda3d2d8
Merge branch 'develop' into daniel/forgetrooms
2015-11-19 16:53:13 +00:00
8b5349c7bc
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-11-19 16:17:54 +00:00
37de8a7f4a
Remove m.login.token from advertised flows.
2015-11-19 16:16:49 +00:00
7a802ec0ff
Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data
...
s/private_user_data/account_data/
2015-11-19 15:21:35 +00:00
248cfd5eb3
Take a boolean not a list of lambdas
2015-11-19 15:16:25 +00:00
9da4c5340d
Simplify code
2015-11-19 10:07:21 -05:00
5fcef78c6a
Bump changes and version
2015-11-19 13:09:48 +00:00
06f74068f4
Comment
2015-11-19 13:05:51 +00:00
f6e092f6cc
Put back the 'state.events' subobject
...
We're keeping 'events', in case we decide to add more keys later.
2015-11-19 12:23:42 +00:00
24ae0eee8e
v2 /sync: Rename the keys of the 'rooms' object to match member states
...
joined->join
invited->invite
archived->leave
2015-11-19 10:51:12 +00:00
3c3fc6b268
Flatten the /sync response to remove the event_map
2015-11-19 10:51:11 +00:00
bed7889703
Apply forgetting properly to historical events
2015-11-18 18:11:12 -05:00
037ce4c68f
Split out text for missing config options.
...
This allows packages to more easily override the default messages to
include package specific options.
2015-11-18 18:37:05 +00:00
d153f482dd
Rename the database table
2015-11-18 15:33:02 +00:00
1c960fbb80
s/private_user_data/account_data/
2015-11-18 15:31:04 +00:00
ba26eb3d5d
Allow users to forget rooms
2015-11-17 17:17:30 -05:00
cf844e2ad6
Bump changelog and version
2015-11-17 18:48:32 +00:00
cbf3cd6151
Add comment
2015-11-17 18:29:29 +00:00
cf4ef5f3c7
Only retry federation requests for a long time for background requests
2015-11-17 18:26:50 +00:00
afdfd12bdf
Implement required method 'resumeProducing'
2015-11-17 16:57:06 +00:00
bceec65913
Slightly more aggressive retry timers at HTTP level
2015-11-17 15:10:05 +00:00
9eff52d1a6
Bump changelog and version
2015-11-17 14:38:36 +00:00
0186aef814
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
2015-11-17 14:37:13 +00:00
f20d064e05
Always check guest = true in macaroons
2015-11-17 10:58:05 +00:00
f5e25c5f35
Merge branch 'develop' into sh-cas-auth-via-homeserver
2015-11-17 10:55:41 +00:00
aca6e5bf46
Don't complain if /make_join response lacks 'prev_state' list (SYN-517)
2015-11-13 17:27:25 +00:00
641420c5e0
Clean up room initialSync for guest users
2015-11-13 15:44:57 +00:00
9c3f4f8dfd
Allow guests to /room/:room_id/{join,leave}
2015-11-13 11:56:58 +00:00
0644f0eb7d
Bump version and change log
2015-11-13 11:43:29 +00:00
e4d622aaaf
Implementation of state rollback in /sync
...
Implementation of SPEC-254: roll back the state dictionary to how it looked at
the start of the timeline.
Merged PR https://github.com/matrix-org/synapse/pull/373
2015-11-13 10:58:56 +00:00
fddedd51d9
Fix a few race conditions in the state calculation
...
Be a bit more careful about how we calculate the state to be returned by
/sync. In a few places, it was possible for /sync to return slightly later
state than that represented by the next_batch token and the timeline. In
particular, the following cases were susceptible:
* On a full state sync, for an active room
* During a per-room incremental sync with a timeline gap
* When the user has just joined a room. (Refactor check_joined_room to make it
less magical)
Also, use store.get_state_for_events() (and thus the existing stategroups) to
calculate the state corresponding to a particular sync position, rather than
state_handler.compute_event_context(), which recalculates from first principles
(and tends to miss some state).
Merged from PR https://github.com/matrix-org/synapse/pull/372
2015-11-13 10:39:09 +00:00
5ab4b0afe8
Make handlers.sync return a state dictionary, instead of an event list.
...
Basically this moves the process of flattening the existing dictionary into a
list up to rest.client.*, instead of doing it in handlers.sync. This simplifies
a bit of the code in handlers.sync, but it is also going to be somewhat
beneficial in the next stage of my hacking on SPEC-254.
Merged from PR #371
2015-11-13 10:35:01 +00:00
5dea4d37d1
Update some comments
...
Add a couple of type annotations, docstrings, and other comments, in the
interest of keeping track of what types I have.
Merged from pull request #370 .
2015-11-13 10:31:15 +00:00
fc27ca9006
Merge pull request #369 from matrix-org/daniel/guestnonevents
...
Return non-room events from guest /events calls
2015-11-12 17:28:48 +00:00
468a2ed4ec
Return non-room events from guest /events calls
2015-11-12 16:45:28 +00:00
018b504f5b
Merge pull request #368 from matrix-org/erikj/fix_federation_profile
...
Fix missing profile data in federation joins
2015-11-12 16:30:02 +00:00
49f1758d74
Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster
...
Use a (hopefully) more efficient SQL query for doing recency based room search
2015-11-12 16:24:32 +00:00
c0b3554401
Fix missing profile data in federation joins
...
There was a regression where we stopped including profile data in
initial joins for rooms joined over federation.
2015-11-12 16:19:55 +00:00
3de46c7755
Trailing whitespace
2015-11-12 15:36:43 +00:00
8fd8e72cec
Expand comment
2015-11-12 15:33:47 +00:00
78f6010207
Fix an issue with ignoring power_level changes on divergent graphs
...
Changes to m.room.power_levels events are supposed to be handled at a high
priority; however a typo meant that the relevant bit of code was never
executed, so they were handled just like any other state change - which meant
that a bad person could cause room state changes by forking the graph from a
point in history when they were allowed to do so.
2015-11-12 15:24:59 +00:00
06bfd0a3c0
Merge pull request #367 from matrix-org/daniel/readafterleave
...
Merge pull request #367 from matrix-org/daniel/readafterleave
Tweak guest access permissions
2015-11-12 15:22:02 +00:00
764e79d051
Comment
2015-11-12 15:19:56 +00:00
0d08670f61
Merge pull request #360 from matrix-org/daniel/guestroominitialsync
...
Merge pull request #360 from matrix-org/daniel/guestroominitialsync
Allow guest access to room initialSync
2015-11-12 15:19:55 +00:00
320408ef47
Fix SQL syntax
2015-11-12 15:09:45 +00:00
fb7e260a20
Tweak guest access permissions
...
* Allow world_readable rooms to be read by guests who have joined and
left
* Allow regular users to access world_readable rooms
2015-11-12 15:02:00 +00:00
14a9d805b9
Use a (hopefully) more efficient SQL query for doing recency based room search
2015-11-12 14:48:39 +00:00
39de87869c
Fix bug where assumed dict was namedtuple
2015-11-12 14:47:48 +00:00
0a93df5f9c
Allow guests to set their display names
...
Depends: https://github.com/matrix-org/synapse/pull/363
Tests in https://github.com/matrix-org/sytest/pull/66
2015-11-12 13:44:39 +00:00
50f1afbd5b
Consider joined guest users as joined users
...
Otherwise they're inconveniently allowed to write events to the room
but not to read them from the room.
2015-11-12 13:37:07 +00:00
6a9c4cfd0b
Fix race creating directories
2015-11-12 11:58:48 +00:00
aa3ab6c6a0
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
2015-11-11 18:17:49 +00:00
04034d0b56
Merge pull request #361 from matrix-org/daniel/guestcontext
...
Allow guests to access room context API
2015-11-11 18:17:35 +00:00
6341be45c6
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
2015-11-11 17:51:14 +00:00
e93d550b79
Allow guests to access room context API
2015-11-11 17:49:44 +00:00
e21cef9bb5
Merge pull request #359 from matrix-org/markjh/incremental_indexing
...
Incremental background updates for db indexes
2015-11-11 17:19:51 +00:00
e1627388d1
Fix param style to work on both sqlite and postgres
2015-11-11 17:14:56 +00:00
f15ba926cc
Allow guest access to room initialSync
2015-11-11 17:13:24 +00:00
ffdc8e5e1c
Snakes not camels
2015-11-11 14:26:47 +00:00
940a161192
Fix the background update
2015-11-11 13:59:40 +00:00
2b779af10f
Minor review fixes
2015-11-11 11:21:43 +00:00
dd2eb49385
Share more code between macaroon validation
2015-11-11 11:12:35 +00:00
cf437900e0
Return world_readable and guest_can_join in /publicRooms
2015-11-10 17:10:27 +00:00
38d82edf0e
Allow guest users to join and message rooms
2015-11-10 16:57:13 +00:00
90b503216c
Use a background task to update databases to use the full text search
2015-11-10 16:20:13 +00:00
a412b9a465
Run the background updates when starting synapse.
2015-11-10 15:50:58 +00:00
82e8a2d763
Merge pull request #356 from matrix-org/daniel/3pidyetagain
...
Get display name from identity server, not client
2015-11-10 12:44:17 +00:00
2ede7aa8a1
Add background update task for reindexing event search
2015-11-09 19:29:32 +00:00
c7db2068c8
Don't fiddle with results returned by event sources
...
Overwriting hashes returned by other methods is poor form.
Fixes: SYN-516
2015-11-09 18:09:46 +00:00
0d63dc3ec9
Get display name from identity server, not client
2015-11-09 17:26:43 +00:00
c6a01f2ed0
Add storage module for tracking background updates.
...
The progress for each background update is stored as a JSON blob in the
database. Each background update is broken up into separate batches.
The batch size is automatically tuned to try avoid blocking single
threaded databases for too long.
2015-11-09 17:26:27 +00:00
9107ed23b7
Add a couple of unit tests for room/<x>/messages
...
... merely because I was trying to figure out how it worked, and couldn't.
2015-11-09 16:16:43 +00:00
bbe10e8be7
Merge branch 'develop' into markjh/SYN-513
...
Conflicts:
synapse/storage/tags.py
2015-11-09 15:01:59 +00:00
c4135d85e1
SYN-513: Include updates for rooms that have had all their tags deleted
2015-11-09 14:53:08 +00:00
dd40fb68e4
fix comedy important missing comma breaking recent-ordered FTS on sqlite
2015-11-08 16:04:37 +00:00
767c20a869
add a key existence check to tags_by_room to avoid /events 500'ing when testing against vector
2015-11-06 20:49:57 +01:00
f2c4ee41b9
Remove accidentally added ID column
2015-11-06 14:27:49 +00:00
0b31223c7a
Updates to fallback CAS login to do new token login
2015-11-06 09:57:17 +00:00
fece2f5c77
Merge branch 'develop' into sh-cas-auth-via-homeserver
2015-11-05 20:59:45 +00:00
f23af34729
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
2015-11-05 18:00:51 +00:00
6be1b4b113
Merge pull request #350 from matrix-org/erikj/search
...
Implement pagination, order by and groups in search
2015-11-05 17:52:32 +00:00
66d36b8e41
Be explicit about what we're doing
2015-11-05 17:26:19 +00:00
2aa98ff3bc
Remove redundant test
2015-11-05 17:25:50 +00:00
5ee070d21f
Increment by one, not five
2015-11-05 17:25:33 +00:00
f1dcaf3296
Bump changelog and version number
2015-11-05 17:20:28 +00:00
2cebe53545
Exchange 3pid invites for m.room.member invites
2015-11-05 16:43:19 +00:00
1ad6222ebf
COMMENTS
2015-11-05 16:29:16 +00:00
5bc690408d
Merge pull request #340 from matrix-org/erikj/server_retries
...
Retry dead servers a lot less often
2015-11-05 16:15:50 +00:00
3640ddfbf6
Error handling
2015-11-05 16:10:54 +00:00
729ea933ea
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-11-05 15:43:52 +00:00
347146be29
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-11-05 15:35:17 +00:00
7a5ea067e2
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
2015-11-05 15:35:05 +00:00
7301e05122
Implement basic pagination for search results
2015-11-05 15:04:08 +00:00
ca2f90742d
Open up /events to anonymous users for room events only
...
Squash-merge of PR #345 from daniel/anonymousevents
2015-11-05 14:32:26 +00:00
414a4a71b4
Allow hs to do CAS login completely and issue the client with a login token that can be redeemed for the usual successful login response
2015-11-05 14:06:48 +00:00
7a369e8a55
Merge pull request #347 from matrix-org/markjh/check_filter
...
Remove fields that are both unspecified and unused from the filter checks
2015-11-05 11:15:39 +00:00
45f1827fb7
Add service URL to CAS config
2015-11-04 23:32:30 +00:00
05c326d445
Implement order and group by
2015-11-04 17:57:44 +00:00
4e62ffdb21
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-11-04 17:31:01 +00:00
f522f50a08
Allow guests to register and call /events?room_id=
...
This follows the same flows-based flow as regular registration, but as
the only implemented flow has no requirements, it auto-succeeds. In the
future, other flows (e.g. captcha) may be required, so clients should
treat this like the regular registration flow choices.
2015-11-04 17:29:07 +00:00
33b3e04049
Merge branch 'develop' into daniel/removesomelies
...
Conflicts:
synapse/notifier.py
2015-11-04 16:01:00 +00:00
285d056629
Remove fields that are both unspecified and unused from the filter checks, check the right top level definitions in the filter
2015-11-04 15:47:19 +00:00
c452dabc3d
Remove the LockManager class because it wasn't being used
2015-11-04 14:08:15 +00:00
f74f48e9e6
Merge pull request #341 from matrix-org/markjh/v2_sync_receipts
...
Include read receipts in v2 sync
2015-11-03 18:45:13 +00:00
6a3a840b19
Merge pull request #343 from matrix-org/erikj/fix_retries
...
Fix broken cache for getting retry times.
2015-11-03 17:51:49 +00:00
a3bfef35fd
Merge branch 'develop' into markjh/v2_sync_receipts
...
Conflicts:
synapse/handlers/sync.py
2015-11-03 17:31:17 +00:00
6797fcd9ab
Merge pull request #335 from matrix-org/markjh/room_tags
...
Add APIs for adding and removing tags from rooms
2015-11-03 16:45:53 +00:00
97d792b28f
Don't rearrange transaction_queue
2015-11-03 16:31:08 +00:00
7ce264ce5f
Fix broken cache for getting retry times. This meant we retried remote destinations way more frequently than we should
2015-11-03 16:24:03 +00:00
06986e46a3
That TODO was done
2015-11-03 14:28:51 +00:00
5897e773fd
Spell "deferred" more correctly
2015-11-03 14:27:35 +00:00
2657140c58
Include read receipts in v2 sync
2015-11-02 17:54:04 +00:00
eacb068ac2
Retry dead servers a lot less often
2015-11-02 16:56:30 +00:00
57be722c46
Include room tags in v2 /sync
2015-11-02 16:23:15 +00:00
771ca56c88
Remove more unused parameters
2015-11-02 15:31:57 +00:00
ddd8566f41
Store room tag content and return the content in the m.tag event
2015-11-02 15:11:31 +00:00
192241cf2a
Remove unused arguments and code
2015-11-02 15:10:59 +00:00
0e36756383
Merge branch 'develop' into markjh/room_tags
2015-11-02 10:57:00 +00:00
fb46937413
Support clients supplying older tokens, fix short poll test
2015-10-30 16:38:35 +00:00
79b65f3875
Include tags in v1 room initial sync
2015-10-30 16:28:19 +00:00
621e84d9a0
Add missing column
2015-10-30 16:25:53 +00:00
fdf73c6855
Include room tags v1 /initialSync
2015-10-30 16:22:32 +00:00
d58edd98e9
Update the other place check_joined_room is called
2015-10-30 11:15:37 +00:00
5cf22f0596
Don't mark newly joined room timelines as limited in an incremental sync
2015-10-29 19:58:51 +00:00
f6e6f3d87a
Make search API honour limit set in filter
2015-10-29 16:17:47 +00:00
f40b0ed5e1
Inform the client of new room tags using v1 /events
2015-10-29 15:21:09 +00:00
5d80dad99e
Merge pull request #336 from matrix-org/erikj/search
...
Optionally return event contexts with search results
2015-10-28 18:39:40 +00:00
e83c4b8e3e
Merge pull request #334 from matrix-org/erikj/context_api
...
Add room context api
2015-10-28 18:26:01 +00:00
a2e5f7f3d8
Optionally return event contexts with search results
2015-10-28 18:25:11 +00:00
a89b86dc47
Fix pyflakes errors
2015-10-28 16:45:57 +00:00
892e70ec84
Add APIs for adding and removing tags from rooms
2015-10-28 16:06:57 +00:00
56dbcd1524
Docs
2015-10-28 14:05:50 +00:00
234d6f9f3e
Merge pull request #332 from matrix-org/rav/full_state_sync
...
Implement full_state incremental sync
2015-10-28 14:04:39 +00:00
5cb298c934
Add room context api
2015-10-28 13:45:56 +00:00
c79c4f9b14
Implement full_state incremental sync
...
A hopefully-complete implementation of the full_state incremental sync, as
specced at https://github.com/matrix-org/matrix-doc/pull/133 .
This actually turns out to be a relatively simple modification to the initial
sync implementation.
2015-10-26 18:47:18 +00:00
f69a5c9134
Fix a 500 error resulting from empty room_ids
...
POST /_matrix/client/api/v1/rooms//send/a.b.c gave a 500 error, because we
assumed that rooms always had at least one character.
2015-10-26 18:44:03 +00:00
f73de2004e
Use correct service url
2015-10-26 18:12:09 +00:00
87961d8dcf
Add login fallback
2015-10-26 17:35:24 +00:00
fa1cf5ef34
Move static folder into synapse
...
This is because otherwise it won't get picked up by python packaging.
This also fixes the problem where the "static" folder was found if
synapse wasn't started from that directory.
2015-10-26 15:37:44 +00:00
3f0a57eb9b
Merge pull request #328 from matrix-org/erikj/search
...
Pull out sender when computing search results
2015-10-26 10:24:19 +00:00
4cf633d5e9
Pull out sender when computing search results
2015-10-23 15:41:36 +01:00
b8e37ed944
Merge pull request #327 from matrix-org/erikj/search
...
Implement rank function for SQLite FTS
2015-10-23 15:27:51 +01:00
0c36098c1f
Implement rank function for SQLite FTS
2015-10-23 13:23:48 +01:00
216c976399
Merge pull request #323 from matrix-org/daniel/sizelimits
...
Reject events which are too large
2015-10-23 11:26:03 +01:00
259d10f0e4
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
2015-10-23 11:11:56 +01:00
b051781ddb
Merge pull request #325 from matrix-org/markjh/filter_dicts
...
Support filtering events represented as dicts.
2015-10-22 17:14:52 +01:00
4e05aab4f7
Don't assume that the event has a room_id or sender
2015-10-22 17:08:59 +01:00
671ac699f1
Actually filter results
2015-10-22 16:54:56 +01:00
9b6f3bc742
Support filtering events represented as dicts.
...
This is useful because the emphemeral events such as presence and
typing are represented as dicts inside synapse.
2015-10-22 16:38:03 +01:00
2980136d75
Rename
2015-10-22 16:19:53 +01:00
fb0fecd0b9
LESS THAN
2015-10-22 16:18:35 +01:00
61547106f5
Fix receipts for room initial sync
2015-10-22 16:17:23 +01:00
232beb3a3c
Use namedtuple as return value
2015-10-22 15:02:35 +01:00
ba02bba88c
Limit max number of SQL vars
2015-10-22 13:25:27 +01:00
b0ac0a9438
Merge pull request #319 from matrix-org/erikj/filter_refactor
...
Refactor api.filtering to have a Filter API
2015-10-22 13:17:10 +01:00
8a98f0dc5b
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-10-22 13:16:35 +01:00
c9c82e8f4d
Merge pull request #320 from matrix-org/appservice-retry-cap
...
Cap the time to retry txns to appservices to 8.5 minutes
2015-10-22 13:15:54 +01:00
e60dad86ba
Reject events which are too large
...
SPEC-222
2015-10-22 11:44:31 +01:00
f142898f52
PEP8
2015-10-22 11:18:01 +01:00
4d25bc6c92
Move FTS to delta 25
2015-10-22 11:12:28 +01:00
5025ba959f
Add config option to disable password login
2015-10-22 10:37:04 +01:00
5201c66108
Merge branch 'develop' into markjh/v2_sync_typing
...
Conflicts:
synapse/handlers/sync.py
2015-10-21 15:48:34 +01:00
e94ffd89d6
Merge pull request #316 from matrix-org/markjh/v2_sync_archived
...
Add rooms that the user has left under archived in v2 sync.
2015-10-21 15:46:41 +01:00
d63a0ca34b
Doc string for the SyncHandler.typing_by_room method
2015-10-21 15:45:37 +01:00
e3d75f564a
Include banned rooms in the archived section of v2 sync
2015-10-21 11:15:48 +01:00
8627048787
Merge pull request #318 from matrix-org/syn-502-login-bad-emails
...
Don't 500 on /login when the email doesn't map to a valid user ID.
2015-10-21 10:16:33 +01:00
4dec901c76
Cap the time to retry txns to appservices to 8.5 minutes
...
There's been numerous issues with people playing around with their
application service and then not receiving events from their HS for
ages due to backoff timers reaching crazy heights (albeit capped at
< 1 day).
Reduce the max time between pokes to be 8.5 minutes (2^9 secs) which
is quick enough for people to wait it out (avg wait time being 4.25 min)
but long enough to actually give the AS breathing room if it needs it.
2015-10-21 10:10:55 +01:00
5c41224a89
Filter room ids before hitting the database
2015-10-21 10:09:26 +01:00
c8baada94a
Filter search results
2015-10-21 10:08:53 +01:00
ede07434e0
Use 403 and message to match handlers/auth
2015-10-21 09:42:07 +01:00
7be06680ed
Include typing events in initial v2 sync
2015-10-20 16:36:20 +01:00
87deec824a
Docstring
2015-10-20 15:47:42 +01:00
45cd2b0233
Refactor api.filtering to have a Filter API
2015-10-20 15:33:25 +01:00
137fafce4e
Allow rejecting invites
...
This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave.
2015-10-20 11:58:58 +01:00
b02a342750
Don't 500 when the email doesn't map to a valid user ID.
2015-10-20 11:07:50 +01:00
51d03e65b2
Fix pep8
2015-10-19 17:48:58 +01:00
68b7fc3e2b
Add rooms that the user has left under archived in v2 sync.
2015-10-19 17:26:18 +01:00
9261ef3a15
Merge pull request #312 from matrix-org/daniel/3pidinvites
...
Stuff signed data in a standalone object
2015-10-19 15:52:34 +01:00
e0bf0258ee
Merge pull request #307 from matrix-org/erikj/search
...
Add basic search API
2015-10-19 13:37:15 +01:00
243a79d291
Surely we don't need to preserve 'events_default' twice
2015-10-16 18:25:19 +01:00
9371a35e89
Merge pull request #306 from matrix-org/markjh/unused_methods
...
Remove some login classes from synapse.
2015-10-16 18:18:41 +01:00
0e5239ffc3
Stuff signed data in a standalone object
...
Makes both generating it in sydent, and verifying it here, simpler at
the cost of some repetition
2015-10-16 17:45:48 +01:00
b19b9535f6
Merge pull request #310 from matrix-org/markjh/bcrypt_rounds
...
Add config for how many bcrypt rounds to use for password hashes
2015-10-16 17:05:21 +01:00
46d39343d9
Explicitly check for Sqlite3Engine
2015-10-16 16:58:00 +01:00
f2d698cb52
Typing
2015-10-16 16:46:48 +01:00
33646eb000
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-10-16 15:35:35 +01:00
380f148db7
Remove unused import
2015-10-16 15:32:56 +01:00
fc012aa8dc
Fix FilteringStore.get_user_filter to work with postgres
2015-10-16 15:28:43 +01:00
e5acc8a47b
Merge pull request #302 from matrix-org/daniel/3pidinvites
...
Implement third party identifier invites
2015-10-16 15:23:30 +01:00
d4b5621e0a
Remove duplicate _filter_events_for_client
2015-10-16 15:19:52 +01:00
23ed7dc0e7
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-10-16 15:18:42 +01:00
c225d63e9e
Add signing host and keyname to signatures
2015-10-16 15:07:56 +01:00
b8dd5b1a2d
Verify third party ID server certificates
2015-10-16 14:54:54 +01:00
366af6b73a
Amalgamate _filter_events_for_client
2015-10-16 14:52:48 +01:00
f2f031fd57
Add config for how many bcrypt rounds to use for password hashes
...
By default we leave it at the default value of 12. But now we can reduce
it for preparing users for loadtests or running integration tests.
2015-10-16 14:52:08 +01:00
12122bfc36
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-10-16 14:46:32 +01:00
edb998ba23
Explicitly check for Sqlite3Engine
2015-10-16 14:37:14 +01:00
b62da463e1
docstring
2015-10-16 11:52:16 +01:00
3cf9948b8d
Add docstring
2015-10-16 11:28:12 +01:00
73260ad01f
Comment on the LIMIT 500
2015-10-16 11:24:02 +01:00
22a8c91448
Split up run_upgrade
2015-10-16 11:19:44 +01:00
6296590bf7
Encode the filter JSON as UTF-8 before storing in the database.
...
Because we are using a binary column type to store the filter JSON.
2015-10-16 10:50:32 +01:00
bcfb653816
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-10-15 16:37:32 +01:00
8189c4e3fd
Bump version
2015-10-15 15:29:00 +01:00
6ffbcf45c6
Use non-placeholder name for endpoint
2015-10-15 13:12:52 +01:00
643b5fcdc8
Look for keys on the right objects
2015-10-15 13:10:30 +01:00
f38df51e8d
Merge branch 'develop' into daniel/3pidinvites
2015-10-15 11:51:55 +01:00
1a934e8bfd
synapse.client.v1.login.LoginFallbackRestServlet and synapse.client.v1.login.PasswordResetRestServlet are unused
2015-10-15 11:09:57 +01:00
5338220d3a
synapse.util.emailutils was unused
2015-10-15 10:39:33 +01:00
a059760954
Merge pull request #305 from matrix-org/markjh/v2_sync_api
...
Update the v2 sync API to work as specified in the current spec.
2015-10-14 13:56:23 +01:00
c185c1c413
Fix v2 sync polling
2015-10-14 13:16:53 +01:00
f50c43464c
Merge branch 'develop' into markjh/v2_sync_api
2015-10-14 11:40:45 +01:00
f45aaf0e35
Remove unused constatns
2015-10-14 10:36:55 +01:00
8c9df8774e
Make 'keys' optional
2015-10-14 10:35:50 +01:00
99c7fbfef7
Fix to work with SQLite
2015-10-14 09:52:40 +01:00
1d9e109820
More TODO markers
2015-10-14 09:49:00 +01:00
d25b0f65ea
Add TODO markers
2015-10-14 09:46:31 +01:00
858634e1d0
Remove unused room_id arg
2015-10-14 09:31:20 +01:00
474274583f
Merge pull request #303 from matrix-org/markjh/twisted_debugging
...
Bounce all deferreds through the reactor to make debugging easier.
2015-10-13 18:40:57 +01:00
d82c5f7b5c
Use more descriptive error code
2015-10-13 18:02:00 +01:00
0c38e8637f
Remove unnecessary class-wrapping
2015-10-13 18:00:38 +01:00
9020860479
Only turn on the twisted deferred debugging if full_twisted_stacktraces is set in the config
2015-10-13 17:50:44 +01:00
14edea1aff
Move logic into handler
2015-10-13 17:47:58 +01:00
b68db61222
Add logging
2015-10-13 17:22:50 +01:00
bb407cd624
Re-add accidentally removed code
2015-10-13 17:19:26 +01:00
32d66738b0
Fix pep8 warnings.
2015-10-13 17:18:29 +01:00
95e53ac535
Add some docstring
2015-10-13 17:18:24 +01:00
7639c3d9e5
Bounce all deferreds through the reactor to make debugging easier.
...
If all deferreds wait a reactor tick before resolving then there is
always a chance to add an errback to the deferred so that stacktraces
get reported, rather than being discarded.
2015-10-13 17:13:04 +01:00
7ecd11accb
Add paranoia limit
2015-10-13 15:50:56 +01:00
17dffef5ec
Move event contents into third_party_layout field
2015-10-13 15:48:12 +01:00
3e2a1297b5
Remove constraints in preperation of using filters
2015-10-13 15:22:14 +01:00
323d3e506d
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-10-13 14:34:01 +01:00
2fa9e23e04
Update the v2 filters to support filtering presence and remove support for public/private user data
2015-10-13 14:12:43 +01:00
cacf0688c6
Add a get_invites_for_user method to the storage to find out the rooms a user is invited to
2015-10-13 14:08:38 +01:00
88971fd034
Merge branch 'erikj/store_engine' into erikj/search
2015-10-13 14:03:30 +01:00
17c80c8a3d
rename schema_prepare to prepare_database
2015-10-13 13:56:22 +01:00
cfd39d6b55
Add SQLite support
2015-10-13 13:47:50 +01:00
32a453d7ba
Merge branch 'develop' into daniel/3pidinvites
2015-10-13 13:32:43 +01:00
f9340ea0d5
Merge branch 'erikj/store_engine' into erikj/search
2015-10-13 13:29:02 +01:00
ec398af41c
Expose error more nicely
2015-10-13 11:43:43 +01:00
54414221e4
Include invites in incremental sync
2015-10-13 11:43:12 +01:00
40b6a5aad1
Split out the schema preparation and update logic into its own module
2015-10-13 11:38:48 +01:00
ab9cf73258
Include invited rooms in the initial sync
2015-10-13 11:03:48 +01:00
30c2783d2f
Search left rooms too
2015-10-13 10:36:36 +01:00
1a40afa756
Add sqlite schema
2015-10-13 10:36:25 +01:00
f96b480670
Merge branch 'develop' into markjh/v2_sync_api
2015-10-13 10:33:00 +01:00
956509dfec
Start spliting out the rooms into joined and invited in v2 sync
2015-10-13 10:24:51 +01:00
586beb8318
Update the filters to match the latest spec.
...
Apply the filter the 'timeline' and 'ephemeral' keys of rooms.
Apply the filter to the 'presence' key of a sync response.
2015-10-12 16:54:58 +01:00
427943907f
Merge pull request #299 from stevenhammerton/sh-cas-required-attribute
...
SH CAS Required Attribute
2015-10-12 16:08:34 +01:00
739464fbc5
Add a comment to clarify why we split on closing curly brace when reading CAS attribute tags
2015-10-12 16:02:17 +01:00
ca53ad7425
Filter events to only thsoe that the user is allowed to see
2015-10-12 15:52:55 +01:00
f6fde343a1
Merge remote-tracking branch 'origin/develop' into erikj/search
2015-10-12 15:06:18 +01:00
927004e349
Remove unused room_id parameter
2015-10-12 15:06:14 +01:00
83b464e4f7
Unpack dictionary in for loop for nicer syntax
2015-10-12 15:05:34 +01:00
ab7f9bb861
Default cas_required_attributes to empty dictionary
2015-10-12 14:58:59 +01:00
54cb509d64
Merge pull request #296 from matrix-org/markjh/eventstream_presence
...
Split the sections of EventStreamHandler.get_stream that handle presence
2015-10-12 14:48:09 +01:00
885301486c
Merge pull request #297 from matrix-org/markjh/presence_races
...
Fix some races in the synapse presence handler caused by not yielding…
2015-10-12 14:47:53 +01:00
7f8fdc9814
Remove not required parenthesis
2015-10-12 14:45:24 +01:00
01a5f1991c
Support multiple required attributes in CAS response, and in a nicer config format too
2015-10-12 14:43:17 +01:00
76421c496d
Allow optional config params for a required attribute and it's value, if specified any CAS user must have the given attribute and the value must equal
2015-10-12 11:11:49 +01:00
7845f62c22
Parse both user and attributes from CAS response
2015-10-12 10:55:13 +01:00
ae72e247fa
PEP8
2015-10-12 10:50:46 +01:00
61561b9df7
Keep FTS indexes up to date. Only search through rooms currently joined
2015-10-12 10:49:53 +01:00
a80ef851f7
Fix previous merge to s/version_string/user_agent/
2015-10-10 12:35:39 +01:00
95f7661170
Raise LoginError if CasResponse doensn't contain user
2015-10-10 10:54:19 +01:00
a9c299c0be
Fix my broken line splitting
2015-10-10 10:54:19 +01:00
e52f4dc599
Use UserId to create FQ user id
2015-10-10 10:54:19 +01:00
625e13bfde
Add get_raw method to SimpleHttpClient, use this in CAS auth rather than requests
2015-10-10 10:54:19 +01:00
22112f8d14
Formatting changes
2015-10-10 10:49:42 +01:00
c33f5c1a24
Provide ability to login using CAS
2015-10-10 10:49:42 +01:00
1a46daf621
Merge branch 'markjh/presence_races' into markjh/v2_sync_api
2015-10-09 20:02:30 +01:00
987803781e
Fix some races in the synapse presence handler caused by not yielding on deferreds
2015-10-09 19:59:50 +01:00
0a96a9a023
Set the user as online if they start polling the v2 sync
2015-10-09 19:57:50 +01:00
af7b214476
Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api
2015-10-09 19:18:09 +01:00
1b9802a0d9
Split the sections of EventStreamHandler.get_stream that handle presence
...
into separate functions.
This makes the code a bit easier to read, and means that we can reuse
the logic when implementing the v2 sync API.
2015-10-09 19:13:08 +01:00
c15cf6ac06
Format the presence events correctly for v2
2015-10-09 18:50:15 +01:00
c85c912562
Add basic full text search impl.
2015-10-09 15:48:31 +01:00
ce19fc0f11
Merge pull request #294 from matrix-org/markjh/initial_sync_archived_flag
...
Add a flag to initial sync to include we want rooms that the user has left
2015-10-09 10:32:27 +01:00
51ef725647
Use 'true' rather than '1' for archived flag
2015-10-08 18:13:02 +01:00
dc72021748
Add a flag to initial sync to indicate we want rooms that the user has left
2015-10-08 17:26:23 +01:00
dfef2b41aa
Update the v2 room sync format to match the current v2 spec
2015-10-08 15:17:43 +01:00
91482cd6a0
Use raw string for regex here, otherwise \b is the backspace character. Fixes displayname matching.
2015-10-08 11:22:15 +01:00
e3d3205cd9
Update the sync response to match the latest spec
2015-10-07 15:55:20 +01:00
7c809abe86
Merge branch 'develop' into daniel/3pidinvites
2015-10-06 10:24:32 -05:00
db6e1e1fe3
Merge pull request #292 from matrix-org/daniel/useragent
...
Allow synapse's useragent to be customized
2015-10-06 10:23:21 -05:00
61ee72517c
Remove merge thinko
2015-10-06 10:16:15 -05:00
1cacc71050
Add third party invites to auth_events for joins
2015-10-06 10:13:28 -05:00
fcd9ba8802
Fix lint errors
2015-10-06 10:13:05 -05:00
93cc60e805
Remove log line that was generated whenever an error was created. We are now creating error objects that aren't raised so it's probably a bit too confusing to keep
2015-10-06 16:10:19 +01:00
d4bb28c59b
Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation""
...
This reverts commit 34d26d3687
2015-10-06 09:58:21 -05:00
ca6496c27c
Merge branch 'daniel/useragent' into daniel/3pidinvites
2015-10-06 09:55:21 -05:00
492beb62a8
Use space not dash as delimiter
2015-10-06 09:53:33 -05:00
e0b466bcfd
Use space not dash as delimiter
2015-10-06 09:32:26 -05:00
287c81abf3
Merge branch 'develop' into daniel/useragent
2015-10-06 09:30:17 -05:00
c05b5ef7b0
Merge branch 'develop' into daniel/3pidinvites
2015-10-06 08:10:34 -05:00
ddd079c8f8
Merge branch 'daniel/useragent' into daniel/3pidinvites
2015-10-05 20:52:15 -05:00
b28c7da0a4
Preserve version string in user agent
2015-10-05 20:49:39 -05:00
34d26d3687
Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"
...
This reverts commit 5879edbb09b43930d4c9
2015-10-05 19:10:47 -05:00
471555b3a8
Move the rooms out into a room_map mapping from room_id to room.
2015-10-05 16:39:36 +01:00
58e6a58eb7
Merge branch 'develop' into daniel/3pidinvites
2015-10-05 10:33:41 -05:00
8fc52bc56a
Allow synapse's useragent to be customized
...
This will allow me to write tests which verify which server made HTTP
requests in a federation context.
2015-10-02 17:13:51 -05:00
49ebd472fa
Explicitly add Create event as auth event
2015-10-02 13:22:36 +01:00
40017a9a11
Add 'trusted_private_chat' to room creation presets
2015-10-02 11:22:56 +01:00
a086b7aa00
Merge pull request #275 from matrix-org/erikj/invite_state
...
Bundle in some room state in invites.
2015-10-02 11:15:43 +01:00
9c311dfce5
Also bundle in sender
2015-10-02 11:04:23 +01:00
d5e081c7ae
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
2015-10-02 10:33:49 +01:00
5879edbb09
Merge pull request #283 from matrix-org/erikj/atomic_join_federation
...
Atomically persist events when joining a room over federation/
2015-10-02 09:18:44 +01:00
f31014b18f
Start updating the sync API to match the specification
2015-10-01 17:53:07 +01:00
5b3e9713dd
Implement third party identifier invites
2015-10-01 17:49:52 +01:00
bad780a197
Validate the receipt type before passing it on to the receipt handler
2015-10-01 14:01:52 +01:00
0a4b7226fc
Don't change cwd in synctl
2015-10-01 09:21:36 +01:00
0ec78b360c
Merge pull request #287 from matrix-org/erikj/canonical_alias
...
Set m.room.canonical_alias on room creation.
2015-09-30 17:14:55 +01:00
ecd0c0dfc5
Remove double indentation
2015-09-30 16:46:24 +01:00
83892d0d30
Comment
2015-09-30 16:41:48 +01:00
9d39615b7d
Rename var
2015-09-30 16:37:59 +01:00
301141515a
Merge pull request #288 from matrix-org/markjh/unused_definitions
...
Remove some of the unused definitions from synapse
2015-09-28 14:22:44 +01:00
a14665bde7
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state
2015-09-25 11:38:28 +01:00
f87a11e0fd
Fix restart
2015-09-24 21:59:38 +00:00
76328b85f6
Allow config file path to be configurable in in synctl
...
Also, allow it to be run from directories other than the synapse directory
2015-09-24 21:50:20 +00:00
17795161c3
Merge pull request #289 from matrix-org/markjh/fix_sql
...
Fix order of ON constraints in _get_rooms_for_user_where_membership
2015-09-24 17:39:47 +01:00
cf1100887b
Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txn
2015-09-24 17:35:10 +01:00
1cd65a8d1e
synapse/storage/state.py: _make_group_id was unused
2015-09-23 10:37:58 +01:00
973ebb66ba
Remove unused functions from synapse/storage/signatures.py
2015-09-23 10:36:33 +01:00
e51aa4be96
synapse/storage/roommember.py:_get_members_query was unused
2015-09-23 10:35:10 +01:00
92d8d724c5
Remove unused functions from synapse/storage/events.py
2015-09-23 10:33:06 +01:00
c292dba70c
Remove unused functions from synapse/storage/event_federation.py
2015-09-23 10:31:25 +01:00
396834f1c0
synapse/storage/_base.py:_simple_max_id was unused
2015-09-23 10:30:38 +01:00
1d9036aff2
synapse/storage/_base.py:_simple_delete was unused
2015-09-23 10:30:25 +01:00
1ee3d26432
synapse/storage/_base.py:_simple_selectupdate_one was unused
2015-09-23 10:30:03 +01:00
82b8d4b86a
synapse/state.py:_get_state_key_from_event was unused
2015-09-23 10:27:47 +01:00
57338a9768
synapse/handlers/room.py:_should_invite_join was unused
2015-09-23 10:26:45 +01:00
60728c8c9e
synapse/handlers/federation.py:_handle_auth_events was unused
2015-09-23 10:25:26 +01:00
257fa1c53e
Set m.room.canonical_alias on room creation.
2015-09-23 10:07:31 +01:00
d2fc591619
Merge pull request #282 from matrix-org/erikj/missing_keys
...
Fix bug where we sometimes didn't fetch all the keys requested for a server.
2015-09-23 09:22:01 +01:00
dc6094b908
Merge pull request #271 from matrix-org/erikj/default_history
...
Change default history visibility for private rooms
2015-09-23 09:21:00 +01:00
3559a835a2
synapse/storage/event_federation.py:_get_auth_events is unused
2015-09-22 18:39:46 +01:00
7dd4f79c49
synapse/storage/_base.py:_execute_and_decode was unused
2015-09-22 18:37:07 +01:00
bb4dddd6c4
Move NullSource out of synapse and into tests since it is only used by the tests
2015-09-22 18:33:34 +01:00
7a5818ed81
Note that GzipFile was removed in comment that referenced it
2015-09-22 18:27:22 +01:00
184ba0968a
synapse/app/homeserver.py:GzipFile was unused
2015-09-22 18:25:30 +01:00
a247729806
synapse/streams/events.py:StreamSource was unused
2015-09-22 18:19:49 +01:00
f2fcc0a8cf
synapse/api/errors.py:RoomError was unused
2015-09-22 18:18:45 +01:00
372ac60375
synapse/util/__init__.py:unwrap_deferred was unused
2015-09-22 18:16:07 +01:00
527d95dea0
synapse/storage/_base.py:Table was unused
2015-09-22 18:14:15 +01:00
ca2abf9a6e
Merge pull request #286 from matrix-org/markjh/stream_config_repr
...
Define __repr__ methods for StreamConfig and PaginationConfig
2015-09-22 15:19:53 +01:00
b35baf6f3c
Define __repr__ methods for StreamConfig and PaginationConfig
...
So that they can be used with "%r" log formats.
2015-09-22 15:13:10 +01:00
6d59ffe1ce
Add some docstrings
2015-09-22 13:47:40 +01:00
b6e0303c83
Catch stats-reporting errors
2015-09-22 13:34:29 +01:00
eb011cd99b
Add docstring
2015-09-22 13:29:36 +01:00
6d7f291b93
Front-load spaces
2015-09-22 13:13:07 +01:00
7213588083
Implement configurable stats reporting
...
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.
2015-09-22 12:57:40 +01:00
ee2d722f0f
Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_been_left
...
SPEC-216: Allow users to view the history of rooms that they have left.
2015-09-21 14:38:13 +01:00
49c0a0b5c4
Clarify that room_initial_sync returns a python dict
2015-09-21 14:21:03 +01:00
95c304e3f9
Fix doc string to point at the right class
2015-09-21 14:18:47 +01:00
0c16285989
Add explicit "elif event.membership == Membership.LEAVE" for clarity
2015-09-21 14:17:16 +01:00
1e101ed4a4
Clamp the "to" token for /rooms/{roomId}/messages to when the user left
...
the room.
There isn't a way for the client to learn a valid "to" token for a room
that they have left in the C-S API but that doesn't stop a client making
one up.
2015-09-21 14:13:10 +01:00
8e3bbc9bd0
Clarify which event is returned by check_user_was_in_room
2015-09-21 13:47:44 +01:00
0b5c9adeb5
Merge pull request #267 from matrix-org/markjh/missing_requirements
...
Print an example "pip install" line for a missing requirement
2015-09-18 18:52:08 +01:00
b105996fc1
Remove run_on_reactor
2015-09-17 10:28:36 +01:00
c34ffd2736
Fix getting an event for a room the server forgot it was in
2015-09-17 10:26:03 +01:00
54e688277a
Also persist state
2015-09-17 10:26:03 +01:00
3a01901d6c
Capture err
2015-09-17 10:26:03 +01:00
744e7d2790
Also handle state
2015-09-17 10:26:03 +01:00
a3e332af19
Don't bail out of joining if we encounter a rejected event
2015-09-17 10:26:03 +01:00
4678055173
Refactor do_invite_join
2015-09-17 10:24:51 +01:00
ffe8cf7e59
Fix bug where we sometimes didn't fetch all the keys requested for a
...
server.
2015-09-17 10:21:32 +01:00
eb700cdc38
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-09-16 11:05:34 +01:00
663b96ae96
Merge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2
2015-09-16 09:54:42 +01:00
2048388cfd
Merge pull request #281 from matrix-org/erikj/update_extremeties
...
When updating a stored event from outlier to non-outlier, remember to update the extremeties
2015-09-15 16:57:25 +01:00
8148c48f11
"Comments"
2015-09-15 16:54:48 +01:00
2c8f16257a
Merge pull request #272 from matrix-org/daniel/insecureclient
...
Allow configuration to ignore invalid SSL certs
2015-09-15 16:52:38 +01:00
1107e83b54
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-09-15 16:35:34 +01:00
3b05b67c89
When updating a stored event from outlier to non-outlier, remember to update the extremeties
2015-09-15 16:34:42 +01:00
d4af08a167
Use shorter config key name
2015-09-15 15:50:13 +01:00
3bcbabc9fb
Rename context factory
...
Mjark is officially no fun.
2015-09-15 15:46:22 +01:00
9fc0aad567
Merge branch 'master' into daniel/insecureclient
2015-09-15 15:42:44 +01:00
9cd5b9a802
Hacky attempt at catching SIGHUP and rotating the logfile around
2015-09-14 19:03:53 +01:00
728d07c8c1
Merge pull request #256 from matrix-org/auth
...
Attempt to validate macaroons
2015-09-14 18:09:33 +01:00
d59acb8c5b
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
2015-09-14 18:05:31 +01:00
91cb3b630d
Merge pull request #265 from matrix-org/erikj/check_room_exists
...
Check room exists when authenticating an event
2015-09-14 17:56:18 +01:00
dffc9c4ae0
Drop unused index
2015-09-14 14:41:37 +01:00
e2054ce21a
Allow users to GET individual state events for rooms that they have left
2015-09-10 15:06:47 +01:00
49ae42bbe1
Bundle in some room state in the unsigned bit of the invite when sending to invited servers
2015-09-10 14:25:54 +01:00
ca32c7a065
Fix adding threepids to an existing account
2015-09-10 10:44:56 +01:00
184a5c81f0
Merge pull request #274 from matrix-org/add_threepid_fix
...
Fix adding threepids to an existing account
2015-09-10 10:36:58 +01:00
30768dcf40
Fix adding threepids to an existing account
2015-09-10 10:33:48 +01:00
4ae73d16a9
Merge pull request #270 from matrix-org/markjh/fix_metrics
...
Fix the size reported by maxrss.
2015-09-10 10:32:10 +01:00
3f60481655
Bump version and change log
2015-09-10 09:58:32 +01:00
e1eb1f3fb9
Various bug fixes to crypto.keyring
2015-09-10 09:48:12 +01:00
09cb5c7d33
Allow users that have left a room to get the messages that happend in the room before they left
2015-09-09 17:31:09 +01:00
dd0867f5ba
Various bug fixes to crypto.keyring
2015-09-09 17:02:39 +01:00
3c166a24c5
Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API
2015-09-09 16:05:09 +01:00
bc8b25eb56
Allow users that have left the room to view the member list from the point they left
2015-09-09 15:42:16 +01:00
2c746382e0
Merge branch 'daniel/insecureclient' into develop
2015-09-09 14:27:30 +01:00
1d579df664
Allow rooms/{roomId}/state for a room that has been left
2015-09-09 14:12:24 +01:00
ddfe30ba83
Better document the intent of the insecure SSL setting
2015-09-09 13:26:23 +01:00
89ae0166de
Allow room initialSync for users that have left the room, returning a snapshot of how the room was when they left it
2015-09-09 13:25:22 +01:00
6485f03d91
Fix random formatting
2015-09-09 13:05:00 +01:00
81a93ddcc8
Allow configuration to ignore invalid SSL certs
...
This will be useful for sytest, and sytest only, hence the aggressive
config key name.
2015-09-09 12:02:07 +01:00
e530208e68
Change default history visibility for private rooms
2015-09-09 09:57:49 +01:00
dd42bb78d0
Include rooms that a user has left in an initialSync. Include the state and messages at the point they left the room
2015-09-08 18:16:09 +01:00
417485eefa
Include the event_id and stream_ordering of membership events when looking up which rooms a user is in
2015-09-08 18:14:54 +01:00
2ff439cff7
Bump version/changelog
2015-09-08 11:01:48 +01:00
709ba99afd
Check that /proc/self/fd exists before listing it
2015-09-07 16:45:55 +01:00
9e4dacd5e7
The maxrss reported by getrusage is in kilobytes, not pages
2015-09-07 16:45:48 +01:00
73e4ad4b8b
Merge branch 'master' into develop
...
Conflicts:
setup.py
2015-09-07 15:06:46 +01:00
1002bbd732
Change log level to info
2015-09-03 09:51:01 +01:00
9ad38c9807
Bump version and changelog
2015-09-03 09:49:54 +01:00
fd0a919af3
Lists use 'append'
2015-09-02 17:27:59 +01:00
e90f32646f
Bump version and changelog
2015-09-02 17:17:40 +01:00
77580addc3
Merge pull request #262 from matrix-org/redactyoself
...
Allow users to redact their own events
2015-09-02 10:02:36 +01:00
8bab7abddd
Add nacl.bindings to the list of modules checked. Re-arrange import order to check packages after the packages they depend on
2015-09-01 16:51:10 +01:00
3cdfd37d95
Print an example "pip install" line for a missing requirement
2015-09-01 16:47:26 +01:00
9b05ef6f39
Also check the domains for membership state_keys
2015-09-01 16:17:25 +01:00
187320b019
Merge branch 'erikj/check_room_exists' into erikj/unfederatable
2015-09-01 15:58:10 +01:00
b345853918
Check against sender rather than event_id
2015-09-01 15:57:35 +01:00
a88e16152f
Add flag which disables federation of the room
2015-09-01 15:47:30 +01:00
00149c063b
Fix tests
2015-09-01 15:42:03 +01:00
ab9e01809d
Check room exists when authenticating an event, by asserting they reference a creation event
2015-09-01 15:21:24 +01:00
57df6fffa7
Use the version of "matrix-angular-sdk" hosted on pypi
2015-09-01 14:47:57 +01:00
b62c1395d6
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
2015-09-01 13:11:55 +01:00
e255c2c32f
s/user_id/user/g for consistency
2015-09-01 12:41:16 +01:00
9c8eb4a809
Merge pull request #261 from matrix-org/erikj/scripts_clean
...
Clean up scripts/
2015-09-01 11:55:26 +01:00
b854a375b0
Check domain of events properly
...
Federated servers still need to delegate authority to owning servers
2015-09-01 11:53:31 +01:00
cd800ad99a
Lower size of 'stateGroupCache' now that we have data from matrix.org to support doing so
2015-09-01 10:09:03 +01:00
d71af2ee12
don't log the whole DB config (including postgres password...)
2015-08-29 22:23:21 +01:00
b143641b20
Merge pull request #258 from matrix-org/slowtestsmakemesad
...
Swap out bcrypt for md5 in tests
2015-08-28 15:42:25 +01:00
4d1ea40008
Merge branch 'develop' into redactyoself
...
Conflicts:
synapse/handlers/_base.py
2015-08-28 15:35:39 +01:00
8256a8ece7
Allow users to redact their own events
2015-08-28 15:31:49 +01:00
a7122692d9
Merge branch 'release-v0.10.0' into develop
...
Conflicts:
synapse/handlers/auth.py
synapse/python_dependencies.py
synapse/rest/client/v1/login.py
2015-08-28 11:15:27 +01:00
b442217d91
Actually add config path
2015-08-28 10:37:17 +01:00
5371c2a1f7
Bump version and changelog
2015-08-27 11:21:11 +01:00
ddf4d2bd98
Consistency
2015-08-27 10:50:49 +01:00
66ec6cf9b8
Check for an internationalised filename first
2015-08-27 10:48:58 +01:00
53c2eed862
None check the correct variable
2015-08-27 10:38:22 +01:00
f02532baad
Check for None
2015-08-27 10:37:02 +01:00
25b32b63ae
Bump changelog and version
2015-08-27 10:09:32 +01:00
c9cb354b58
Give a sensible error message if the filename is invalid UTF-8
2015-08-26 17:27:23 +01:00
5a9e0c3682
Handle unicode filenames given when downloading or received over federation
2015-08-26 17:08:47 +01:00
e85c7873dc
Allow non-ascii filenames for attachments
2015-08-26 16:26:37 +01:00
86fac9c95e
Remove unused import
2015-08-26 16:03:17 +01:00
3063383547
Swap out bcrypt for md5 in tests
...
This reduces our ~8 second sequential test time down to ~7 seconds
2015-08-26 15:59:32 +01:00
37f0ddca5f
Merge branch 'mergeeriksmadness' into auth
2015-08-26 13:45:06 +01:00
d3c0e48859
Merge erikj/user_dedup to develop
2015-08-26 13:42:45 +01:00
6a4b650d8a
Attempt to validate macaroons
...
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.
2015-08-26 13:22:23 +01:00
da51acf0e7
Remove needless existence checks
2015-08-26 11:08:23 +01:00
f4d552589e
Don't loop over all rooms ever in typing.get_new_events_for_user
2015-08-26 10:51:08 +01:00
90fde4b8d7
Bump changelog and version
2015-08-25 17:49:58 +01:00
0de2aad061
Merge pull request #250 from matrix-org/erikj/generated_directory
...
Add config option to specify where generated files should be dumped
2015-08-25 17:40:19 +01:00
3f6f74686a
Update config doc
2015-08-25 17:37:21 +01:00
82145912c3
s/--generated-directory/--keys-directory/
2015-08-25 17:31:22 +01:00
a2355fae7e
Merge pull request #251 from matrix-org/removeadmin
...
Stop looking up "admin", which we never read
2015-08-25 17:23:05 +01:00
ee3fa1a99c
Merge pull request #248 from matrix-org/deviceid
...
Remove completely unused concepts from codebase
2015-08-25 17:19:06 +01:00
3e1029fe80
Warn if we encounter unexpected files in config directories
2015-08-25 17:08:23 +01:00
af7c1397d1
Add config option to specify where generated files should be dumped
2015-08-25 16:58:01 +01:00
460cad7c11
Merge branch 'deviceid' into removeadmin
2015-08-25 16:37:59 +01:00
825f0875bc
Fix up one more reference
2015-08-25 16:37:37 +01:00
a9d8bd95e7
Stop looking up "admin", which we never read
2015-08-25 16:29:39 +01:00
bfb66773a4
Allow specifying directories as config files
2015-08-25 16:25:54 +01:00
57619d6058
Re-wrap line
2015-08-25 16:25:46 +01:00
a0b181bd17
Remove completely unused concepts from codebase
...
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.
2015-08-25 16:23:06 +01:00
747535f20f
Merge pull request #245 from matrix-org/erikj/configurable_client_location
...
Allow specifying a directory to host a web client from
2015-08-25 15:50:25 +01:00
1d1c303b9b
Fix typo when using sys.stderr.write
2015-08-25 15:39:16 +01:00
d33f31d741
Print the correct pip install line when failing due to lack of matrix-angular-sdk
2015-08-25 15:33:23 +01:00
f63208a1c0
Add utility to parse config and print out a key
...
Usage:
```
$ python -m synapse.config read server_name -c homeserver.yaml
localhost
```
2015-08-25 15:16:31 +01:00
37403ab06c
Update the log message
2015-08-25 14:19:09 +01:00
8b52fe48b5
Revert previous commit. Instead, always download matrix-angular-sdk as a requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse.
2015-08-25 14:10:31 +01:00
d9088c923f
Remove dependency on matrix-angular-sdk
2015-08-25 13:34:50 +01:00
86cef6a91b
Allow specifying a directory to host a web client from
2015-08-25 12:01:23 +01:00
1c847af28a
Merge pull request #243 from matrix-org/markjh/remove_syutil
...
Replace syutil dependency with smaller, single-purpose libraries
2015-08-25 10:52:16 +01:00
cf8c04948f
Fix typo in module imports and package dependencies
2015-08-25 10:42:59 +01:00
037481a033
Remove autoincrement since we incrementing the ID in the storage layer
2015-08-24 17:48:57 +01:00
01fc3943f1
Fix indent
2015-08-24 17:18:58 +01:00
571ac105e6
Bump version and changelog
2015-08-24 17:10:45 +01:00
51c53369a3
Do auth checks *before* persisting the event
2015-08-24 16:38:20 +01:00
f8f3d72e2b
Don't make pushers handle presence/typing events
2015-08-24 16:19:43 +01:00
78323ccdb3
Remove syutil dependency in favour of smaller single-purpose libraries
2015-08-24 16:17:38 +01:00
457970c724
Don't insert events into 'event_*_extremeties' tables if they're outliers
2015-08-23 13:44:23 +01:00
1bd1a43073
Actually check if event_id isn't returned by _get_state_groups
2015-08-21 14:30:34 +01:00
fd5ad0f00e
Doc string
2015-08-21 11:45:43 +01:00
745b72660a
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
2015-08-21 11:39:38 +01:00
42f12ad92f
When logging in fetch user by user_id case insensitively, *unless* there are multiple case insensitive matches, in which case require the exact user_id
2015-08-21 11:38:44 +01:00
aa3c9c7bd0
Don't allow people to register user ids which only differ by case to an existing one
2015-08-21 10:57:47 +01:00
1f7642efa9
Fix bug where we didn't correctly serialize the redacted_because key over federation
2015-08-21 09:36:07 +01:00
3e9ee62db0
Add missing param in store.get_state_groups invocation
2015-08-21 09:15:13 +01:00
21b71b6d7c
Return fully qualified user_id as per spec
2015-08-20 21:54:53 +01:00
c7788685b0
Fix bad merge
2015-08-20 17:43:12 +01:00
8c74bd8960
Fix indentation
2015-08-20 17:26:52 +01:00
ea570ffaeb
Fix flake8 warnings
2015-08-20 17:22:41 +01:00
d5a825edee
Merge branch 'auth' into refresh
...
Conflicts:
synapse/handlers/register.py
2015-08-20 17:13:33 +01:00
225c244aba
Remove incorrect whitespace
2015-08-20 17:10:10 +01:00
4e706ec82c
Merge branch 'develop' into auth
2015-08-20 16:59:41 +01:00
f90ea3dc73
Correct pynacl version to 0.3.0
...
0.0.3 was a typo
2015-08-20 16:42:17 +01:00
ce2a7ed6e4
Merge branch 'develop' into auth
2015-08-20 16:28:36 +01:00
e8cf77fa49
Merge branch 'develop' into refresh
...
Conflicts:
synapse/rest/client/v1/login.py
2015-08-20 16:25:40 +01:00
cecbd636e9
/tokenrefresh POST endpoint
...
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.
2015-08-20 16:21:35 +01:00
3befc9ccc3
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
2015-08-20 16:09:27 +01:00
c141d47a28
Merge pull request #235 from matrix-org/erikj/room_avatars
...
Add m.room.avatar to default power levels.
2015-08-20 16:07:49 +01:00
13a6517d89
s/by_token/by_access_token/g
...
We're about to have two kinds of token, access and refresh
2015-08-20 16:01:29 +01:00
f764f92647
Remove spurious extra arg to set_password
2015-08-20 15:35:54 +01:00
ca0d28ef34
Another use of check_password that got missed in the yield fix
2015-08-20 15:35:14 +01:00
9b63def388
Add m.room.avatar to default power levels. Change default required power levels of such events to 50
2015-08-20 14:35:40 +01:00
9d720223f2
Bump version and changelog
2015-08-20 14:12:01 +01:00
617501dd2a
Move token generation to auth handler
...
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.
2015-08-20 11:35:56 +01:00
099ce4bc38
Merge pull request #231 from matrix-org/erikj/pushers_store_last_token
...
Push: store the 'last_token' in the db, even if we processed no events
2015-08-20 11:27:31 +01:00
22346a0ee7
Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails
...
Always return a thumbnail of the requested size.
2015-08-20 11:27:15 +01:00
cbd053bb8f
Merge pull request #233 from matrix-org/erikj/canonical_alias
...
Add server side support for canonical aliases
2015-08-20 11:26:09 +01:00
ade5342752
Merge branch 'auth' into refresh
2015-08-20 11:03:47 +01:00
4cf302de5b
Comma comma comma comma comma chameleon
2015-08-20 10:31:18 +01:00
c50ad14bae
Merge branch 'develop' into email_login
2015-08-20 10:16:01 +01:00
a0b8e5f2fe
Merge pull request #211 from matrix-org/email_in_use
...
Changes for unique emails
2015-08-20 10:04:04 +01:00
aadb2238c9
Check that the canonical room alias actually points to the room
2015-08-20 09:55:04 +01:00
f9e7493ac2
Merge branch 'develop' into auth
2015-08-19 15:20:09 +01:00
70e265e695
Re-add whitespace around caveat operators
2015-08-19 14:30:31 +01:00
daa01842f8
Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
2015-08-19 13:46:03 +01:00
7f08ebb772
Switch to pymacaroons-pynacl
2015-08-19 13:21:36 +01:00
d7272f8d9d
Add canonical alias to the default power levels
2015-08-19 12:03:09 +01:00
78fa346b07
Store the 'last_token' in the db, even if we processed no events
2015-08-19 10:08:31 +01:00
a45ec7c651
Block on storing the current last_tokens
2015-08-19 10:08:12 +01:00
40da1f200d
Remove an access token log line
2015-08-19 09:41:07 +01:00
abc6986a24
Fix regression where we incorrectly responded with a 200 to /login
2015-08-19 09:31:11 +01:00
ce832c38d4
Remove padding space around caveat operators
2015-08-18 17:39:26 +01:00
e624cdec64
Merge pull request #228 from matrix-org/erikj/_get_state_for_groups
...
Ensure we never return a None event from _get_state_for_groups
2015-08-18 16:30:17 +01:00
c3dd2ecd5e
Merge pull request #230 from matrix-org/erikj/appservice_auth_entity
...
Set request.authenticated_entity for application services
2015-08-18 16:30:11 +01:00
38a965b816
Merge pull request #227 from matrix-org/erikj/receipts_take2
...
Re-enable receipts API.
2015-08-18 16:30:04 +01:00
a82938416d
Remove newline because vertical whitespace makes mjark sad
2015-08-18 16:28:13 +01:00
0bfdaf1f4f
Rejig the code to make it nicer
2015-08-18 16:26:07 +01:00
a5cbd20001
Merge pull request #225 from matrix-org/erikj/reactor_metrics
...
Fix pending_calls metric to not lie
2015-08-18 16:21:11 +01:00
128ed32e6b
Bump size of get_presence_state cache
2015-08-18 15:51:23 +01:00
3e6fdfda00
Fix some formatting to use tuples
2015-08-18 15:18:50 +01:00
ee59af9ac0
Set request.authenticated_entity for application services
2015-08-18 15:17:47 +01:00
1469141023
Merge branch 'develop' into auth
2015-08-18 14:43:44 +01:00
cacdb529ab
Remove accidentally added file
2015-08-18 14:27:23 +01:00
2d3462714e
Issue macaroons as opaque auth tokens
...
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
2015-08-18 14:22:02 +01:00
f704c10f29
Rename unhelpful variable name
2015-08-18 11:54:03 +01:00
6e7d36a72c
Also check for presence of 'threadCallQueue' in reactor
2015-08-18 11:51:08 +01:00
d3da63f766
Use more helpful variable names
2015-08-18 11:47:00 +01:00
8199475ce0
Ensure we never return a None event from _get_state_for_groups
2015-08-18 11:44:10 +01:00
0d4abf7777
Typo
2015-08-18 11:19:08 +01:00
e55291ce5e
None check
2015-08-18 11:17:37 +01:00
8e254862f4
Don't assume @cachedList function returns keys for everything
2015-08-18 11:11:33 +01:00
85d0bc3bdc
Reduce cache size from obscenely large to quite large
2015-08-18 11:00:38 +01:00
cfc503681f
Comments
2015-08-18 10:49:23 +01:00
dc2a105fca
Merge pull request #226 from matrix-org/erikj/room_presence
...
Add and use cached batched storage.get_state function.
2015-08-18 10:43:50 +01:00
83eb627b5a
More helpful variable names
2015-08-18 10:33:11 +01:00
776ee6d92b
Doc strings
2015-08-18 10:30:07 +01:00
f72ed6c6a3
Remove debug try/catch
2015-08-18 10:29:49 +01:00
8899df13bf
Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation
...
Federation for end-to-end key requests.
2015-08-18 09:12:54 +01:00
8f4165628b
Add index receipts_linearized_room_stream
2015-08-17 14:43:54 +01:00
d3d582bc1c
Remove unused import
2015-08-17 13:38:09 +01:00
4d8e1e1f9e
Remove added unused methods
2015-08-17 13:36:07 +01:00
afef6f5d16
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2
2015-08-17 13:23:44 +01:00
2d97e65558
Remember to invalidate caches
2015-08-17 10:46:55 +01:00
1a9510bb84
Implement a batched presence_handler.get_state and use it
2015-08-17 10:40:23 +01:00
47abebfd6d
Add batched version of store.get_presence_state
2015-08-17 09:50:50 +01:00
f9d4da7f45
Fix bug where we were leaking None into state event lists
2015-08-17 09:39:45 +01:00
30883d8409
Merge pull request #221 from matrix-org/auth
...
Simplify LoginHander and AuthHandler
2015-08-14 17:02:22 +01:00
891dfd90bd
Fix pending_calls metric to not lie
2015-08-14 15:43:11 +01:00
68b255c5a1
Batch _get_linearized_receipts_for_rooms
2015-08-14 15:06:22 +01:00
95b0f5449d
Fix flake8 warning
2015-08-13 17:34:22 +01:00
129ee4e149
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2
2015-08-13 17:28:43 +01:00
c5966b2a97
Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation
2015-08-13 17:27:53 +01:00
0cceb2ac92
Add a few strategic new lines to break up the on_query_client_keys and on_claim_client_keys methods in federation_server.py
2015-08-13 17:27:46 +01:00
b16cd18a86
Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails
2015-08-13 17:23:39 +01:00
9f7f228ec2
Remove pointless map
2015-08-13 17:20:59 +01:00
2bb2c02571
Remove some vertical space
2015-08-13 17:11:30 +01:00
3d1cdda762
Merge branch 'develop' into erikj/reactor_metrics
2015-08-13 17:03:58 +01:00
57877b01d7
Replace list comprehension
2015-08-13 17:00:17 +01:00
5db5677969
Add metrics to the receipts cache
2015-08-13 16:58:23 +01:00
7e77a82c5f
Re-enable receipts
2015-08-13 16:58:10 +01:00
06750140f6
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-13 11:55:20 +01:00
adbd720fab
PEP8
2015-08-13 11:47:38 +01:00
8b7ce2945b
Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache
2015-08-13 11:42:22 +01:00
a6c27de1aa
Don't time getDelayedCalls
2015-08-13 11:41:57 +01:00
c044aca1fd
Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache
2015-08-13 11:39:38 +01:00
ba5d34a832
Add some metrics about the reactor
2015-08-13 11:38:59 +01:00
21ac8be5f7
Depend on Twisted>=15.1 rather than pining to a particular version
2015-08-12 17:25:13 +01:00
0fbed2a8fa
Comment
2015-08-12 17:22:54 +01:00
998a72d4d9
Merge branch 'develop' into markjh/twisted-15
...
Conflicts:
synapse/http/matrixfederationclient.py
2015-08-12 17:21:14 +01:00
c10ac7806e
Explain why we're prefilling dict with Nones
2015-08-12 17:16:30 +01:00
101ee3fd00
Better variable name
2015-08-12 17:08:05 +01:00
df361d08f7
Split _get_state_for_group_from_cache into two
2015-08-12 17:06:21 +01:00
7b0e797080
Fix _filter_events_for_client
2015-08-12 17:05:24 +01:00
cfa62007a3
Docstring
2015-08-12 16:42:46 +01:00
5ce903e2f7
Merge password checking implementations
2015-08-12 16:09:19 +01:00
a7eeb34c64
Simplify staggered deferred lists
2015-08-12 16:02:05 +01:00
f7e2f981ea
Use list comprehension instead of filter
2015-08-12 16:01:10 +01:00
bcc1d34d35
Merge branch 'develop' into auth
2015-08-12 15:58:52 +01:00
415c2f0549
Simplify LoginHander and AuthHandler
...
* Merge LoginHandler -> AuthHandler
* Add a bunch of documentation
* Improve some naming
* Remove unused branches
I will start merging the actual logic of the two handlers shortly
2015-08-12 15:49:37 +01:00
f43041aacd
Check absent before trying to access keys
2015-08-12 15:44:08 +01:00
73605f8070
Just leaving off the $ is fine. r* == registerrrrrrrrr
2015-08-12 15:40:54 +01:00
de3b7b55d6
Doc-string for config ultility function
2015-08-12 14:29:17 +01:00
d46208c12c
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-12 14:28:43 +01:00
4f11a5b2b5
Merge pull request #220 from matrix-org/markjh/generate_keys
...
Fix the --generate-keys option.
2015-08-12 14:23:54 +01:00
7bbaab9432
Fix the --generate-keys option. Make it do the same thing as --generate-config does when the config file exists, but without printing a warning
2015-08-12 11:57:37 +01:00
fdb724cb70
Add config option for setting the list of thumbnail sizes to precalculate
2015-08-12 10:55:27 +01:00
7e3d1c7d92
Make a config option for whether to generate new thumbnail sizes dynamically
2015-08-12 10:54:38 +01:00
d7451e0f22
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-12 10:30:30 +01:00
4807616e16
Wire up the dictionarycache to the metrics
2015-08-12 10:13:35 +01:00
2df8dd9b37
Move all the caches into their own package, synapse.util.caches
2015-08-11 18:00:59 +01:00
45610305ea
Add missing space because linter
2015-08-11 16:43:27 +01:00
88e03da39f
Minor docs cleanup
2015-08-11 16:35:28 +01:00
9dba813234
Remove redundant if-guard
...
The startswith("@") does the job
2015-08-11 16:34:17 +01:00
53a817518b
Comments
2015-08-11 11:40:40 +01:00
6eaa116867
Comment
2015-08-11 11:35:24 +01:00
4762c276cb
Docs
2015-08-11 11:33:41 +01:00
dc8399ee00
Remove debug loggers
2015-08-11 11:30:59 +01:00
1b994a97dd
Fix application of ACLs
2015-08-11 10:41:40 +01:00
10b874067b
Fix state cache
2015-08-11 09:12:41 +01:00
017b798e4f
Clean up StateStore
2015-08-10 15:01:06 +01:00
2c019eea11
Remove unused function
2015-08-10 14:44:41 +01:00
bb0a475c30
Comments
2015-08-10 14:27:38 +01:00
dcefac3b06
Comments
2015-08-10 14:16:24 +01:00
559c51debc
Use TypeError instead of ValueError and give a nicer error mesasge
...
when someone calls Cache.invalidate with the wrong type.
2015-08-10 14:07:17 +01:00
7ce71f2ffc
Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-10 13:47:51 +01:00
8c3a62b5c7
Merge pull request #215 from matrix-org/erikj/cache_varargs_interface
...
Change Cache to not use *args in its interface
2015-08-10 13:47:45 +01:00
86eaaa885b
Rename keyargs to args in CacheDescriptor
2015-08-10 13:44:44 +01:00
e0b6e49466
Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-10 10:39:22 +01:00
2cd6cb9f65
Rename keyargs to args in Cache
2015-08-10 10:38:47 +01:00
aa88582e00
Do bounds check
2015-08-10 10:08:15 +01:00
5119e416e8
Line length
2015-08-10 10:05:30 +01:00
8f04b6fa7a
Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-07 19:30:25 +01:00
7dec0b2bee
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-07 19:28:39 +01:00
06218ab125
Merge pull request #212 from matrix-org/erikj/cache_deferreds
...
Make CacheDescriptor cache deferreds rather than the deferreds' values
2015-08-07 19:28:05 +01:00
2352974aab
Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface
2015-08-07 19:26:54 +01:00
9c5385b53a
s/observed/observer/
2015-08-07 19:26:38 +01:00
ffab798a38
Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface
2015-08-07 19:18:47 +01:00
62126c996c
Propogate stale cache errors to calling functions
2015-08-07 19:17:58 +01:00
3213ff630c
Remove unnecessary cache
2015-08-07 19:14:05 +01:00
20addfa358
Change Cache to not use *args in its interface
2015-08-07 18:32:47 +01:00
9eb5b23d3a
Batch up various DB requests for event -> state
2015-08-07 18:16:02 +01:00
0211890134
Implement a CacheListDescriptor
2015-08-07 18:14:49 +01:00
ffdb8c3828
Don't be too enthusiatic with defer.gatherResults
2015-08-07 18:13:48 +01:00
0db40d3e93
Don't complain about extra .pyc files we find while hunting for database schemas
2015-08-07 17:22:11 +01:00
e3c8e2c13c
Add a --generate-keys option
2015-08-07 16:42:27 +01:00
efe60d5e8c
Only print the pidfile path on startup if requested by a commandline flag
2015-08-07 16:36:42 +01:00
b2c7bd4b09
Cache get_recent_events_for_room
2015-08-07 14:42:34 +01:00
b3768ec10a
Remove unncessary cache
2015-08-07 13:41:05 +01:00
b8e386db59
Change Cache to not use *args in its interface
2015-08-07 11:52:21 +01:00
fe994e728f
Store absence of state in cache
2015-08-07 10:17:38 +01:00
1d08bf7c17
Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache
2015-08-06 14:03:15 +01:00
63b1eaf32c
Docs
2015-08-06 14:02:50 +01:00
b811c98574
Remove failed deferreds from cache
2015-08-06 14:01:27 +01:00
433314cc34
Re-implement DEBUG_CACHES flag
2015-08-06 14:01:05 +01:00
f596ff402e
Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache
2015-08-06 13:37:56 +01:00
2efb93af52
Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds
2015-08-06 13:35:28 +01:00
953dbd28a7
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_keyword_args
2015-08-06 13:35:03 +01:00
7eea3e356f
Make @cached cache deferreds rather than the deferreds' values
2015-08-06 13:33:34 +01:00
3e1b77efc2
Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-05 16:45:56 +01:00
b52b4a84ec
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
2015-08-05 15:41:20 +01:00
1e62a3d3a9
Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'
2015-08-05 15:40:40 +01:00
a89559d797
Use LRU cache by default
2015-08-05 15:39:47 +01:00
07507643cb
Use dictionary cache to do group -> state fetching
2015-08-05 15:11:42 +01:00
185ac7ee6c
Allow sign in using email address
2015-08-04 16:29:54 +01:00
a0dea6eaed
Remember to yield: not much point testing is a deferred is not None
2015-08-04 16:18:17 +01:00
c67ba143fa
Move DictionaryCache
2015-08-04 15:58:28 +01:00
e7768e77f5
Add basic dictionary cache
2015-08-04 15:56:56 +01:00
883aabe423
splt long line
2015-08-04 15:20:35 +01:00
e124128542
Bump schema version
2015-08-04 14:50:31 +01:00
c77048e12f
Add endpoint that proxies ID server request token and errors if the given email is in use on this Home Server.
2015-08-04 14:37:09 +01:00
2e35a733cc
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf
2015-08-04 13:00:52 +01:00
413a4c289b
Add comment
2015-08-04 11:08:07 +01:00
4d6cb8814e
Speed up event filtering (for ACL) logic
2015-08-04 09:32:23 +01:00
7148aaf5d0
Don't try & check the username if we don't have one (which we won't if it's been saved in the auth layer)
2015-08-03 17:03:27 +01:00
28d07a02e4
Add vector.im as trusted ID server
2015-08-03 15:31:21 +01:00
11b0a34074
Use the same reg paths as register v1 for ASes.
...
Namely this means using registration_handler.appservice_register.
2015-07-29 10:00:54 +01:00
a4d62ba36a
Fix v2_alpha registration. Add unit tests.
...
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.
2015-07-28 17:34:12 +01:00
39e21ea51c
Add support for using keyword arguments with cached functions
2015-07-27 13:57:29 +01:00
2da3b1e60b
Get the end-to-end key federation working
2015-07-24 18:26:46 +01:00
62c010283d
Add federation support for end-to-end key requests
2015-07-23 16:03:38 +01:00
459085184c
Factor out thumbnail()
2015-07-23 15:59:53 +01:00
2b4f47db9c
Generate local thumbnails on a thread
2015-07-23 14:52:29 +01:00
33d83f3615
Fix remote thumbnailing
2015-07-23 14:24:21 +01:00
ff7c2e41de
Always return a thumbnail of the requested size.
...
Before, we returned a thumbnail that was at least as big (if possible)
as the requested size. Now, if we don't have a thumbnail of the given
size we generate (and persist) one of that size.
2015-07-23 14:12:49 +01:00
103e1c2431
Pick larger than desired thumbnail for 'crop'
2015-07-23 11:12:49 +01:00
4e2e67fd50
Disable receipts for now
2015-07-22 16:13:46 +01:00
a56eccbbfc
Query for all the ones we were asked about, not just the last...
2015-07-21 16:38:16 -07:00
20c0324e9c
Dodesn't seem to make any difference: guess it does work with the object reference
2015-07-21 16:21:37 -07:00
cf7a40b08a
I think this was what was intended...
2015-07-21 16:08:00 -07:00
90dbd71c13
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-07-21 09:25:30 +01:00
3b5823c74d
s/take/claim/ for end to end key APIs
2015-07-20 18:23:54 +01:00
53d1174aa9
Improve naming
2015-07-20 06:32:12 -07:00
ddef5ea126
Remove semicolon.
2015-07-20 14:02:36 +01:00
b6ee0585bd
Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.
2015-07-20 13:55:19 +01:00
4f973eb657
Up default cache size for _RoomStreamChangeCache
2015-07-18 19:07:33 +01:00
4cab2cfa34
Don't do any database hits in receipt handling if from_key == to_key
2015-07-18 19:07:12 +01:00
b6d4a4c6d8
Merge pull request #199 from matrix-org/erikj/receipts
...
Implement read receipts.
2015-07-16 18:18:36 +01:00
d155b318d2
Merge pull request #203 from matrix-org/erikj/room_creation_presets
...
Implement presets at room creation
2015-07-16 18:18:11 +01:00
a2ed7f437c
Merge pull request #202 from matrix-org/erikj/power_level_sanity
...
Change power level semantics.
2015-07-16 18:18:04 +01:00
c456d17daf
Implement specifying custom initial state for /createRoom
2015-07-16 15:25:29 +01:00
09489499e7
pep8 + debug line
2015-07-15 19:39:18 +01:00
4da05fa0ae
Add back in support for remembering parameters submitted to a user-interactive auth call.
2015-07-15 19:28:57 +01:00
8cedf3ce95
bump up image quality a bit more as it looks crap
2015-07-14 23:53:13 +01:00
baa55fb69e
Merge pull request #193 from matrix-org/erikj/bulk_persist_event
...
Add bulk insert events API
2015-07-14 10:49:24 +01:00
002a44ac1a
s/everyone_ops/original_invitees_have_ops/
2015-07-14 10:37:42 +01:00
62b4b72fe4
Close, but no cigar.
2015-07-14 10:33:25 +01:00
b49a30a972
Capitalize contants
2015-07-14 10:20:31 +01:00
4624d6035e
Docs
2015-07-14 10:19:07 +01:00
d5cc794598
Implement presets at room creation
2015-07-13 16:56:08 +01:00
5989637f37
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
2015-07-13 13:50:57 +01:00
016c089f13
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity
2015-07-13 13:48:13 +01:00
e5991af629
Comments
2015-07-13 13:30:43 +01:00
17bb9a7eb9
Remove commented out code
2015-07-10 14:07:57 +01:00
a5ea22d468
Sanitize power level checks
2015-07-10 14:05:38 +01:00
7e3b14fe78
You shouldn't be able to ban/kick users with higher power levels
2015-07-10 14:05:38 +01:00
532fcc997a
Merge pull request #196 from matrix-org/erikj/room_history
...
Add ability to restrict room history.
2015-07-10 13:47:04 +01:00
0b3389bcd2
Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs
...
Implement bulk verify_signed_json API
2015-07-10 13:46:53 +01:00
0d7f0febf4
Uniquely name unique constraint
2015-07-10 13:43:03 +01:00
b7cb37b189
Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management
...
Client end to end key management API
2015-07-10 13:36:17 +01:00
a01097d60b
Assume that each device for a user has only one of each type of key
2015-07-10 13:26:18 +01:00
f3049d0b81
Small tweaks to SAML2 configuration.
...
- Add saml2 config docs to default config.
- Use existence of saml2 config to indicate if saml2 should be enabled.
2015-07-10 10:50:14 +01:00
9158ad1abb
Merge pull request #201 from EricssonResearch/msba/saml2-develop
...
Integrate SAML2 basic authentication - uses pysaml2
2015-07-10 10:25:56 +01:00
b5f0d73ea3
Add comment
2015-07-09 17:09:26 +01:00
ed88720952
Handle error slightly better
2015-07-09 16:14:46 +01:00
f0979afdb0
Remove spurious comment
2015-07-09 16:02:07 +01:00
bf0d59ed30
Don't bother with a timeout for one time keys on the server.
2015-07-09 14:04:03 +01:00
c2d08ca62a
Integer timestamps
2015-07-09 13:15:34 +01:00
4019b48aaa
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
2015-07-09 11:55:52 +01:00
294dbd712f
We don't want semicolons.
2015-07-09 11:47:24 +01:00
1af188209a
Change format of receipts to allow inclusion of data
2015-07-09 11:39:30 +01:00
8cd34dfe95
Make SAML2 optional and add some references/comments
2015-07-09 13:34:47 +05:30
d2caa5351a
code beautify
2015-07-09 12:58:15 +05:30
fb8d2862c1
remove the tls_certificate_chain_path param and simply support tls_certificate_path pointing to a file containing a chain of certificates
2015-07-09 00:45:41 +01:00
8ad2d2d1cb
document tls_certificate_chain_path more clearly
2015-07-09 00:06:01 +01:00
f26a3df1bf
oops, context.tls_certificate_chain_file() expects a file, not a certificate.
2015-07-08 21:33:02 +01:00
19fa3731ae
typo
2015-07-08 18:53:41 +01:00
465acb0c6a
*cough*
2015-07-08 18:30:59 +01:00
64afbe6ccd
add new optional config for tls_certificate_chain_path for folks with intermediary SSL certs
2015-07-08 18:20:02 +01:00
04192ee05b
typo
2015-07-08 17:49:15 +01:00
8fb79eeea4
Only remove one time keys when new one time keys are added
2015-07-08 17:04:29 +01:00
ce9e2f84ad
Add blist to dependencies
2015-07-08 15:41:59 +01:00
304343f4d7
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
2015-07-08 15:37:33 +01:00
af812b68dd
Add a cache to fetching of receipt streams
2015-07-08 15:35:00 +01:00
d85ce8d89b
Split receipt events up into one per room
2015-07-08 11:36:05 +01:00
f53bae0c19
code beautify
2015-07-08 16:05:46 +05:30
77c5db5977
code beautify
2015-07-08 16:05:20 +05:30
81682d0f82
Integrate SAML2 basic authentication - uses pysaml2
2015-07-08 15:36:54 +05:30
87311d1b8c
Hook up receipts to v1 initialSync
2015-07-08 11:02:04 +01:00
ca041d5526
Wire together receipts and the notifer/federation
2015-07-07 15:25:30 +01:00
716e426933
Fix various typos
2015-07-07 10:55:31 +01:00
e8b2f6f8a1
Add a ReceiptServlet
2015-07-07 10:55:22 +01:00
28ef344077
Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-management
2015-07-06 18:48:27 +01:00
2ef182ee93
Add client API for uploading and querying keys for end to end encryption
2015-07-06 18:47:57 +01:00
b5770f8947
Add store for client end to end keys
2015-07-06 18:46:47 +01:00
a7dcbfe430
Don't 500 if a group is missing from the regex
2015-07-06 16:47:17 +01:00
1a3255b507
Add m.room.history_visibility to newly created rooms' m.room.power_levels
2015-07-06 13:25:35 +01:00
fb47c3cfbe
Rename key and values for m.room.history_visibility. Support 'invited' value
2015-07-06 13:05:52 +01:00
65e69dec8b
Don't explode if we don't recognize one of the event_ids in the backfill request
2015-07-06 09:33:03 +01:00
c3e2600c67
Filter and redact events that the other server doesn't have permission to see during backfill
2015-07-03 17:52:57 +01:00
400894616d
Respect m.room.history_visibility in v2_alpha sync API
2015-07-03 14:51:01 +01:00
12b83f1a0d
If user supplies filename in URL when downloading from media repo, use that name in Content Disposition
2015-07-03 11:24:55 +01:00
00ab882ed6
Add m.room.history_visibility to list of auth events
2015-07-03 10:31:24 +01:00
41938afed8
Make v1 initial syncs respect room history ACL
2015-07-02 17:12:35 +01:00
1a60545626
Add basic impl for room history ACL on GET /messages client API
2015-07-02 16:20:10 +01:00
ac78e60de6
Add stream_id index
2015-07-02 13:18:41 +01:00
bd1236c0ee
Consolidate duplicate code in notifier
2015-07-02 11:46:05 +01:00
ddf7979531
Add receipts_key to StreamToken
2015-07-02 11:45:44 +01:00
0862fed2a8
Add basic ReceiptHandler
2015-07-01 17:19:31 +01:00
80a61330ee
Add basic storage functions for handling of receipts
2015-07-01 17:19:12 +01:00
480d720388
Bump changelog and version to v0.9.3
2015-07-01 15:12:32 +01:00
901f56fa63
Add tables for receipts
2015-06-30 15:29:47 +01:00
9beaedd164
Enforce ascii filenames for uploads
2015-06-30 10:31:59 +01:00
2124f668db
Add Content-Disposition headers to media repo v1 downloads
2015-06-30 09:35:44 +01:00
f0dd568e16
Wait for previous attempts at fetching keys for a given server before trying to fetch more
2015-06-26 11:25:00 +01:00
b5f55a1d85
Implement bulk verify_signed_json API
2015-06-26 10:39:34 +01:00
5130d80d79
Add bulk insert events API
2015-06-25 17:29:34 +01:00
6825eef955
Oops: underride rule had an identifier with override in it.
2015-06-23 14:26:14 +01:00
6924852592
Batch SELECTs in _get_auth_chain_ids_txn
2015-06-23 11:01:04 +01:00
9c72011fd7
Bumb version
2015-06-23 10:12:19 +01:00
2f556e0c55
Fix typo
2015-06-19 16:22:53 +01:00
7fa1363fb0
Merge pull request #192 from matrix-org/erikj/fix_log_context
...
Fix log context when sending requests
2015-06-19 16:21:40 +01:00
275dab6b55
Merge pull request #190 from matrix-org/erikj/syn-412
...
Fix notifier leak
2015-06-19 11:49:58 +01:00
a68abc79fd
Add comment on cancellation of observers
2015-06-19 11:48:55 +01:00
653533a3da
Fix log context when sending requests
2015-06-19 11:46:49 +01:00
9bf61ef97b
Merge pull request #189 from matrix-org/erikj/room_init_sync
...
Improve room init sync speed.
2015-06-19 11:36:06 +01:00
0e58d19163
Merge pull request #187 from matrix-org/erikj/sanitize_logging
...
Sanitize logging
2015-06-19 11:35:59 +01:00
18968efa0a
Remove stale debug lines
2015-06-19 10:18:02 +01:00
eb928c9f52
Add site_tag to logger
2015-06-19 10:16:48 +01:00
9d112f4440
Add IDs to outbound transactions
2015-06-19 10:13:03 +01:00
9e5a353663
Make upload dir a configurable path.
...
Fixes SYN-425.
Signed-off-by: Eric Myhre <hash@exultant.us>
2015-06-18 23:38:20 -05:00
6f6ebd216d
PEP8
2015-06-18 17:00:32 +01:00
73513ececc
Documentation
2015-06-18 16:15:10 +01:00
1f24c2e589
Don't bother proxying lookups on _NotificationListener to underlying deferred
2015-06-18 16:09:53 +01:00
22049ea700
Refactor the notifier.wait_for_events code to be clearer. Add _NotifierUserStream.new_listener that accpets a token to avoid races.
2015-06-18 15:49:24 +01:00
050ebccf30
Fix notifier leak
2015-06-18 11:36:26 +01:00
d88e20cdb9
Fix bug where synapse was sending AS user queries incorrectly.
...
Bug introduced in 92b20713d7
2015-06-17 17:26:03 +01:00
eceb554a2f
Use another deferred list
2015-06-16 17:12:27 +01:00
b849a64f8d
Use DeferredList
2015-06-16 17:03:24 +01:00
0460406298
Don't do unecessary db ops in presence.get_state
2015-06-16 16:59:38 +01:00
9a3cd1c00d
Correct -H SERVER_NAME in config-missing complaint message
2015-06-16 16:03:35 +01:00
fb7def3344
Remove access_token from synapse.rest.client.v1.transactions {get,store}_response logging
2015-06-16 10:09:43 +01:00
f13890ddce
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sanitize_logging
2015-06-15 18:26:24 +01:00
aaa749d366
Disable twisted access logging. Move access logging to SynapseRequest object
2015-06-15 18:18:05 +01:00
bc42ca121f
Merge pull request #185 from matrix-org/erikj/listeners_config
...
Change listener config.
2015-06-15 18:05:58 +01:00
cee69441d3
Log more when we have processed the request
2015-06-15 17:11:44 +01:00
b5209c5744
Create SynapseRequest that overrides __repr__ to not print access_token
2015-06-15 16:37:04 +01:00
44c9102e7a
Merge branch 'erikj/listeners_config' into erikj/sanitize_logging
2015-06-15 14:45:52 +01:00
7f7ec84d6f
Bump version
2015-06-15 14:16:29 +01:00
f00f8346f1
Make http.server request logging more verbose, but redact access_tokens
2015-06-15 13:37:58 +01:00
83f119a84a
Log requests and responses sent via http.client
2015-06-15 13:14:12 +01:00
9d0326baa6
Remove redundant newline
2015-06-15 11:27:29 +01:00
186f61a3ac
Document listener config. Remove deprecated config options
2015-06-15 11:25:53 +01:00
6c01ceb8d0
Bump version
2015-06-13 12:22:14 +01:00
2eda996a63
Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py
2015-06-13 12:21:58 +01:00
a005b7269a
Add backwards compat support for metrics, manhole and webclient config options
2015-06-12 17:44:23 +01:00
942e39e87c
PEP8
2015-06-12 17:13:54 +01:00
9c5fc81c2d
Correctly handle x_forwaded listener option
2015-06-12 17:13:23 +01:00
fd2c07bfed
Use config.listeners
2015-06-12 15:33:07 +01:00
c42ed47660
Fix up create_resource_tree
2015-06-12 11:52:52 +01:00
1e365e88bd
Bump schema version
2015-06-11 15:50:39 +01:00
2d41dc0069
Bump version
2015-06-11 15:49:19 +01:00
f7f07dc517
Begin changing the config format
2015-06-11 15:48:52 +01:00
b8690dd840
Catch any exceptions in the pusher loop. Use a lower timeout for pushers so we can see if they're actually still running.
2015-06-05 11:40:22 +01:00
da84946de4
pep8
2015-06-04 16:43:45 +01:00
63a7b3ad1e
Add script to (re)convert the pushers table to changing the unique key. Also give the python db upgrade scripts the database engine so they can convert parameter strings, and add *args **kwargs to the upgrade function so we can add more args in future and previous scripts will ignore them.
2015-06-04 16:16:01 +01:00
5730b20c6d
Merge pull request #175 from matrix-org/erikj/thumbnail_thread
...
Thumbnail images on a seperate thread
2015-06-03 17:26:56 +01:00
8047fd2434
Merge pull request #176 from matrix-org/erikj/backfill_auth
...
Improve backfill.
2015-06-03 17:25:37 +01:00
3bbd0d0e09
Merge pull request #180 from matrix-org/erikj/prev_state_context
...
Don't needlessly compute prev_state
2015-06-03 17:20:56 +01:00
9dda396baa
Merge pull request #179 from matrix-org/erikj/state_group_outliers
...
Don't compute EventContext for outliers.
2015-06-03 17:20:40 +01:00
13ed3b9985
Merge pull request #178 from matrix-org/erikj/cache_state_groups
...
Add cache to get_state_groups.
2015-06-03 17:20:33 +01:00
bd2cf9d4bf
Merge pull request #177 from matrix-org/erikj/content_repo_http_client
...
SYN-403: Make content repository use its own http client.
2015-06-03 17:20:27 +01:00
d4902a7ad0
Merge pull request #174 from matrix-org/erikj/compress_option
...
Add config option to disable compression of http responses
2015-06-03 17:18:17 +01:00
55bf90b9e4
Don't needlessly compute prev_state
2015-06-03 16:44:24 +01:00
53f0bf85d7
Comment
2015-06-03 16:43:40 +01:00
1c3d844e73
Don't needlessly compute context
2015-06-03 16:41:51 +01:00
0d7d9c37b6
Add cache to get_state_groups
2015-06-03 14:45:55 +01:00
d8866d7277
Caches should be bound to instances.
...
Before, caches were global and so different instances of the stores
would share caches. This caused problems in the unit tests.
2015-06-03 14:45:17 +01:00
2ef2f6d593
SYN-403: Make content repository use its own http client.
2015-06-03 10:17:37 +01:00
3483b78d1a
Log where a request came from in federation
2015-06-02 18:15:13 +01:00
d3ded420b1
Rephrase log line
2015-06-02 16:30:52 +01:00
22716774d5
Don't about JSON when warning about content tampering
2015-06-02 16:30:52 +01:00
5044e6c544
Thumbnail images on a seperate thread
2015-06-02 15:39:08 +01:00
09e23334de
Add a timeout
2015-06-02 11:00:37 +01:00
02410e9239
Handle the fact we might be missing auth events
2015-06-02 10:58:35 +01:00
e552b78d50
Add some logging
2015-06-02 10:28:14 +01:00
fde0da6f19
Correctly look up auth_events
2015-06-02 10:19:38 +01:00
3f04a08a0c
Don't process events we've already processed. Remember to process state events
2015-06-02 10:11:32 +01:00
4bbfbf898e
Correctly pass in auth_events
2015-06-01 17:02:23 +01:00
6e17463228
Don't explode if we don't have the event
2015-06-01 16:39:43 +01:00
522f285f9b
Add config option to disable compression of http responses
2015-06-01 13:36:30 +01:00
b8d49be5a1
Merge branch 'develop' into markjh/twisted-15
...
Conflicts:
synapse/python_dependencies.py
2015-06-01 10:56:05 +01:00
90abdaf3bc
Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our own Agent
2015-06-01 10:51:50 +01:00
d70c847b4f
Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha
...
Allow endpoint for verifying recaptcha to be configured
2015-05-29 15:32:54 +01:00
d15f166093
Remove log line
2015-05-29 15:03:24 +01:00
ca580ef862
Don't copy twice
2015-05-29 15:02:55 +01:00
784aaa53df
Merge branch 'develop' into markjh/SYT-8-recaptcha
...
Conflicts:
synapse/handlers/auth.py
2015-05-29 13:49:44 +01:00
8355b4d074
Bump syutil version
2015-05-29 13:08:43 +01:00
a7b65bdedf
Add config option to turn off freezing events. Use new encode_json api and ujson.loads
2015-05-29 12:17:33 +01:00
d94590ed48
Add config for setting the recaptcha verify api endpoint, so we can test it in sytest
2015-05-29 12:11:40 +01:00
afbd3b2fc4
SYN-395: Fix CAPTCHA, don't double decode json
2015-05-28 18:05:00 +01:00
79e37a7ecb
Correctly pass connection pool parameter
2015-05-28 16:48:53 +01:00
0f118e55db
Merge pull request #168 from matrix-org/erikj/conn_pool
...
Make HTTP clients use connection pools.
2015-05-28 16:03:56 +01:00
dd74436ffd
Unused import
2015-05-28 15:47:20 +01:00
11f51e6ded
Up maxPersistentPerHost count
2015-05-28 15:45:46 +01:00
086df80790
Add connection pooling to SimpleHttpClient
2015-05-28 15:43:21 +01:00
291e942332
Use connection pool for federation connections
2015-05-28 15:43:21 +01:00
31ade3b3e9
Remove a deep copy
2015-05-28 13:45:23 +01:00
36b3b75b21
Registration should be disabled by default
2015-05-28 11:01:34 +01:00
554c63ca60
Iterate over the user_streams not the user_ids
2015-05-26 15:03:49 +01:00
fff7905409
Merge branch 'bugs/SYN-390' into release-v0.9.1
2015-05-26 14:58:49 +01:00
00dd207f60
Take a dict of the rule, not the rule list
2015-05-26 14:57:48 +01:00
2651fd5e24
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1
2015-05-26 11:05:50 +01:00
e7b25a649c
Merge pull request #166 from matrix-org/bugs/SYN-390
...
SYN-390: Don't modify the dictionary returned from the database here either
2015-05-26 10:40:50 +01:00
804b732aab
SYN-390: Don't modify the dictionary returned from the database here either
2015-05-26 10:35:08 +01:00
45fffe8cbe
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1
2015-05-26 10:22:41 +01:00
9ba3c1ede4
Merge pull request #165 from matrix-org/bugs/SYN-390
...
SYN-390: Don't modify the dictionary returned from the data store
2015-05-26 10:20:36 +01:00
a0bebeda8b
SYN-390: Don't modify the dictionary returned from the data store
2015-05-26 10:14:15 +01:00
27e093cbc1
Bump version
2015-05-22 17:03:37 +01:00
d9f60e8dc8
Merge pull request #163 from matrix-org/markjh/presence_list_cache
...
Add a cache for the presence list
2015-05-22 17:02:23 +01:00
0e42dfbe22
Merge pull request #164 from matrix-org/markjh/pusher_performance_2
...
Add a cache for get_push rules for user, fix cache invalidation
2015-05-22 17:01:56 +01:00
6eadbfbea0
Remove redundant for loop
2015-05-22 16:12:20 +01:00
1a9a9abcc7
Add a cache for getting the presence list for a user
2015-05-22 16:11:17 +01:00
74b7de83ec
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
2015-05-22 16:10:42 +01:00
36317f3dad
Merge pull request #156 from matrix-org/erikj/join_perf
...
Make joining #matrix:matrix.org over federation quicker
2015-05-22 16:09:54 +01:00
052ac0c8d0
Merge pull request #159 from matrix-org/erikj/metrics_interface_config
...
Enable changing the interface the metrics listener binds to
2015-05-22 16:09:33 +01:00
49a2c10279
Merge pull request #157 from matrix-org/markjh/presence_performance
...
Improve presence performance in loadtest
2015-05-22 16:04:40 +01:00
5d53c14342
Merge pull request #160 from matrix-org/markjh/appservice_performance
...
Make the appservice use 'users_in_room' rather than get_room_members …
2015-05-22 16:04:22 +01:00
106a3051b8
Remove spurious TODO comment
2015-05-22 15:53:03 +01:00
284f55a7fb
Add doc strings
2015-05-22 15:18:04 +01:00
1ce1509989
s/metric_interface/metric_bind_host/
2015-05-22 14:51:22 +01:00
8bb85c8c5a
Update log line
2015-05-22 14:48:06 +01:00
c8135f808b
Remove unused import
2015-05-22 14:45:46 +01:00
b21d015c55
Log origin and stats of incoming transactions
2015-05-22 14:44:25 +01:00
e70e8e053e
Add txn_id to some log lines
2015-05-22 14:44:02 +01:00
1b446a5d85
Log less lines at INFO level, but include more helpful information
2015-05-22 14:29:57 +01:00
59a0682f3e
Enable changing the interface the metrics listener binds to
2015-05-22 13:13:07 +01:00
b6adfc59f5
Invalidate the get_latest_event_ids_in_room cache when deleting from event_forward_extremities
2015-05-22 13:01:03 +01:00
f43544eecc
Make the appservice use 'users_in_room' rather than get_room_members since it is cached
2015-05-22 11:01:28 +01:00
a04cde613e
Add a cache for get_push rules for user, fix cache invalidation
2015-05-22 10:39:45 +01:00
4429e720ae
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-05-22 10:33:00 +01:00
f8c2cd129d
Bump version
2015-05-21 17:03:30 +01:00
2043527b9b
Don't try to use a txn when not in one, remove spurious debug logging
2015-05-21 16:53:03 +01:00
53447e9cd3
Add caches for things requested by the pushers
2015-05-21 16:41:39 +01:00
d61ce3f670
Add a cache for get_current_state with state_key
2015-05-21 16:41:39 +01:00
a910984b58
Actually return something from lambda
2015-05-21 15:58:41 +01:00
e309b1045d
Sort backfill events
2015-05-21 15:57:35 +01:00
0180bfe4aa
Remove dead code
2015-05-21 15:53:41 +01:00
1f3d1d85a9
Only get non-state
2015-05-21 15:52:29 +01:00
39a3340f73
Skip events we've already seen
2015-05-21 15:48:56 +01:00
ae3bff3491
Correctly prepopulate queue
2015-05-21 15:46:07 +01:00
dc085ddf8c
Don't prepopulate event_results
2015-05-21 15:44:05 +01:00
73d23c6ae8
Don't readd things that are already in event_results
2015-05-21 15:40:22 +01:00
6189d8e54d
PriorityQueue gives lowest first
2015-05-21 15:38:08 +01:00
115ef3ddac
Correctly capture Queue.Empty exception
2015-05-21 15:37:43 +01:00
4fb858d90a
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
2015-05-21 15:25:54 +01:00
88f1ea36ce
Oops, get_rooms_for_user returns a namedtuple, not a room_id
2015-05-21 15:23:58 +01:00
c2633907c5
Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into erikj/backfill_fixes
2015-05-21 14:58:47 +01:00
ebfdd2eb5b
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
2015-05-21 14:54:52 +01:00
a551c5dad7
Merge pull request #155 from matrix-org/erikj/perf
...
Bulk and batch retrieval of events.
2015-05-21 14:54:40 +01:00
27e4b45c06
s/for events/for requests for events/
2015-05-21 14:52:23 +01:00
ac5f2bf9db
s/for events/for requests for events/
2015-05-21 14:50:57 +01:00
80a167b1f0
Add comments
2015-05-21 11:19:04 +01:00
7ae8afb7ef
Removed unused 'is_visible' method
2015-05-20 14:48:11 +01:00
9118a92862
Split up _get_events into defer and txn versions
2015-05-20 13:27:16 +01:00
e01b825cc9
Clean up the presence_list checking logic a bit
2015-05-20 13:21:59 +01:00
ab45e12d31
Make not return a deferred _get_event_from_row_txn
2015-05-20 13:07:19 +01:00
f407cbd2f1
PEP8
2015-05-20 13:02:01 +01:00
227f8ef031
Split out _get_event_from_row back into defer and _txn version
2015-05-20 13:00:57 +01:00
2bc60c55af
Fix _get_backfill_events to return events in the correct order
2015-05-20 12:57:00 +01:00
20814fabdd
Actually fetch state for new backwards extremeties when backfilling.
2015-05-20 11:59:02 +01:00
9084cdd70f
Ensure event_results is a set
2015-05-19 16:34:31 +01:00
3a653515ec
Add None check
2015-05-19 15:27:09 +01:00
aa729349dd
Fix event_backwards_extrem insertion to ignore outliers
2015-05-19 15:27:00 +01:00
5b1631a4a9
Add a timeout param to get_event
2015-05-19 14:53:32 +01:00
291cba284b
Handle the case when things return empty but non none things
2015-05-19 14:42:46 +01:00
253f76a0a5
Don't always hit get_server_verify_key_v1_direct
2015-05-19 14:42:38 +01:00
6837c5edab
Handle the case when things return empty but non none things
2015-05-19 14:27:11 +01:00
7223129916
Don't apply new room join hack if depth > 5
2015-05-19 14:16:08 +01:00
5ae4a84211
Don't always hit get_server_verify_key_v1_direct
2015-05-19 13:43:34 +01:00
118a760719
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
2015-05-19 13:20:29 +01:00
19505e0392
Disable GZip encoding on static file resources as per comment
2015-05-19 13:20:25 +01:00
d3e09f12d0
SYN-383: Actually, we expect this value to be a dict
2015-05-19 13:12:41 +01:00
677be13ffc
Revert accidental commit
2015-05-19 13:12:28 +01:00
350b88656a
SYN-383: Actually, we expect this value to be a dict
2015-05-19 13:01:57 +01:00
9de94d5a4d
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
2015-05-19 12:50:17 +01:00
2b7120e233
SYN-383: Handle the fact the server might not have signed things
2015-05-19 12:49:38 +01:00
8b256a7296
Don't reuse var names
2015-05-19 11:58:22 +01:00
62ccc6d95f
Don't reuse var names
2015-05-19 11:58:04 +01:00
01858bcbf2
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
2015-05-19 11:56:35 +01:00
2aeee2a905
SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return
2015-05-19 11:56:18 +01:00
5e7883ec19
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
2015-05-19 10:50:43 +01:00
c6a03c46e6
SYN-383: Extract the response list from 'server_keys' in the response JSON as it might work better than iterating over the top level dict
2015-05-19 10:23:02 +01:00
e4c65b338d
Speed up the get_pagination_rows as well
2015-05-18 18:21:06 +01:00
99914ec9f8
Merge pull request #152 from matrix-org/notifier_performance
...
Notifier performance
2015-05-18 17:49:59 +01:00
ef910a0358
Do work in parellel when joining a room
2015-05-18 17:17:04 +01:00
591c4bf223
Cache the most recent serial for each room
2015-05-18 16:21:51 +01:00
e1150cac4b
Move updating the serial and state of the presence cache into a single function
2015-05-18 15:46:37 +01:00
165eb2dbe6
Comments and shuffle of functions
2015-05-18 15:18:41 +01:00
880fb46de0
Merge branch 'notifier_performance' into markjh/presence_performance
2015-05-18 14:33:58 +01:00
65878a2319
Remove unused metric
2015-05-18 14:06:30 +01:00
ad31fa3040
Don't bother sorting by the room_stream_ids, it shouldn't matter which order they are notified in
2015-05-18 14:04:58 +01:00
4d1b6f4ad1
Remove rejected events if we don't want rejected events
2015-05-18 14:03:46 +01:00
0b0033c40b
Merge branch 'develop' into notifier_performance
2015-05-18 13:50:01 +01:00
755def8083
Add more doc string, reduce C+P boilerplate for getting room list
2015-05-18 13:46:47 +01:00
1e90715a3d
Make sure the notifier stream token goes forward when it is updated. Sort the pending events by the correct room_stream_id
2015-05-18 13:17:36 +01:00
131bdf9bb1
Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/perf
2015-05-18 10:23:37 +01:00
10f1bdb9a2
Move get_events functions to storage.events
2015-05-18 10:21:40 +01:00
d5cea26d45
Remove pointless newline
2015-05-18 10:16:45 +01:00
c71176858b
Newline, remove debug logging
2015-05-18 10:11:14 +01:00
f8bd4de87d
Remove debug logging
2015-05-18 09:58:03 +01:00
c3b37abdfd
PEP8
2015-05-15 16:59:58 +01:00
6c74fd62a0
Revert limiting of fetching, it didn't help perf.
2015-05-15 16:45:35 +01:00
9ff7f66a2b
init j
2015-05-15 16:36:03 +01:00
70f272f71c
Don't completely drain the list
2015-05-15 16:34:17 +01:00
8763dd80ef
Don't fetch prev_content for current_state
2015-05-15 15:33:01 +01:00
807229f2f2
Err, defer.gatherResults ftw
2015-05-15 15:20:29 +01:00
acb12cc811
Make store.get_current_state fetch events asyncly
2015-05-15 15:20:05 +01:00
d62dee7eae
Remove more debug logging
2015-05-15 15:06:37 +01:00
0f29cfabc3
Remove debug logging
2015-05-15 14:06:42 +01:00
e275a9c0d9
preserve log context
2015-05-15 11:54:51 +01:00
aa32bd38e4
Add a wait
2015-05-15 11:35:04 +01:00
372d4c6d7b
Srsly. Don't use closures. Baaaaaad
2015-05-15 11:26:00 +01:00
575ec91d82
Correctly pass through params
2015-05-15 11:15:10 +01:00
10be983f2c
Merge pull request #153 from matrix-org/markjh/presence_docstring
...
Add some doc strings for presence.
2015-05-15 11:11:47 +01:00
415b158ce2
More whitespace
2015-05-15 11:09:47 +01:00
de01438a57
Sort out error handling
2015-05-15 11:00:50 +01:00
a2c4f3f150
Fix daedlock
2015-05-15 10:54:04 +01:00
0a4330cd5d
Add some missed argument types, cleanup the whitespace a bit
2015-05-14 17:48:12 +01:00
47ec693e29
More doc-strings
2015-05-14 17:07:02 +01:00
1d566edb81
Remove race condition
2015-05-14 16:54:35 +01:00
6e1ad283cf
Support gzip encoding for client, client v2 and web client resources (SYN-176).
2015-05-14 16:39:19 +01:00
ef3d8754f5
Call from right thread
2015-05-14 15:41:55 +01:00
142934084a
Count and loop
2015-05-14 15:40:21 +01:00
96c5b9f87c
Don't start up more fetch_events
2015-05-14 15:36:04 +01:00
7cd6a6f6cf
Awful idea for speeding up fetching of events
2015-05-14 15:34:02 +01:00
c5d1b4986b
Remove unused arguments and doc PresenceHandler.push_update_to_clients
2015-05-14 14:59:31 +01:00
7f4105a5c9
Turn off preemptive transactions
2015-05-14 14:51:06 +01:00
f4d58deba1
PEP8
2015-05-14 14:45:42 +01:00
386b7330d2
Move from _base to events
2015-05-14 14:45:22 +01:00
0ad1c67234
Add some doc-strings to notifier
2015-05-14 14:35:07 +01:00
7d6a1dae31
Jump out early
2015-05-14 14:27:58 +01:00
656223fbd3
Actually, we probably want to run this in a transaction
2015-05-14 14:26:35 +01:00
67800f7626
Treat setting your display name to the empty string as removing it (SYN-186).
2015-05-14 14:19:59 +01:00
2f7f8e1c2b
Preemptively jump into a transaction if we ask for get_prev_content
2015-05-14 14:17:36 +01:00
4770cec7bc
Merge pull request #150 from matrix-org/notifier_unify
...
Make v1 and v2 client APIs interact with the notifier in the same way.
2015-05-14 14:16:59 +01:00
e1e9f0c5b2
loop -> gatherResults
2015-05-14 13:58:49 +01:00
ab78a8926e
Err, we probably want a bigger limit
2015-05-14 13:47:16 +01:00
f6f902d459
Move fetching of events into their own transactions
2015-05-14 13:45:48 +01:00
cdb3757942
Refactor _get_events
2015-05-14 13:31:55 +01:00
92e1c8983d
Disallow whitespace in aliases here too
2015-05-14 13:21:55 +01:00
0c894e1ebd
Throw error when creating room if alias contains whitespace #SYN-335
2015-05-14 13:11:28 +01:00
084c365c3a
Use the current token when timing out a notifier, make sure the user_id is a string in on_new_user_event
2015-05-14 12:03:26 +01:00
c37a6e151f
Make shared secret registration work again
2015-05-14 12:03:13 +01:00
36ea26c5c0
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/perf
2015-05-14 12:01:38 +01:00
7c549dd557
Add ID generator for push_rules_enable to #resolve SYN-378
2015-05-14 11:44:03 +01:00
899d4675dd
Merge branch 'notifier_unify' into notifier_performance
2015-05-14 11:36:44 +01:00
243c56e725
Merge branch 'develop' into notifier_unify
2015-05-14 11:36:23 +01:00
3edd2d5c93
Fix v2 sync, update the last_notified_ms only if there was an active listener
2015-05-14 11:25:30 +01:00
4f1d984e56
Add index on events
2015-05-13 17:22:26 +01:00
5e0c533672
Fix metric counter
2015-05-13 17:20:28 +01:00
968b01a91a
Actually use async method
2015-05-13 17:02:46 +01:00
4071f29653
Fetch events from events_id in their own transactions
2015-05-13 16:59:41 +01:00
f1b83d88a3
Discard unused NotifierUserStreams
2015-05-13 16:54:02 +01:00
a988361aea
Typo
2015-05-13 15:44:15 +01:00
8888982db3
Don't insert None
2015-05-13 15:43:32 +01:00
9af432257d
Don't set a timer if there's already a result to return
2015-05-13 15:42:13 +01:00
cf706cc6ef
Don't return None
2015-05-13 15:31:25 +01:00
5971d240d4
Limit batch size
2015-05-13 15:26:49 +01:00
ca4f458787
Fetch events in bulk
2015-05-13 15:13:42 +01:00
df6db5c802
Don't bother checking for new events from a source if the stream token hasn't advanced for that source
2015-05-13 15:08:24 +01:00
6edff11a88
Don't fetch redaction and rejection stuff for each event, so we can use index only scan
2015-05-13 14:39:05 +01:00
63878c0379
Don't bother checking for updates if the stream token hasn't advanced for a user
2015-05-13 13:42:21 +01:00
02590c3e1d
Temp turn off checking for rejections and redactions
2015-05-13 11:31:28 +01:00
619a21812b
defer.gatherResults loop
2015-05-13 11:29:03 +01:00
fec4485e28
Batch fetching of events for state groups
2015-05-13 11:22:42 +01:00
409bcc76bd
Load events for state group seperately
2015-05-13 11:13:31 +01:00
cffe6057fb
Merge branch 'notifier_unify' into notifier_performance
...
Conflicts:
synapse/notifier.py
2015-05-12 16:37:50 +01:00
80fd2b574c
Don't talk to yourself when backfilling
2015-05-12 16:19:46 +01:00
e122685978
You need to call contextmanager
2015-05-12 16:12:37 +01:00
d7b3ac46f8
Revert "Improvement to performance of presence event stream handling"
2015-05-12 15:44:21 +01:00
4429e4bf24
Merge branch 'develop' into notifier_unify
...
Conflicts:
synapse/notifier.py
2015-05-12 15:31:26 +01:00
ec07dba29e
Merge pull request #143 from matrix-org/erikj/SYN-375
...
SYN-375 - Lots of unhandled deferred exceptions.
2015-05-12 15:25:54 +01:00
c167cbc9fd
Merge pull request #147 from matrix-org/presence-performance
...
Improvement to performance of presence event stream handling
2015-05-12 15:24:54 +01:00
a6fb2aa2a5
Merge pull request #144 from matrix-org/erikj/logging_context
...
Preserving logging contexts
2015-05-12 15:23:50 +01:00
1fce36b111
Merge pull request #149 from matrix-org/erikj/backfill
...
Backfill support
2015-05-12 15:20:32 +01:00
8b28209c60
Err, delete the right stuff
2015-05-12 15:02:53 +01:00
30c72d377e
Newlines
2015-05-12 14:47:40 +01:00
e4eddf9b36
We do actually want to delete rows out of event_backward_extremities
2015-05-12 14:47:23 +01:00
c1779a79bc
Fix up _handle_prev_events to not try to insert duplicate rows
2015-05-12 14:41:50 +01:00
74850d7f75
Do state groups persistence /after/ checking if we have already persisted the event
2015-05-12 14:14:58 +01:00
07a1223156
s/backfil/backfill/
2015-05-12 14:09:54 +01:00
0d31ad5101
Typos everywhere
2015-05-12 14:02:01 +01:00
a0dfffb33c
And another typo.
2015-05-12 14:00:31 +01:00
6e5ac4a28f
Err, gatherResults doesn't take a dict...
2015-05-12 13:58:14 +01:00
8022b27fc2
Make distributer.fire work as it did
2015-05-12 13:14:48 +01:00
95dedb866f
Unwrap defer.gatherResults failures
2015-05-12 13:14:29 +01:00
78672a9fd5
Merge branch 'notifier_unify' into notifier_performance
2015-05-12 13:11:54 +01:00
da6a7bbdde
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_context
2015-05-12 13:10:42 +01:00
2551b6645d
Update the end_token correctly, otherwise the token doesn't advance and the client gets duplicate events
2015-05-12 11:54:18 +01:00
5e4ba463b7
Merge branch 'develop' into notifier_unify
2015-05-12 11:41:53 +01:00
5002056b16
SYN-377: Make sure that the StreamIdGenerator.get_next.__exit__ is called from the main thread after the transaction completes, not from database thread before the transaction completes.
2015-05-12 11:20:40 +01:00
5c75adff95
Add a NotifierUserStream to hold all the notification listeners for a user
2015-05-12 11:00:37 +01:00
367382b575
Handle the case where the other side is unreachable when backfilling
2015-05-12 10:35:45 +01:00
4df11b5039
Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'
2015-05-12 10:28:10 +01:00
84e6b4001f
Initial hack at wiring together pagination and backfill
2015-05-11 18:01:31 +01:00
17653a5dfe
Move storage.stream._StreamToken to types.RoomStreamToken
2015-05-11 18:01:01 +01:00
e269c511f6
Don't bother passing the events to the notifier since it isn't using them
2015-05-11 15:01:51 +01:00
5e3b254dc8
Use wait_for_events to implement 'get_events'
2015-05-11 14:37:33 +01:00
79b7154454
Merge pull request #146 from matrix-org/erikj/push_rules_fixes
...
Fix 500 on push rule updates.
2015-05-11 11:33:47 +01:00
4ef556f650
Bump version
2015-05-11 11:31:04 +01:00
b036596b75
Prefer to use _simple_*.
2015-05-11 11:24:01 +01:00
cd525c0f5a
push_rules table expects an 'id' field
2015-05-11 11:24:01 +01:00
de87541862
Bump version
2015-05-10 10:51:08 +01:00
22d2f498fa
Fix push rule bug: can't insert bool into small int column
2015-05-10 10:50:51 +01:00
2236ef6c92
Fix up leak. Add warnings.
2015-05-08 19:53:34 +01:00
da1aa07db5
Add some docs
2015-05-08 16:52:49 +01:00
4ac1941592
PEP8
2015-05-08 16:33:01 +01:00
476899295f
Change the way we do logging contexts so that they survive divergences
2015-05-08 16:32:18 +01:00
fca28d243e
Change the way we create observers to deferreds so that we don't get spammed by 'unhandled errors'
2015-05-08 16:28:08 +01:00
0cd1401f8d
Bump version
2015-05-08 16:11:51 +01:00
724bb1e7d9
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-05-08 16:11:19 +01:00
1c7912751e
Drop the old table not the new table
2015-05-08 16:04:32 +01:00
9d36eb4eab
Rename unique constraint
2015-05-08 16:01:55 +01:00
b0f71db3ff
Remove unsigned
2015-05-08 15:59:51 +01:00
84e1cacea4
Bump schema version
2015-05-08 15:58:14 +01:00
6538d445e8
Make the timestamps in server_keys_json bigints
2015-05-08 15:55:17 +01:00
126d562576
Bump version
2015-05-08 13:29:37 +01:00
45543028bb
Use the presence cachemap ordering to early-abort the iteration loop
2015-05-07 22:40:10 +01:00
f683b5de47
Store presence cachemap in an ordered dict, so that the newer serials will be at the end
2015-05-07 21:27:53 +01:00
db0dca2f6f
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-05-07 19:21:00 +01:00
a151693a3b
Bump syweb version
2015-05-07 18:01:46 +01:00
dfa98f911b
revert accidental bcrypt gensalt round reduction from loadtesting
2015-05-07 17:45:42 +01:00
ef8e8ebd91
pynacl-0.3.0 was released so we can finally start using it directly from pypi
2015-05-07 16:46:51 +01:00
97a64f3ebe
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-05-07 09:33:42 +01:00
b850c9fa04
Typo
2015-05-07 09:33:30 +01:00
4a7a4a5b6c
Optional profiling using cProfile
2015-05-06 17:08:00 +01:00
b994fb2b96
Don't read from the config file before checking it exists
2015-05-06 12:56:47 +01:00
04c01882fc
Bump version
2015-05-06 09:59:13 +01:00
0c4ac271ca
Merge branch 'erikj/executemany' of github.com:matrix-org/synapse into erikj/SYN-371
2015-05-05 18:21:19 +01:00
0cf7e480b4
And use buffer(...) there as well
2015-05-05 18:20:01 +01:00
ed2584050f
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/executemany
2015-05-05 18:15:20 +01:00
977338a7af
Use buffer(...) when inserting into bytea column
2015-05-05 18:12:53 +01:00
31049c4d72
Merge pull request #139 from matrix-org/bugs/SYN-369
...
Fix race with cache invalidation. SYN-369
2015-05-05 17:46:13 +01:00
deb0237166
Add some doc-string
2015-05-05 17:45:11 +01:00
e45b05647e
Fix the --help option for synapse
2015-05-05 17:39:59 +01:00
3d5a955e08
Missed events are not outliers
2015-05-05 17:36:57 +01:00
d18f37e026
Collect the invalidate callbacks on the transaction object rather than passing around a separate list
2015-05-05 17:32:21 +01:00
9951542393
Add a comment about the zip(*[zip(sorted(...),...)])
2015-05-05 17:06:55 +01:00
041b6cba61
SYN-369: Add comments to the sequence number logic in the cache
2015-05-05 16:32:44 +01:00
63075118a5
Add debug flag in synapse/storage/_base.py for debugging the cache logic by comparing what is in the cache with what was in the database on every access
2015-05-05 16:24:04 +01:00
531d7955fd
Don't insert without deduplication. In this case we never actually use this table, so simply remove the insert entirely
2015-05-05 16:12:28 +01:00
bfa4a7f8b0
Invalidate the room_member cache if the current state events updates
2015-05-05 15:43:49 +01:00
d0fece8d3c
Missing return for when the event was already persisted
2015-05-05 15:39:09 +01:00
bdcd7693c8
Fix indentation
2015-05-05 15:14:48 +01:00
43c2e8deae
Add support for using executemany
2015-05-05 15:13:25 +01:00
1692dc019d
Don't call 'encode_parameter' no-op
2015-05-05 15:00:30 +01:00
a9aea68fd5
Invalidate the caches from the correct thread
2015-05-05 14:57:08 +01:00
261d809a47
Sequence the modifications to the cache so that selects don't race with inserts
2015-05-05 14:13:50 +01:00
d9cc5de9e5
Correctly name transaction
2015-05-05 10:24:10 +01:00
b8940cd902
Remove some unused indexes
2015-05-01 16:14:25 +01:00
1942382246
Don't log enqueue_
2015-05-01 16:14:25 +01:00
eb9bd2d949
user_id now in user_threepids
2015-05-01 15:04:37 +01:00
2d386d7038
That wasn't a deferred
2015-05-01 14:41:25 +01:00
4ac2823b3c
Remove inlineCallbacks from non-generator
2015-05-01 14:41:25 +01:00
22c7c5eb8f
Typo
2015-05-01 14:41:25 +01:00
42c12c04f6
Remove some run_on_reactors
2015-05-01 14:41:25 +01:00
adb5b76ff5
Don't log all auth events every time we call auth.check
2015-05-01 14:41:25 +01:00
3bcdf3664c
Use the daemonize key from the config if it exists
2015-05-01 14:34:55 +01:00
9eeb03c0dd
Don't use self.execute: it's designed for fetching stuff
2015-05-01 14:21:25 +01:00
7b50769eb9
Merge pull request #136 from matrix-org/markjh/config_cleanup
...
Config restructuring.
2015-05-01 14:04:39 +01:00
7693f24792
No id field on user
2015-05-01 13:55:42 +01:00
46a65c282f
Allow generate-config to run against an existing config file to generate default keys
2015-05-01 13:54:38 +01:00
92b20713d7
More missed get_user_by_id API changes
2015-05-01 13:45:54 +01:00
da4ed08739
One too many lens
2015-05-01 13:29:38 +01:00
9060dc6b59
Change public room list to use defer.gatherResults
2015-05-01 13:28:36 +01:00
1fae1b3166
This api now no longer returns an array
2015-05-01 13:26:41 +01:00
80b4119279
Don't wait for storage of access_token
2015-05-01 13:14:05 +01:00
4011cf1c42
Cache latest_event_ids_in_room
2015-05-01 13:06:26 +01:00
657298cebd
Don't lock user_ips table for upsert.
2015-05-01 10:46:48 +01:00
fabb7acd45
Fix bug where we reconnected to the database on every query.
2015-05-01 10:24:24 +01:00
23c639ff32
Split a storage function in two so that we don't have to do extra work.
2015-05-01 10:17:19 +01:00
8be5284e91
Remove pointless join
2015-04-30 18:49:26 +01:00
503e4d3d52
Fix broken SQL
2015-04-30 18:44:47 +01:00
00718ae7a9
Need more yield
2015-04-30 18:43:39 +01:00
0465560c1a
Add missing param
2015-04-30 18:42:44 +01:00
61d05daab1
More join conditions
2015-04-30 18:41:05 +01:00
6ead27ddda
Add more conditions on JOINs to make postgres go a little faster.
2015-04-30 18:32:03 +01:00
50c87b8eed
Allow "manhole" to be ommited from the config
2015-04-30 18:11:47 +01:00
345995fcde
Remove the ~, comment the lines instead
2015-04-30 18:10:19 +01:00
62cebee8ee
Update key.py
2015-04-30 17:54:01 +01:00
95cbfee8ae
Update metrics.py
2015-04-30 17:52:20 +01:00
6ea9cf58be
missing import
2015-04-30 17:21:21 +01:00
f383d5a801
Fix up get_current_state and get_room_name_and_aliases queries to parse events in transaction
2015-04-30 17:12:52 +01:00
c95480963e
read the pid_file from the config file in synctl
2015-04-30 17:12:15 +01:00
2d4d2bbae4
Merge branch 'develop' into markjh/config_cleanup
...
Conflicts:
synapse/config/captcha.py
2015-04-30 16:54:55 +01:00
2f1348f339
Write a default log_config when generating config
2015-04-30 16:52:57 +01:00
69d4063651
Add get_rooms_for_user cache
2015-04-30 16:47:51 +01:00
5b02f33451
Undo changes to logger config, ie. remove the access_log_file option: decision is to support this through log_config rather tan adding an option.
2015-04-30 16:21:39 +01:00
054aa0d58c
Do access log using python's logging stuff, just under a separate logger name
2015-04-30 16:21:38 +01:00
3c4c229788
Don't use sub queries, it makes postgres sad
2015-04-30 16:16:53 +01:00
74aaacf82a
Don't break when sizes or durations are given as integers
2015-04-30 16:04:02 +01:00
29400b45b9
SYN-367: Use upsert rather than insert_or_replace
2015-04-30 15:21:31 +01:00
c28f1d16f0
Add a random string to the auto generated key id
2015-04-30 15:13:14 +01:00
265f30bd3f
Allow --enable-registration to be passed on the commandline
2015-04-30 15:04:06 +01:00
c9e62927f2
Use disable_registration keys if they are present
2015-04-30 14:34:09 +01:00
2366d28780
Don't needlessly join on state_events
2015-04-30 14:02:06 +01:00
d89a9f7283
Add an access_log
...
SYN-161 #resolve
2015-04-30 13:58:13 +01:00
1aa11cf7ce
Allow multiple config files, set up a default config before applying the config files
2015-04-30 13:48:15 +01:00
0c1b7f843b
Unused import
2015-04-30 13:33:30 +01:00
4b46fbec5b
Doesn't look like this is used anymore
2015-04-30 12:04:08 +01:00
1d7702833d
Make simple query rather than long one and then throw away half the results
2015-04-30 10:16:12 +01:00
6b69ddd17a
remove duplicate parse_size method
2015-04-30 04:26:29 +01:00
d624e2a638
Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class
2015-04-30 04:24:44 +01:00
b1ca784aca
Correctly decode, for sqlite and postgres, rows from pushers table
2015-04-29 19:41:14 +01:00
4a9dc5b2f5
pushkey' are also bytes.
2015-04-29 19:27:02 +01:00
0ade2712d1
Typo
2015-04-29 19:17:25 +01:00
50f96f256f
Also remove yield from within lock in the other generator
2015-04-29 19:17:00 +01:00
d2d61a8288
Fix deadlock in id_generators. No idea why this was an actual deadlock.
2015-04-29 19:15:23 +01:00
3e71d13acf
Also log when we've started pushers
2015-04-29 18:37:42 +01:00
David Baker