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
763360594d
Mark AS users with their AS's ID
2016-02-11 17:26:42 +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
c8e4d5de7f
Merge pull request #555 from matrix-org/erikj/logcontext
...
Allowing tagging log contexts
2016-02-03 15:20:00 +00:00
156cea5b45
No braces here
2016-02-03 15:04:51 +00:00
8450114098
Merge pull request #554 from matrix-org/erikj/event_push
...
Change event_push_actions_rm_tokens schema
2016-02-03 15:02:47 +00:00
24277fbb97
Don't return null if profile display name / avatar url isn't set: omit them instead
2016-02-03 14:59:19 +00:00
66bb255fcd
Merge pull request #556 from matrix-org/daniel/config
...
Rename config field to reflect yaml name
2016-02-03 14:55:54 +00:00
5054806ec1
Rename config field to reflect yaml name
2016-02-03 14:42:01 +00:00
d4f72a5bfb
Allowing tagging log contexts
2016-02-03 13:52:27 +00:00
f8aae79a72
Simplify get_rooms
2016-02-03 13:24:35 +00:00
9cd80a7b5c
PEP8
2016-02-03 11:52:57 +00:00
772b45c745
Remove unused method
2016-02-03 11:43:26 +00:00
6f52e90065
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix
2016-02-03 11:06:29 +00:00
771528ab13
Change event_push_actions_rm_tokens schema
2016-02-03 10:50:49 +00:00
b32121a5d1
Unused import
2016-02-03 10:30:56 +00:00
2df6114bc4
Log more diagnostics for unrecognised access tokens
2016-02-02 19:21:49 +00:00
d83d004ccd
Fix flake8 warnings for new flake8
2016-02-02 17:18:50 +00:00
8a391e33ae
s/get_room_changes_for_user/get_membership_changes_for_user/
2016-02-02 16:12:10 +00:00
477b1ed6cf
Fetch events in a separate transaction.
...
This has a couple of benefits:
- It reduces the time of transactions, allowing other database requests
to run.
- Fetching events is given a dedicated database thread, and so can't
starve other database requests.
2016-02-02 15:58:14 +00:00
04ad93e6fd
Merge pull request #545 from matrix-org/erikj/sync
...
Move /sync state calculations from rest to handler
2016-02-02 15:28:43 +00:00
65e92eca49
Change the way we do public room list fetching
2016-02-02 15:21:10 +00:00
69214ea671
Pass make_guest whne we autogen a user ID
2016-02-02 14:42:31 +00:00
b023995538
WARN if we get a topo token instead of stream.
2016-02-02 14:11:14 +00:00
793369791a
Merge pull request #547 from matrix-org/dbkr/fix_guest_upgrade
...
Pull guest access token out of the auth session params
2016-02-02 09:47:30 +00:00
854ca32f10
Comments
2016-02-01 16:52:27 +00:00
d7ac861d3b
Pull guest access token out of the auth session params, otherwise it will break if you open the email on a different device.
2016-02-01 16:33:19 +00:00
89b40b225c
Order things correctly
2016-02-01 16:32:46 +00:00
4bf448be25
Switch over /events to use per room caches
2016-02-01 16:26:51 +00:00
fa48020a52
Move state calculations from rest to handler
2016-02-01 15:59:40 +00:00
2d3837bec7
Merge pull request #543 from matrix-org/erikj/sync
...
Cache get_room_changes_for_user
2016-02-01 15:05:06 +00:00
ceb6b8680a
Only use room_ids if in get_room_events_stream if is_guest
2016-02-01 10:33:52 +00:00
d98a9f2583
Don't use before_token. Its wrong. Use actual limit.
2016-01-31 13:31:15 +00:00
25c311eaf6
Cache get_room_changes_for_user
2016-01-29 16:52:48 +00:00
cc9c97e0dc
Invalidate _account_data_stream_cache correctly
2016-01-29 16:41:51 +00:00
e70165039c
If stream pos is greater then earliest known key and entity hasn't changed, then entity hasn't changed
2016-01-29 16:41:32 +00:00
c1de91aca4
Merge pull request #540 from matrix-org/erikj/sync
...
Prefill stream change caches
2016-01-29 15:52:42 +00:00
b55b90bfb4
Merge pull request #541 from matrix-org/erikj/fixsomeofpush
...
Make /events always return a newer token, if one exists
2016-01-29 15:45:35 +00:00
8da95b6f1b
Comment. Remove superfluous order by
2016-01-29 15:39:17 +00:00
13724569ec
Deal with None limit
2016-01-29 15:33:44 +00:00
4a6eb5eb45
Make /events always return a newer token, if one exists
2016-01-29 15:22:17 +00:00
6927d0e091
Add missing param to the log line
2016-01-29 15:01:26 +00:00
b5dbced938
Don't prefill account data
2016-01-29 14:53:59 +00:00
3d60686c0c
Actually use cache
2016-01-29 14:49:11 +00:00
45488e0ffa
Max is not a function
2016-01-29 14:42:01 +00:00
f67d60496a
Convert param style
2016-01-29 14:41:16 +00:00
18579534ea
Prefill stream change caches
2016-01-29 14:37:59 +00:00
47374a33fc
Merge remote-tracking branch 'origin/develop' into markjh/3pid
2016-01-29 14:15:12 +00:00
0fcafbece8
Add config option for setting the trusted id servers, disabling checking the ID server in integration tests
2016-01-29 14:12:26 +00:00
fd142c29d9
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1
2016-01-29 13:52:12 +00:00
ebc5f00efe
Bump AccountDataAndTagsChangeCache size
2016-01-29 13:37:40 +00:00
ea320d3464
Don't work out unread_notifs_for_room_id unless needed
2016-01-29 13:34:48 +00:00
5687a00e4e
Allow three_pid_creds as well as threePidCreds in /account/3pid
2016-01-29 13:26:15 +00:00
b18114e19e
Merge pull request #536 from matrix-org/erikj/sync
...
Make /sync "better".
2016-01-29 13:04:51 +00:00
02a9c3be6c
Merge pull request #538 from matrix-org/erikj/fix_lru_cache
...
Fix LruCache. Make TreeCache track its own size.
2016-01-29 11:53:55 +00:00
fb7299800f
Directly set self.value
2016-01-29 11:29:14 +00:00
c046630c33
Remove spurious self.size
2016-01-29 11:17:54 +00:00
a30364c1f9
Correctly bookkeep the size of TreeCache
2016-01-29 10:44:46 +00:00
766526e114
Make TreeCache keep track of its own size.
2016-01-29 10:11:21 +00:00
50e18938a9
Reset size on clear
2016-01-29 10:00:45 +00:00
467c27a1f9
Amalgamate tags and account data stream caches
2016-01-28 18:20:00 +00:00
3f5dd18bd4
If the same as the earliest key, assume nothing has changed.
2016-01-28 18:11:41 +00:00
40431251cb
Correctly update _entity_to_key
2016-01-28 18:05:43 +00:00
82cf3a8043
Fix inequalities
2016-01-28 17:44:04 +00:00
03b2c2577c
Don't use defer.returnValue
2016-01-28 17:29:24 +00:00
0663c5bd52
Include cache hits with has_entity_changed
2016-01-28 17:27:28 +00:00
35981c8b71
Fix test
2016-01-28 17:20:05 +00:00
8fe8951a8d
Cache filters
2016-01-28 17:09:09 +00:00
fdca8ec418
Add events index
2016-01-28 16:41:59 +00:00
45cf827c8f
Change name and doc has_entity_changed
2016-01-28 16:39:18 +00:00
00cb3eb24b
Cache tags and account data
2016-01-28 16:37:41 +00:00
c23a8c7833
Ensure keys to RoomStreamChangeCache are ints
2016-01-28 15:55:26 +00:00
e1941442d4
Invalidate caches properly. Remove unused arg
2016-01-28 15:02:41 +00:00
0935802f1e
Pin pynacl to 0.3.0
...
Something has gone wrong in the packaging of 1.* which causes it not to
compile.
2016-01-28 14:47:03 +00:00
19fd425928
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
2016-01-28 14:46:08 +00:00
167d1df699
Merge pull request #534 from matrix-org/erikj/setup
...
Add a Homeserver.setup method
2016-01-28 14:45:36 +00:00
7ed2bbeb11
Clean up a bit. Add comment
2016-01-28 14:32:05 +00:00
Mark Haines