220231d8e3
Merge pull request #573 from matrix-org/erikj/sync_fix
...
Mitigate against incorrect old state in /sync.
2016-02-18 16:40:58 +00:00
e6c5e3f28a
Close cursor
2016-02-18 16:39:28 +00:00
42109a62a4
Remove unused param from get_max_token
2016-02-18 16:37:28 +00:00
b8cdec92c7
WheelTimer: Don't scan list, use index.
2016-02-18 16:33:07 +00:00
b9977ea667
Remove dead code for setting device specific rules.
...
It wasn't possible to hit the code from the API because of a typo
in parsing the request path. Since no-one was using the feature
we might as well remove the dead code.
2016-02-18 16:05:13 +00:00
48b652bcbe
Remove invalid arg.
2016-02-18 14:57:09 +00:00
b4796a62ee
Add unit test
2016-02-18 11:52:33 +00:00
f8d21e1431
Review comments
2016-02-18 11:02:14 +00:00
fe95f2217c
Add stuff pulled from the DB to the cache
2016-02-18 10:26:24 +00:00
8351538873
PEP8
2016-02-18 10:12:12 +00:00
112283e230
Prefix TS fields with _ts
2016-02-18 10:11:43 +00:00
b31ec214a5
Remove status_msg when going offline. Don't offline -> online if you send a message
2016-02-18 09:54:08 +00:00
114b929f8b
Check presence state is a valid one
2016-02-18 09:16:32 +00:00
ddca9c56fc
Move if statement
2016-02-18 09:11:53 +00:00
58371fa263
Comment
2016-02-18 09:09:50 +00:00
7e90fb6a57
Merge branch 'develop' into daniel/roomcleanupincremental
...
Conflicts:
synapse/rest/client/v1/room.py
2016-02-17 15:53:59 +00:00
591af2d074
Some cleanup
...
I'm not particularly happy with the "action" switching, but there's no
convenient way to defer the work that needs to happen after it, so... :(
2016-02-17 15:50:13 +00:00
c229c87398
Remove spurious comment
2016-02-17 15:48:29 +00:00
e5999bfb1a
Initial cut
2016-02-17 15:40:50 +00:00
a4e278bfe7
Respond to federated invite with non-empty context
...
Currently, we magically perform an extra database hit to find the
inviter, and use this to guess where we should send the event. Instead,
fill in a valid context, so that other callers relying on the context
actually have one.
2016-02-17 15:25:12 +00:00
9e7900da1e
Add wheeltimer impl
2016-02-17 14:29:28 +00:00
200de16440
Merge pull request #580 from Rugvip/develop
...
api/filtering: don't assume that event content will always be a dict
2016-02-17 12:51:02 +00:00
536f949a1a
api/filtering: don't assume that event content will always be a dict
...
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
2016-02-17 12:59:41 +01:00
71d5d2c669
client/v1/room: include event_id in response to state event PUT, in accordance with the spec
...
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
2016-02-17 11:53:43 +01:00
6605adf669
Some cleanup, some TODOs, more to do
2016-02-16 19:05:02 +00:00
458782bf67
Fix typo in request validation for adding push rules.
2016-02-16 18:00:30 +00:00
a9c9868957
Make adding push rules idempotent
...
Also remove the **kwargs from the add_push_rule method.
Fixes https://matrix.org/jira/browse/SYN-391
2016-02-16 15:53:38 +00:00
d1fb790818
Some cleanup
2016-02-16 14:25:23 +00:00
1f403325ac
Tidy? up room creation event sending
2016-02-16 12:00:50 +00:00
04686df17a
Add comment
2016-02-16 11:52:46 +00:00
feedaa37fa
Merge branch 'develop' into daniel/roomcleanupincremental
...
Conflicts:
synapse/handlers/room.py
2016-02-16 11:34:48 +00:00
4bfb32f685
Branch off member and non member sends
...
Unclean, needs tidy-up, but works
2016-02-15 18:21:30 +00:00
1a2197d7bf
Simplify room creation code
2016-02-15 18:19:01 +00:00
e560045cfd
Simplify room creation code
2016-02-15 18:18:39 +00:00
8168341e9b
Use update_membership for profile updates
2016-02-15 17:14:34 +00:00
1bbb67c452
Use update_membership to kick guests
2016-02-15 16:40:22 +00:00
150fcde0dc
Reuse update_membership from /join
2016-02-15 16:16:03 +00:00
73e616df2a
Inline _do_local_membership_update
2016-02-15 16:02:22 +00:00
f318d4f2a4
Inline _do_join as it now only has one caller
...
Also, consistently apply rate limiting.
Again, ugly, but a step in the right direction.
2016-02-15 15:57:10 +00:00
e71095801f
Merge implementation of /join by alias or ID
...
This code is kind of rough (passing the remote servers down a long
chain), but is a step towards improvement.
2016-02-15 15:39:16 +00:00
dbeed36dec
Merge some room joining codepaths
...
Force joining by alias to go through the send_membership_event checks,
rather than bypassing them straight into _do_join. This is the first of
many stages of cleanup.
2016-02-15 14:38:27 +00:00
4de08a4672
Revert "Merge two of the room join codepaths"
...
This reverts commit cf81375b94
2016-02-12 16:17:24 +00:00
cf81375b94
Merge two of the room join codepaths
...
There's at least one more to merge in.
Side-effects:
* Stop reporting None as displayname and avatar_url in some cases
* Joining a room by alias populates guest-ness in join event
* Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
been called on matrix.org according to logs
* Stop recording access_token_id on /join/room_id - currently we don't
record it on /join/room_alias; I can try to thread it through at some
point.
2016-02-12 15:11:49 +00:00
58c9f20692
Catch the exceptions thrown by twisted when you write to a closed connection
2016-02-12 13:46:59 +00:00
ec0f3836ff
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-02-12 11:19:37 +00:00
4d54d87c3e
Mitigate against incorrect old state in /sync.
...
There have been reports from the field that servers occasionally have
incorrect notions of what the old state of a room is. This proves
problematic as /sync relies on a correct old state.
This patch makes /sync specifically include in the 'state' key any
current state events that haven't been correctly included.
2016-02-12 11:13:06 +00:00
dc6da63e30
Enforce user_id exclusivity for AS registrations
...
This whole set of checks is kind of an ugly mess, which I may clean up
at some point, but for now let's be correct.
2016-02-11 17:37:38 +00:00
2a24f906a9
Bump version and changelog
2016-02-11 16:04:15 +00:00
a79af259e9
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-02-11 16:02:17 +00:00
ce14c7a995
Fix SYN-627, events are in incorrect room in /sync
2016-02-11 15:02:56 +00:00
1a830b751d
Bump version and changelog
2016-02-11 10:53:42 +00:00
0eff740523
Return events in correct order for /events
2016-02-11 10:07:27 +00:00
a1b7902944
Add some paranoia logging
2016-02-11 09:22:37 +00:00
103b432c84
0.13.1
2016-02-10 16:35:17 +00:00
7634687057
Merge branch 'master' of git+ssh://github.com/matrix-org/synapse
2016-02-10 16:27:15 +00:00
b3ecb96e36
try to bump syweb to 0.6.8
2016-02-10 16:27:12 +00:00
6e89e69d08
Bump version and changelog
2016-02-10 14:36:06 +00:00
e66d0bd03a
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
2016-02-10 14:12:48 +00:00
5189bfdef4
Batch fetch _get_state_groups_from_groups
2016-02-10 13:24:42 +00:00
24f00a6c33
Use _simple_select_many for _get_state_group_for_events
2016-02-10 12:57:50 +00:00
8e49892b21
Only calculate initial sync for 10 rooms at a time
...
This helps to ensure we don't completely starve other requests.
2016-02-10 11:42:07 +00:00
e557dc80b8
Merge pull request #566 from matrix-org/erikj/logcontext
...
Don't bother copying records on parent context
2016-02-10 11:41:45 +00:00
4eb8f9ca8a
Remove comment
2016-02-10 11:29:21 +00:00
f7ef5c1d57
Merge pull request #568 from matrix-org/erikj/unread_notif
...
Atomically persit push actions when we persist the event
2016-02-10 11:25:32 +00:00
00c9ad49df
s/parent_context/previous_context/
2016-02-10 11:25:19 +00:00
9777c5f49a
Set parent context on instansiation
2016-02-10 11:23:32 +00:00
0214745239
Rename functions
2016-02-10 11:09:56 +00:00
6ad9586c84
Merge pull request #565 from matrix-org/erikj/macaroon_config
...
Derive macaroon_secret_key from signing key.
2016-02-09 16:34:15 +00:00
7b0d846407
Atomically persit push actions when we persist the event
2016-02-09 16:19:15 +00:00
f28cc45183
Pass in current state to push action handler
2016-02-09 16:01:40 +00:00
78d6c1b5be
Change a log from debug to info
2016-02-09 14:44:12 +00:00
feb294d552
Remove dead code
2016-02-09 14:32:17 +00:00
70a8608749
Invalidate get_last_receipt_event_id_for_user cache
2016-02-09 14:27:29 +00:00
eff12e838c
Don't load all ephemeral state for a room on every sync
2016-02-09 13:55:59 +00:00
82631c5f94
Fix unit tests
2016-02-09 13:50:37 +00:00
9ac9b75bc4
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2016-02-09 12:58:10 +00:00
ebaa999f92
Revert "Reject additional path segments"
...
This reverts commit 1d19a5ec0f
2016-02-09 12:46:52 +00:00
6c558ee8bc
Measure some /sync related things
2016-02-09 11:31:42 +00:00
31a2b892d8
Revert to putting it around the entire block
2016-02-09 11:25:09 +00:00
9daa4e2a85
Don't create new logging context
2016-02-09 11:06:19 +00:00
3e2fcd67b2
Don't bother copying records on parent context
2016-02-09 10:50:31 +00:00
241b71852e
Fix bug in util.metrics.Measure
2016-02-09 10:28:13 +00:00
97294ef2fd
Create new context when measuring
2016-02-09 10:12:00 +00:00
549698b1e0
Don't measure across event stream call, as it lasts for a long time.
2016-02-09 09:37:09 +00:00
c486b7b41c
Change logcontext warns to debug
2016-02-09 09:20:38 +00:00
f078ecbc8f
Derive macaroon_secret_key from signing key.
...
Unfortunately, there are people that are running synapse without a
`macaroon_sercret_key` set. Mandating they set one is a good solution,
except that breaking auto upgrades is annoying.
2016-02-08 16:35:44 +00:00
2bb5f035af
Merge pull request #564 from matrix-org/erikj/logcontext
...
Fix up logcontexts
2016-02-08 15:16:16 +00:00
cca5c06679
Merge pull request #562 from matrix-org/erikj/push_metric
...
Add metrics to pushers
2016-02-08 14:57:40 +00:00
2c1fbea531
Fix up logcontexts
2016-02-08 14:26:45 +00:00
13e6262659
Add metrics to pushers
2016-02-08 14:26:45 +00:00
1d19a5ec0f
Reject additional path segments
2016-02-08 10:50:55 +00:00
79a1c0574b
Allocate guest user IDs numericcally
...
The current random IDs are ugly and confusing when presented in UIs.
This makes them prettier and easier to read.
Also, disable non-automated registration of numeric IDs so that we don't
need to worry so much about people carving out our automated address
space and us needing to keep retrying ID registration.
2016-02-05 11:22:30 +00:00
737c4223ef
Host /media/r0 as well as /media/v1
2016-02-05 10:47:46 +00:00
6a9f1209df
Error if macaroon key is missing from config
...
Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading.
2016-02-05 01:58:23 +00:00
34dda7cc7f
Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null
...
Omit keys rather then returning null in profile API
2016-02-04 15:39:12 +00:00
4d36e73230
Actually return something sensible
2016-02-03 16:35:00 +00:00
709e09e1c3
Remove old log line
2016-02-03 16:32:20 +00:00
aa4af94c69
We return dicts now.
2016-02-03 16:29:32 +00:00
b84d59c5f0
Add descriptions
2016-02-03 16:22:35 +00:00
33c71c3a4b
Preserve log context over when deferring to thread pool in media repo
2016-02-03 16:17:18 +00:00
Erik Johnston