aff892ce79
Fix formatting
2015-02-11 15:02:35 +00:00
f5a70e0d2e
Add a cache for get_event
2015-02-11 15:01:15 +00:00
4ebbaf0d43
Blunty replace json with simplejson
2015-02-11 14:23:10 +00:00
fd40d992ad
PEP8-ify
2015-02-11 10:41:33 +00:00
9978c5c103
Merge branch 'develop' into application-services
2015-02-11 10:03:24 +00:00
b085fac735
Code-style fixes
2015-02-10 16:30:48 +00:00
fda4422bc9
Fix pyflakes
2015-02-10 14:54:07 +00:00
d7c7efb691
Add performance counters for different stages of loading events
2015-02-10 14:50:53 +00:00
0c4536da8f
Use the transaction 'desc' rather than 'name', increment the txn_ids in
...
txn names
2015-02-09 18:06:31 +00:00
347b497db0
Formatting
2015-02-09 17:57:09 +00:00
3a5ad7dbd5
Performance counters for database transaction names
2015-02-09 17:55:56 +00:00
53557fc532
Merge branch 'develop' into application-services
2015-02-09 15:20:56 +00:00
c4ee4ce93e
Fix typo
2015-02-09 15:00:37 +00:00
66fde49f07
Log database time every 10s and log as percentage
2015-02-09 14:45:15 +00:00
75656712e3
Time how long we're spending on the database thread
2015-02-09 14:22:52 +00:00
5a7dd05818
Modify auth.get_user_by_req for authing appservices directly.
...
Add logic to map the appservice token to the autogenned appservice user ID.
Add unit tests for all forms of get_user_by_req (user/appservice,
valid/bad/missing tokens)
2015-02-09 14:14:15 +00:00
ac3183caaa
Register a user account for the AS when the AS registers. Add 'sender' column to AS table.
2015-02-09 12:03:37 +00:00
0cd66885e3
Move delta/v13.sql to delta/v12.sql
2015-02-06 14:38:04 +00:00
a3c6010718
Add delta sql file.
2015-02-05 16:48:57 +00:00
fc8bcc809d
Merge branch 'develop' into application-services
2015-02-05 15:32:45 +00:00
aaf50bf6f3
Give server default rules the 'default' attribute and fix various brokenness.
2015-02-05 15:11:38 +00:00
951690e54d
Merge branch 'develop' into application-services
2015-02-05 14:28:03 +00:00
f08bd95880
Merge pull request #47 from matrix-org/signature_failures
...
Federation fixes.
2015-02-05 14:03:00 +00:00
27091f146a
Add hs_token column and generate a different token f.e application service.
2015-02-05 10:08:12 +00:00
89f2e8fbdf
Fix bug in store defer. Add more unit tests.
2015-02-04 15:21:03 +00:00
17753f0c20
Add stub ApplicationServiceApi and glue it with the handler.
2015-02-04 11:19:18 +00:00
03d415a6a2
Brief comment on why we do some things on every call to persist_event and not others
2015-02-04 10:40:59 +00:00
c0462dbf15
Rearrange persist_event so that do all the queries that need to be done before returning early if we have already persisted that event.
2015-02-04 10:16:51 +00:00
02be8da5e1
Add doc to get_event
2015-02-03 17:34:07 +00:00
dc7bb70f22
s/instance_handle/profile_tag/
2015-02-03 16:51:07 +00:00
94a5db9f4d
Add appservice package and move ApplicationService into it.
2015-02-03 14:44:16 +00:00
f2c039bfb9
Implement restricted namespace checks. Begin fleshing out the main hook for notifying application services.
2015-02-03 13:29:27 +00:00
a060b47b13
Add namespace constants. Add restrict_to option to limit namespace checks.
2015-02-03 13:17:28 +00:00
3bd2841fdb
Everyone loves SQL typos
2015-02-03 11:37:52 +00:00
197f3ea4ba
Implement regex checks for app services.
...
Expose handler.get_services_for_event which manages the checks for all
services.
2015-02-03 11:26:33 +00:00
e7ca813dd4
Try to ensure we don't persist an event we have already persisted. In persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.
2015-02-03 10:39:41 +00:00
9ff349a3cb
Add defers in the right places.
2015-02-02 17:42:49 +00:00
1a2de0c5fe
Implement txns for AS (un)registration.
2015-02-02 17:39:41 +00:00
941f59101b
Don't fail an entire request if one of the returned events fails a signature check. If an event does fail a signature check, look in the local database and request it from the originator.
2015-02-02 16:56:01 +00:00
a006d168c5
Actually merge into develop.
2015-02-02 16:05:34 +00:00
c059c9fea5
Merge branch 'develop' into application-services
...
Conflicts:
synapse/handlers/__init__.py
synapse/storage/__init__.py
2015-02-02 15:57:59 +00:00
7d897f5bfc
Merge pull request #43 from matrix-org/rejections
...
Rejections
2015-01-30 16:11:14 +00:00
6dc92d3427
Merge pull request #41 from matrix-org/client_v2_sync
...
Client v2 sync
2015-01-30 15:54:25 +00:00
1bd540ef79
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/schema/im.sql
2015-01-30 15:16:38 +00:00
9ec9d6f2cb
Merge pull request #42 from matrix-org/replication_split
...
Replication split
2015-01-30 15:14:10 +00:00
91015ad008
Remove merge conflict
2015-01-30 14:58:54 +00:00
4f7fe63b6d
Remember to add schema file to list
2015-01-30 14:57:53 +00:00
fdd2ac495a
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
...
Conflicts:
synapse/storage/__init__.py
2015-01-30 14:57:33 +00:00
8bc3066e0b
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-30 14:57:04 +00:00
471c47441d
Merge pull request #37 from matrix-org/client_v2_filter
...
Client v2 filter
2015-01-30 14:56:08 +00:00
e97f756a05
Use 'in' to test if the key exists, remove unused _filters_for_user
2015-01-30 14:54:06 +00:00
2f4cb04f45
Be more specific in naming columns in selects.
2015-01-30 14:48:11 +00:00
472cf532b7
Put CREATE rejections into seperate .sql
2015-01-30 14:48:03 +00:00
322a047502
Add room member count condition and default rule to make a noise on rooms of only 2 people.
2015-01-30 14:46:45 +00:00
c515d37797
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/schema/delta/v12.sql
2015-01-30 14:19:49 +00:00
84b78c3b5f
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
2015-01-30 14:17:47 +00:00
e0b7c521cb
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
...
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
2015-01-30 14:08:28 +00:00
8498d348d8
Fix token formatting
2015-01-30 11:42:09 +00:00
22dd1cde2d
Filter the recent events before applying the limit when doing an incremental sync with a gap
2015-01-30 11:32:35 +00:00
2ebf795c0a
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
2015-01-30 11:10:37 +00:00
78015948a7
Initial implementation of auth conflict resolution
2015-01-29 16:52:33 +00:00
8e571cbed8
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 16:18:59 +00:00
295322048d
Merge branch 'develop' into client_v2_filter
2015-01-29 16:18:34 +00:00
acb68a39e0
Code style fixes.
2015-01-29 16:12:40 +00:00
396a67a09a
Merge branch 'client_v2_filter' into client_v2_sync
...
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
2015-01-29 14:58:00 +00:00
9d8f798a3f
Merge changes from develop
2015-01-29 14:55:27 +00:00
e4f50fa0aa
Move bump schema delta
2015-01-29 14:53:18 +00:00
e016f4043b
Use get_room_events_stream to get changes to the rooms if the number of changes is small
2015-01-29 14:40:28 +00:00
3773759c0f
Also edit the filter column on the delta SQL
2015-01-29 09:15:33 +00:00
b0b80074e0
SYN-252: Supply the stream and topological parts in the correct order to the constructor
2015-01-29 01:48:48 +00:00
d5bdf3c0c7
Allow the push rule delete method to take more specifiers.
2015-01-28 18:06:04 +00:00
11634017f4
s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json
2015-01-28 17:42:19 +00:00
9c61556504
Merge branch 'develop' into client_v2_sync
2015-01-28 17:29:30 +00:00
26c8fff19e
Merge pull request #36 from matrix-org/device_id_from_access_token
...
Extract the device id and token id from the access token when autheniticating users
2015-01-28 17:19:28 +00:00
388581e087
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
2015-01-28 16:58:23 +00:00
c23e3db544
Add filter JSON sanity checks.
2015-01-28 16:45:18 +00:00
0ef5bfd6a9
Start implementing auth conflict res
2015-01-28 16:16:53 +00:00
60b143a52e
Move pushers delta to v12 and bump schema version
2015-01-28 15:48:28 +00:00
e78dd33292
Use %s instead of +
2015-01-28 14:52:58 +00:00
93aac9bb7b
Newline
2015-01-28 14:51:01 +00:00
445ad9941e
Redundant parens
2015-01-28 14:49:59 +00:00
6d485dd1c7
unnecessary newlines
2015-01-28 14:48:42 +00:00
fb0928097a
More magic commas (including the place I copied it from...)
2015-01-28 14:48:07 +00:00
0cbb6b0f52
Google doc style
2015-01-28 14:44:41 +00:00
c291a4d522
Merge branch 'develop' into pushers
...
Conflicts:
synapse/handlers/events.py
synapse/server.py
2015-01-28 12:51:05 +00:00
42876969b9
Add basic application_services SQL, and hook up parts of the appservice store to read from it.
2015-01-28 11:59:38 +00:00
b46fa8603e
Remove unused import
2015-01-28 09:17:48 +00:00
e020574d65
Fix Formatting
2015-01-27 20:19:36 +00:00
8398f19bce
Created schema delta
2015-01-27 19:00:09 +00:00
06cc147012
Initial stab at real SQL storage implementation of user filter definitions
2015-01-27 18:46:03 +00:00
54e513b4e6
Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests
2015-01-27 17:48:13 +00:00
fbeaeb8689
Log when ASes are registered/unregistered.
2015-01-27 17:34:40 +00:00
ec3719b583
Use ApplicationService when registering.
2015-01-27 17:15:06 +00:00
92171f9dd1
Add stub methods, TODOs and docstrings for application services.
2015-01-27 16:53:59 +00:00
a56008842b
Start implementing incremental initial sync
2015-01-27 16:24:22 +00:00
7331d34839
Add AS specific classes with docstrings.
2015-01-27 16:23:46 +00:00
51449e0665
Add appservice handler and store. Glue together rest > handler > store.
2015-01-27 15:50:28 +00:00
69a75b7ebe
Add brackets to make get room name / alias work
2015-01-26 16:52:47 +00:00
7b88619241
Split up replication_layer module into client, server and transaction queue
2015-01-26 10:45:24 +00:00
5f84ba8ea1
Add API to delete push rules.
2015-01-23 17:49:37 +00:00
9b1e552b51
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
2015-01-23 15:51:48 +00:00
3b9cc882a5
Add storage method have_events
2015-01-23 15:42:52 +00:00
5759bec43c
Replace hs.parse_userid with UserID.from_string
2015-01-23 11:47:15 +00:00
bcd48b9636
Fix adding rules without before/after & add the rule that we couldn't find to the error
2015-01-23 10:28:25 +00:00
8a850573c9
As yet fairly untested GET API for push rules
2015-01-22 19:32:17 +00:00
673773b217
oops, this is not its own schema file
2015-01-22 18:27:07 +00:00
7ecb49ef25
Insufficient newlines
2015-01-22 17:53:30 +00:00
5c6189ea3e
Merge branch 'develop' into pushers
...
Conflicts:
synapse/rest/__init__.py
2015-01-22 17:46:16 +00:00
ede491b4e0
Oops: second part of commit dc938606
2015-01-22 17:38:53 +00:00
dc93860619
Add rest API & store for creating push rules
...
Also make unrecognised request error look more like synapse errors
because it makes it easier to throw them from within rest classes.
2015-01-22 17:37:12 +00:00
b1b85753d7
Add support for storing rejected events in EventContext and data stores
2015-01-22 15:50:17 +00:00
afb714f7be
add instance_handles to pushers so we have a way to refer to them even if the push token changes.
2015-01-20 11:49:48 +00:00
2d2953cf5f
Require device language when adding a pusher.
...
Because this seems like it might be useful to do sooner rather
than later.
2015-01-16 11:24:10 +00:00
2ca2dbc821
Send room name and first alias in notification poke.
2015-01-15 16:56:18 +00:00
2cb30767fa
Honour the 'rejected' return from push gateways
...
Add a timestamp to push tokens so we know the last time they we
got them from the device. Send it to the push gateways so it can
determine whether its failure is more recent than the token.
Stop and remove pushers that have been rejected.
2015-01-13 19:48:37 +00:00
3891597eb3
Remove unused functions
2015-01-13 15:57:26 +00:00
fda63064fc
get_room_events isn't called anywhere
2015-01-13 14:43:26 +00:00
895fcb377e
Fix stream token ordering
2015-01-13 14:38:53 +00:00
c06a9063e1
Merge branch 'develop' into pushers
2015-01-13 13:15:51 +00:00
c43d898119
SYN-178: Fix off by one.
2015-01-12 17:38:40 +00:00
36a2a877e2
Use time.time() instead of time.clock()
2015-01-06 16:34:41 +00:00
fd9a8db7ea
Only fetch the columns we need.
2015-01-06 15:59:31 +00:00
a01416cf21
Add delta and bump DB version
2015-01-06 15:42:18 +00:00
f6da237c35
Add index on transaction_id to sent_transcations
2015-01-06 15:40:38 +00:00
9bd07bed23
Actually time that function
2015-01-06 15:28:56 +00:00
03a501456c
Time how long calls to _get_destination_retry_timings take
2015-01-06 15:22:28 +00:00
52b2c6c9c7
Don't include None's in _get_events_txn
2015-01-06 14:56:57 +00:00
8a12df8cf3
Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop
2015-01-06 14:45:57 +00:00
96707ed718
Name 'user_rooms_intersect' transaction
2015-01-06 14:44:27 +00:00
76ec154e95
We don't need the full events for get_rooms_for_user_where_membership_is
2015-01-06 14:37:00 +00:00
5e23a19204
Merge pull request #28 from matrix-org/erikj-perf
...
Database performance improvements.
2015-01-06 13:33:40 +00:00
adb04b1e57
Update copyright notices
2015-01-06 13:21:39 +00:00
af1c7c7808
PEP8
2015-01-06 13:13:17 +00:00
12819d5082
Remove debug lines
2015-01-06 13:12:30 +00:00
52d8519008
Don't do batching when getting events.
2015-01-06 13:10:27 +00:00
98933e3db6
Only fetch prev_content when a client is streaming/paginating. Use transactions for event streams.
2015-01-06 13:03:23 +00:00
3e26720e05
Temporarily turn off 'redacted_because' and 'prev_content' keys
2015-01-06 11:26:58 +00:00
f4ea78e9e2
More debug logging
2015-01-06 11:24:18 +00:00
753126b8cc
Add some debug logging
2015-01-06 11:18:12 +00:00
d7e8ea67b3
Reformat
2015-01-06 11:18:02 +00:00
f0128f9600
Add RoomMemberStore.get_users_in_room, so that we can get the list of joined users without having to retrieve the full events
2015-01-06 10:55:43 +00:00
d61109f578
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
2014-12-19 16:37:08 +00:00
9c71d945d6
Look for name, topic in the event content rather than the event itself when persisting room name and topic events
2014-12-19 15:16:48 +00:00
b56730bb6e
Merge branch 'develop' into pushers
...
Conflicts:
synapse/api/errors.py
synapse/server.py
synapse/storage/__init__.py
2014-12-18 15:15:22 +00:00
afa953a293
schema version is now 10
2014-12-18 15:11:06 +00:00
0a6664493a
Merge branch 'master' into pushers
2014-12-18 15:06:11 +00:00
4c7ad50f6e
Thank you, pyflakes
2014-12-18 14:55:04 +00:00
173264b656
...and bump SCHEMA_VERSION
2014-12-18 14:53:10 +00:00
fc7c5e9cd7
Rename the pusher SQL delta to v9 which the next free one
2014-12-18 14:51:29 +00:00
9728c305a3
after a few rethinks, a working implementation of pushers.
2014-12-18 14:49:22 +00:00
f3788e3c78
Test some ideas that might help performance a bit
2014-12-17 23:37:08 +00:00
dec5b62339
Use _get_events_txn instead of _parse_events_txn
2014-12-16 19:16:41 +00:00
2215faa361
Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0
2014-12-16 19:11:13 +00:00
96779d2490
Fix bug where we did not send the full auth chain to people that joined over federation
2014-12-16 18:57:36 +00:00
f76269392b
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0
...
Conflicts:
synapse/state.py
2014-12-16 18:35:46 +00:00
52f99243ab
Use is_outlier() so that we don't get AttributeError
2014-12-16 18:33:50 +00:00
5b39cfff69
Don't assume an event exists
2014-12-16 18:25:24 +00:00
56db465047
Merge branch 'release-v0.6.0' into develop
2014-12-16 17:29:49 +00:00
627e4f01d2
Remove send_message since nothing was calling it. Remove Snapshot because only send_message was using it
2014-12-16 16:07:41 +00:00
42b725ce52
Fix upgrade script to run all the missing deltas.
2014-12-16 15:13:34 +00:00
b3c793e362
Do run all deltas up to missing delta 10
2014-12-16 14:44:53 +00:00
2e44714214
Make failure to run appropraite upgrade scripts more helpful.
2014-12-16 14:20:32 +00:00
ef5a141050
Bump database version
2014-12-16 13:57:47 +00:00
35f4f6b070
Update upgrade script
2014-12-16 13:27:53 +00:00
882dc8dcab
Persist internal_metadata
2014-12-16 13:17:09 +00:00
3c77d13aa5
Kill off synapse.api.events.*
2014-12-16 11:29:05 +00:00
f280929a12
Use frozenutils
2014-12-15 17:31:36 +00:00
c8dd3314d6
Fix bug where we ignored event_edge_hashes table
2014-12-15 13:55:22 +00:00
c39beb5559
Store json as UTF-8 and not bytes
2014-12-12 14:53:37 +00:00
75085bb4d1
Pyflakes
2014-12-12 14:34:34 +00:00
cde840a82c
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
...
Conflicts:
setup.py
2014-12-11 17:48:48 +00:00
0b04369238
Fix public room joining by making sure replaces_state never points to itself.
2014-12-11 15:56:06 +00:00
9191292b0f
Fix prev_content
2014-12-11 15:16:55 +00:00
8cdebce470
Fix redactions. Fix 'age' key
2014-12-11 13:25:19 +00:00
02e4c18171
Remove dead code
2014-12-10 18:00:36 +00:00
4f37c0ea9d
Merge branch 'develop' into media_repository
2014-12-10 16:55:06 +00:00
61fc37e467
Merge branch 'develop' into media_repository
2014-12-10 16:14:17 +00:00
1d2a0040cf
Fix bug where we clobbered old state group values
2014-12-10 15:55:03 +00:00
e5275d856e
Get the code actually working
2014-12-10 15:46:18 +00:00
cc84d3ea78
Thumbnail uploaded and cached images
2014-12-10 15:40:52 +00:00
02db7eb209
Fix bug when uploading state with empty state_key
2014-12-10 14:02:48 +00:00
aae8a37e63
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
2014-12-10 13:18:40 +00:00
95aa903ffa
Try and figure out how and why signatures are being changed.
2014-12-10 11:37:47 +00:00
b8d30899b1
Code style.
2014-12-10 10:16:09 +00:00
2b1acb7671
squidge to 79 columns as per pep8
2014-12-10 00:03:55 +00:00
aa3f66cf7f
Change the way we implement get_events to be less sucky
2014-12-09 13:35:26 +00:00
8529fba02d
fix a million stupid bugs and make it actually work
2014-12-08 19:34:51 +00:00
0d3fa1ac6e
add a write-through cache on the retry schedule
2014-12-08 17:48:57 +00:00
ba3d1e2fc0
Remove unused import
2014-12-08 12:01:25 +00:00
d044121168
Various typos and bug fixes.
2014-12-08 09:08:26 +00:00
5cd43d4b9f
fix stupid syntax thinkos
2014-12-07 23:44:16 +00:00
aed62a3583
track replication destination health, and perform exponential back-off when sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover.
2014-12-07 02:26:07 +00:00
a953be097f
Add a method field to thumbnail storage
2014-12-05 16:31:56 +00:00
6630e1b579
Start making more things use EventContext rather than event.*
2014-12-05 16:20:48 +00:00
c31dba86ec
Convert rest and handlers to use new event structure
2014-12-04 15:50:01 +00:00
c01fd5573c
Implement download support for media_repository
2014-12-04 14:22:31 +00:00
5d7c9ab789
Begin converting things to use the new Event structure
2014-12-04 11:27:59 +00:00
88af58d41d
Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.
2014-12-03 13:37:02 +00:00
6941a19715
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
2014-12-03 11:56:49 +00:00
10eb8f070c
Workaround for non-uniqueness of room member events in the database confusing HAVING COUNT() test of room membership intersection (with thanks to Tom Molesworth)
2014-12-02 21:36:53 +00:00
Mark Haines