a09e59a698
Pull the _get_event_cache.setdefault() call out of the try block, as it doesn't need to be there and is confusing
2015-02-23 16:55:57 +00:00
044d813ef7
Use the @cached decorator to implement the destination_retry_timings cache
2015-02-23 16:04:40 +00:00
357fba2c24
RoomMemberStore no longer needs a _user_rooms_cache member
2015-02-23 15:57:41 +00:00
e76d485e29
Allow @cached-wrapped functions to have a prefill method for setting entries
2015-02-23 15:41:54 +00:00
0696dfd94b
Actually treat this as static content, not random Resources.
2015-02-23 15:35:09 +00:00
22399d3d8f
Add RegisterFallbackResource to /_matrix/static/client/register
...
Try to keep both forms of registration logic (native/fallback) close
together for sanity.
2015-02-23 15:14:56 +00:00
4631b737fd
Squash out the now-redundant ApplicationServicesCache object class
2015-02-23 14:38:44 +00:00
e25e0f4da9
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
2015-02-23 14:36:00 +00:00
42b972bccd
Revert get_auth_chain changes
2015-02-23 14:35:23 +00:00
db215b7e00
Implement and use new batched get missing pdu
2015-02-23 13:58:02 +00:00
a87c56c673
Bump version
2015-02-21 13:45:07 +00:00
1f29fafc95
Don't exit if we can't work out if we're running in a git repo
2015-02-21 13:44:46 +00:00
7c56210f20
By default set soft limit to hard limit
2015-02-20 16:09:44 +00:00
7367ca42b5
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-20 16:06:28 +00:00
dc0ee55110
Change version scheme
2015-02-20 15:00:14 +00:00
0edfecc904
Bump version
2015-02-20 14:14:28 +00:00
2bafeca270
Add missing comma so that it generates a dict and not a set
2015-02-20 14:08:42 +00:00
15e2d7e387
Always allow AS to register
2015-02-20 11:39:53 +00:00
55022d6ca5
Remove a TODO note
2015-02-19 18:38:09 +00:00
ebc3db295b
Take named arguments to @cached() decorator, add a 'max_entries' limit
2015-02-19 18:36:02 +00:00
077d200342
Move @cached decorator out into synapse.storage._base; add minimal docs
2015-02-19 17:29:39 +00:00
0ac2a79faa
Initial stab at implementing a batched get_missing_pdus request
2015-02-19 17:24:14 +00:00
61959928bb
Pull out the 'get_rooms_for_user' cache logic into a reüsable @cached decorator
2015-02-19 14:58:07 +00:00
0722f982d3
Disable registration if config option was set.
2015-02-19 14:22:20 +00:00
81163f822e
Add config option to disable registration.
2015-02-19 14:16:53 +00:00
939273c4b0
Rename resource variable so as to not shadow module import
2015-02-19 11:53:13 +00:00
c3eb7dd9c5
Add config option to set the soft fd limit on start
2015-02-19 11:50:49 +00:00
b457f1677c
Send room ID in http notifications so clients know which room to go to if the user responds to the notification.
2015-02-19 10:06:17 +00:00
7025781df8
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
2015-02-18 17:37:43 +00:00
142f1263f6
Merge pull request #82 from matrix-org/git_tag_version
...
Git tag version
2015-02-18 17:37:19 +00:00
6311ae8968
Conform to header spec take two
2015-02-18 17:34:26 +00:00
3f1871021e
Make /keys/ return correct Server version
2015-02-18 17:32:12 +00:00
b6771037a6
Make version_string conform to User-Agent and Server spec
2015-02-18 17:31:50 +00:00
5b753d472b
Bump matrix-angular-sdk version
2015-02-18 17:02:40 +00:00
1df8bad63e
pyflakes
2015-02-18 16:54:25 +00:00
5358966a87
Use git aware version string in User-Agent and Server headers
2015-02-18 16:52:04 +00:00
aa577df064
When computing git version run git commands in same dir as source files
2015-02-18 16:52:04 +00:00
d122e215ff
Generate a version string that includes git details if run from git checkout
2015-02-18 16:52:04 +00:00
a7925259a1
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
2015-02-18 13:57:55 +00:00
7d304ae11c
Merge pull request #80 from matrix-org/restrict-destinations
...
Restrict the destinations that synapse can talk to
2015-02-18 13:56:48 +00:00
446ef58992
Add errback to all deferreds in transaction_queue
2015-02-18 12:03:26 +00:00
cc3d3babb0
Remove unused import
2015-02-18 12:01:41 +00:00
6375bd3e33
SYN-282: Don't log tracebacks for client errors
2015-02-18 12:01:37 +00:00
2462aacd77
Restrict the destinations that synapse can talk to
2015-02-18 11:52:51 +00:00
b68e4a729f
Discard destination 'localhost'
2015-02-18 11:32:39 +00:00
47d3ff4cf8
Don't send failure to self
2015-02-18 11:30:37 +00:00
36e144091b
Remove spurious comma. Remove temp run_on_reactor
2015-02-18 11:25:20 +00:00
b17bd31da0
Temporarily add a run_on_reactor() call
2015-02-18 11:17:26 +00:00
5806d52423
Fix syntax
2015-02-18 11:01:37 +00:00
87e9aeb914
Move pynacl to the top of the depedency link list so that it is
...
installed before syutil
2015-02-18 11:00:13 +00:00
7e9d59f3b4
Don't convert DNSLookupError to a 4xx SynapseError
2015-02-18 10:58:13 +00:00
cedad8fbd6
Bump version
2015-02-18 10:54:34 +00:00
65ca713ff5
Add .__name__ after type(e)
2015-02-18 10:51:32 +00:00
5e24471469
Fix up ResponseNeverReceived to str
2015-02-18 10:50:10 +00:00
e482541e1d
Fix pyflakes
2015-02-18 10:44:22 +00:00
0db52d43fa
strings.join() expects iterable of strings
2015-02-18 10:41:46 +00:00
859fbd4423
s/self._clock/self.clock/
2015-02-18 10:39:14 +00:00
1be67eca8a
Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into develop
2015-02-18 10:34:40 +00:00
2635d4e634
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-02-18 10:29:54 +00:00
fe672a04f7
Merge pull request #77 from matrix-org/failures
...
Failures
2015-02-18 10:29:29 +00:00
08f804208b
Merge pull request #79 from matrix-org/get_pdu_limiting
...
Get pdu limiting
2015-02-18 10:29:10 +00:00
ec847059f3
Rename _fail_fetch_pdu_cache to _get_pdu_cache
2015-02-18 10:14:10 +00:00
4fd176a41d
More docs
2015-02-18 10:11:24 +00:00
d77912ff44
Docs.
2015-02-18 10:09:54 +00:00
9371019133
Try to only back off if we think we failed to connect to the remote
2015-02-17 18:13:34 +00:00
649dc8a7e2
Merge branch 'develop' of github.com:matrix-org/synapse into failures
2015-02-17 17:43:14 +00:00
c8436b38a0
Only update destination_retry_timings if we have succeeded when retrying
2015-02-17 17:38:38 +00:00
f91263b1e0
Remove spurious self
2015-02-17 17:37:51 +00:00
1177245e86
Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop
2015-02-17 17:30:11 +00:00
20e3172f38
Merge pull request #75 from matrix-org/dont_write_bytecode
...
Don't write bytecode
2015-02-17 17:29:55 +00:00
58554fa658
Merge branch 'develop' of github.com:matrix-org/synapse into keyclient_retry_scheme
2015-02-17 17:26:46 +00:00
2c29ed3e84
Use absolute path when loading delta sql files
2015-02-17 17:22:24 +00:00
2b8f1a956c
Add per server retry limiting.
...
Factor out the pre destination retry logic from TransactionQueue so it
can be reused in both get_pdu and crypto.keyring
2015-02-17 17:20:56 +00:00
5025305fb2
Rate limit retries when fetching server keys.
2015-02-17 15:57:42 +00:00
1a989c436c
Bump schema version
2015-02-17 15:45:55 +00:00
964bb43fbe
Fix typo in function name
2015-02-17 15:44:41 +00:00
e7e20417ca
ExpiringCache: purge every 1/2 interval
2015-02-17 15:44:26 +00:00
8b919c00f3
Start the get_pdu cache
2015-02-17 15:44:01 +00:00
676e8ee78a
Remove debug raise
2015-02-17 15:22:45 +00:00
08e70231c9
Merge branch 'develop' of github.com:matrix-org/synapse into failures
2015-02-17 15:21:33 +00:00
0647e27a41
Remove unused import
2015-02-17 15:19:54 +00:00
fa6c93bd26
Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop
2015-02-17 15:18:17 +00:00
c02da58a9d
Merge branch 'develop' of github.com:matrix-org/synapse into failures
2015-02-17 15:15:07 +00:00
472734a8cc
Consume errors in time_bound_deferred
2015-02-17 15:13:50 +00:00
4de93001bf
Make matrixfederationclient log more nicely
2015-02-17 15:12:06 +00:00
659ead082f
Format the response of transaction request in a nicer way
2015-02-17 15:11:44 +00:00
c82e26ad4b
Actually respond with JSON to incoming transaction
2015-02-17 13:24:13 +00:00
47281f8fa4
Change some debug logging to info
2015-02-17 13:14:11 +00:00
02bfa889de
Handle recieving failures in transactions
2015-02-17 13:13:14 +00:00
c2b1dbd84c
We do want to consumeError
2015-02-17 11:11:11 +00:00
ea1d6c16cd
Don't write bytecode
2015-02-17 10:54:06 +00:00
72a4de2ce6
Use consumeErrors=True on all DeferredLists.
...
This is so that the DeferredLists actually consume the error instead of
propogating down the non-existent errback chain. This should reduce the
number of unhandled errors we are seeing.
2015-02-17 10:07:01 +00:00
0194e71e99
Merge branch 'develop' of github.com:matrix-org/synapse into get_pdu_limiting
2015-02-17 09:48:23 +00:00
baa5b9a975
Cache results of get_pdu.
2015-02-16 18:02:39 +00:00
2674aeb96a
Factor out ExpiringCache from StateHandler
2015-02-16 16:16:47 +00:00
91fc5eef1d
Mark old events as outliers.
...
This is to fix the issue where if a remote server sends an event
that references a really "old" event, then the local server will pull
that in and send to all clients.
We decide if an event is old if its depth is less than the minimum depth
of the room.
2015-02-16 14:27:40 +00:00
6138584651
Don't return anything from _handle_new_pdu, since we ignore the return value anyway
2015-02-16 14:08:02 +00:00
8a59915d7d
Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop
2015-02-16 09:47:22 +00:00
6dd5c95841
Bump version
2015-02-15 20:38:52 +00:00
b99a33f283
resolve_events expect lists, not dicts
2015-02-15 20:20:51 +00:00
5f68529036
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 16:21:30 +00:00
64def4f953
Merge branch 'hotfixes-0.7.0e' into develop
2015-02-13 16:18:34 +00:00
a78838c5ba
Bump version
2015-02-13 16:17:54 +00:00
8d5cce62ab
Update pushers by app id and pushkey, not user id and pushkey
2015-02-13 16:16:16 +00:00
650dc7f0f9
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 15:46:42 +00:00
be26697b29
Bump version
2015-02-13 15:37:35 +00:00
b11a6e1c3c
Fix wrong variable name
2015-02-13 15:37:18 +00:00
0d872f5aa6
Merge pull request #50 from matrix-org/application-services
...
Application Services
2015-02-13 15:06:14 +00:00
fa662b52d0
Merge pull request #72 from matrix-org/in_memory_sqlite_for_testing
...
Prepare the database whenever a connection is opened from the db_pool so...
2015-02-13 14:42:27 +00:00
183b3d4e47
Prepare the database whenever a connection is opened from the db_pool so that in-memory databases will work
2015-02-13 14:38:24 +00:00
0546126cc5
Bump version
2015-02-13 14:36:40 +00:00
e441c10a73
pyflakes
2015-02-13 14:23:39 +00:00
8c652a2b5f
When we see a difference in current state, actually use state conflict resolution algorithm
2015-02-13 14:20:05 +00:00
6375abcdac
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 13:34:25 +00:00
c09493d7aa
Bump version
2015-02-13 13:33:37 +00:00
74626a8de4
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 10:09:55 +00:00
55e0916ffc
Reindent code to be less human-readable to keep pep8 from complaining
2015-02-12 21:04:34 +00:00
f22646efcc
Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)
2015-02-12 21:01:29 +00:00
789251afa7
Fix logging
2015-02-12 19:29:43 +00:00
38df10b99e
Remove unused function
2015-02-12 19:29:32 +00:00
93d07c87dc
Reindent code to be less human-readable to keep pep8 from complaining
2015-02-12 19:19:37 +00:00
5f6e6530d0
Appease pyflakes
2015-02-12 19:15:23 +00:00
29805213d1
Can now remove the FIXME too
2015-02-12 19:13:21 +00:00
860b1b4841
Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)
2015-02-12 19:13:21 +00:00
58d848adc0
Parrellize fetching of events
2015-02-12 18:35:36 +00:00
963256638d
Correctly handle all the places that can throw exceptions
2015-02-12 18:17:11 +00:00
48fbe79f71
Bump version
2015-02-12 14:52:02 +00:00
6b186a57ba
Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a
2015-02-12 14:51:46 +00:00
717687e1fc
Get an auth query one at a time
2015-02-12 14:39:31 +00:00
a566ed2f0e
Bump webclient version
2015-02-12 10:49:07 +00:00
83d41f25d8
Set database schema version in delta
2015-02-12 10:05:47 +00:00
ff2a2ae56e
Bump version
2015-02-12 10:02:06 +00:00
8bbdf32849
Convert get_rooms to use runInteraction so the transacion has a more helpful description
2015-02-11 18:56:13 +00:00
2bf0e85f3d
Use encode_canonical_json for http client
2015-02-11 17:34:23 +00:00
e9e54449f5
Use encode_canonical_json for pushes
2015-02-11 17:32:42 +00:00
af89456c3c
Update dependency links
2015-02-11 17:15:16 +00:00
c52e8d395b
Merge pull request #61 from matrix-org/timeout-federation-requests
...
Timeout federation requests
2015-02-11 17:10:33 +00:00
021d93db11
Merge pull request #62 from matrix-org/state-chache
...
State chache
2015-02-11 17:10:28 +00:00
a793a0b810
Bump syutil version
2015-02-11 17:02:52 +00:00
42bc56dad3
Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson
2015-02-11 17:01:38 +00:00
9c24cff6ef
Allow newer versions of syutil
2015-02-11 17:00:32 +00:00
7eef84a95b
pyflakes
2015-02-11 16:52:22 +00:00
76935078d1
Remove more debug logging
2015-02-11 16:51:22 +00:00
ed877d6585
Remove debug logging
2015-02-11 16:50:46 +00:00
ef276e8770
Fix so timing out connections to actually work.
2015-02-11 16:48:05 +00:00
f2fdcb7c4b
Merge branch 'develop' into application-services
2015-02-11 16:43:26 +00:00
f518324426
Minor tweaks based on PR feedback.
2015-02-11 16:41:16 +00:00
b164e0896c
Merge branch 'bugs/SYN-264' into develop
2015-02-11 16:23:30 +00:00
7f47ba7383
Added another TODO note
2015-02-11 16:18:21 +00:00
41a9a76a99
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
2015-02-11 16:12:59 +00:00
45b56609ae
Cache the result of a get_rooms_for_user query, to make user_rooms_intersect() much lighter in the read-common case
2015-02-11 16:04:08 +00:00
7be0f6594e
First step of making user_rooms_intersect() faster - implement in intersection logic in Python code terms of a DB query that is cacheable per user
2015-02-11 15:53:56 +00:00
ddb816cf60
Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict
2015-02-11 15:44:28 +00:00
ddc25cf4e2
Invalidate the cache for an event if it is redacted
2015-02-11 15:23:28 +00:00
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
d8324d5a2b
Add a lru cache class
2015-02-11 14:52:23 +00:00
4ebbaf0d43
Blunty replace json with simplejson
2015-02-11 14:23:10 +00:00
14d413752b
Fix newline on __init__
2015-02-11 10:53:47 +00:00
fd40d992ad
PEP8-ify
2015-02-11 10:41:33 +00:00
8beb613916
Add newline to EOF
2015-02-11 10:36:48 +00:00
c7783d6fee
Notify ASes for events sent by other users in a room which an AS user is a part of.
2015-02-11 10:36:08 +00:00
5758dafb4e
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-11 10:35:13 +00:00
6370cffbbf
Fix bug where variable was not always defined
2015-02-11 10:34:41 +00:00
fb233dc40b
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
2015-02-11 10:33:19 +00:00
05b961d7e3
PEP8
2015-02-11 10:28:46 +00:00
dcf52469e8
Move time_bound_deferred into Clock
2015-02-11 10:25:06 +00:00
8c83cc471b
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-11 10:20:43 +00:00
9978c5c103
Merge branch 'develop' into application-services
2015-02-11 10:03:24 +00:00
0e6b3e4e40
Time out HTTP federation requests
2015-02-10 18:17:27 +00:00
5e54365234
Merge branch 'develop' into single_source_version_and_dependencies
2015-02-10 18:13:25 +00:00
84a769cdb7
Fix code-style
2015-02-10 17:58:36 +00:00
7ed971d9b2
Single source version and python dependencies, prevent people accidentally installing with easy_install, use scripts rather than entry_points to install synctl
2015-02-10 17:42:36 +00:00
eae0842bc1
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 17:34:51 +00:00
c8e1da930d
Log all the exits from _attempt_new_transaction
2015-02-10 17:30:46 +00:00
b61a308b27
Bump version
2015-02-10 16:37:12 +00:00
e8d4a31475
Fix prune_events to work with nested dicts
2015-02-10 16:36:51 +00:00
b085fac735
Code-style fixes
2015-02-10 16:30:48 +00:00
093e34e301
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 15:46:48 +00:00
697ab75a34
Sign auth_chains when returned by /state/ requests
2015-02-10 15:46:24 +00:00
f8abbae99f
Remove unnecessary logging
2015-02-10 15:45:50 +00:00
794fe2ca45
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 15:23:08 +00:00
f88d3ee8ae
Merge pull request #58 from matrix-org/get_event_counters
...
Add performance counters for different stages of loading events
2015-02-10 15:15:20 +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
91f0e41153
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 14:30:26 +00:00
f91345bdb5
yaml.load expects strings to be a yaml rather than file
2015-02-10 13:57:31 +00:00
30595b466f
Use yaml logging config format because it is much nicer
2015-02-10 13:50:33 +00:00
c86ebe7673
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
...
Conflicts:
synapse/app/homeserver.py
synapse/state.py
2015-02-10 11:04:37 +00:00
2b042ad67f
Oops, we do want to defer.return regardless of whether we are caching or not
2015-02-10 11:03:16 +00:00
d19e2ed02f
Move construction of object within if block
2015-02-10 11:01:15 +00:00
b90d377af4
Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop
2015-02-10 10:33:35 +00:00
8ce100c7b4
Convert directory paths to absolute paths before daemonizing
2015-02-09 18:30:00 +00:00
5c5f5c1f0e
Merge pull request #56 from matrix-org/room_initial_sync_perf
...
During room intial sync, only calculate current state once.
2015-02-09 18:09:30 +00:00
375eba6a18
Merge pull request #57 from matrix-org/transaction_counters
...
Transaction counters
2015-02-09 18:08:08 +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
d94f682a4c
During room intial sync, only calculate current state once.
2015-02-09 17:41:29 +00:00
8f616684a3
Need to use re.search if looking for matches not at the start of the string. Also comparisons with None should be 'is'.
2015-02-09 17:01:40 +00:00
0b725f5c4f
oops
2015-02-09 16:48:31 +00:00
bd2373277d
oops
2015-02-09 16:48:09 +00:00
a578251b48
only do word-boundary patches on bodies for now
2015-02-09 16:44:47 +00:00
53557fc532
Merge branch 'develop' into application-services
2015-02-09 15:20:56 +00:00
f7cac2f7b6
Fix bugs so lazy room joining works as intended.
2015-02-09 15:01:28 +00:00
76c5a5c2f6
Merge pull request #55 from matrix-org/profiling
...
Profiling
2015-02-09 15:01:26 +00:00
c4ee4ce93e
Fix typo
2015-02-09 15:00:37 +00:00
ef995e6946
Add looping_call to Clock
2015-02-09 14:47:59 +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
784d714a3f
Fix server default rule injection (downwards, not upwards!)
2015-02-09 14:17: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
24cc6979fb
Log when we receive a request, when we send a response and how long it took to process it.
2015-02-09 13:46:22 +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
ecb0f78063
glob *s should probably be non-greedy
2015-02-08 02:37:35 +00:00
c2afc2ad90
oops
2015-02-08 00:37:03 +00:00
8be07e0db4
kill off fnmatch in favour of word-boundary based push alerts (untested)
2015-02-08 00:34:34 +00:00
37b6b880ef
don't give up if we can't create default avatars during tests
2015-02-07 21:24:08 +00:00
582019f870
...and here's the actual impl. git fail.
2015-02-07 13:32:14 +00:00
e117bc3fc5
thou shalt specify a content-length
2015-02-07 12:56:21 +00:00
34c39398fa
i hate weakly typed languages
2015-02-07 12:55:13 +00:00
73a680b2a8
Add errcodes for appservice registrations.
2015-02-06 17:10:04 +00:00
af613824e4
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-06 16:59:00 +00:00
5bf318e9a6
Bug fixes.
2015-02-06 16:52:22 +00:00
b4886264a3
Bugfix cache layer
2015-02-06 16:17:05 +00:00
c4e3029d55
Add cache layer to state group resolution
2015-02-06 16:08:13 +00:00
20db147ef3
SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room
2015-02-06 16:01:04 +00:00
55a186485c
SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room
2015-02-06 15:58:40 +00:00
cc0532a4bf
Explicitly list the RejectedReasons that we can prove
2015-02-06 15:16:26 +00:00
0cd66885e3
Move delta/v13.sql to delta/v12.sql
2015-02-06 14:38:04 +00:00
e890ce223c
Don't query auth if the only difference is events that were rejected due to auth.
2015-02-06 14:16:50 +00:00
c78b5fb1f1
Make seen_ids a set
2015-02-06 13:52:16 +00:00
0995810273
Pyflakes: unused variable.
2015-02-06 11:45:19 +00:00
c3ae8def75
Grant ASes the ability to delete aliases in their own namespace.
2015-02-06 11:32:07 +00:00
e426df8e10
Grant ASes the ability to create alias in their own namespace.
...
Add a new errcode type M_EXCLUSIVE when users try to create aliases inside
AS namespaces, and when ASes try to create aliases outside their own
namespace.
2015-02-06 10:57:14 +00:00
9f2573eea1
Return body of response in HttpResponseException
2015-02-06 10:55:01 +00:00
3737329d9b
Handle the fact the list.remove raises if element doesn't exist
2015-02-06 10:53:18 +00:00
0227618d3c
Add m.login.application_service registration procedure.
...
This allows known application services to register any user ID under their
own user namespace(s).
2015-02-05 17:29:27 +00:00
11e6b3d18b
Dependency inject ApplicationServiceApi when creating ApplicationServicesHandler.
2015-02-05 17:04:59 +00:00
a3c6010718
Add delta sql file.
2015-02-05 16:48:57 +00:00
cab4c73088
Prevent user IDs in AS namespaces being created/deleted by humans.
2015-02-05 16:46:56 +00:00
e9484d6a95
Prevent aliases in AS namespaces being created/deleted by users. Check with ASes when queried for room aliases via federation.
2015-02-05 16:29:56 +00:00
c20281ee33
Merge branch 'develop' into application-services
2015-02-05 16:11:34 +00:00
a93fa42bce
priority class now dealt with in namespaced rule_id
2015-02-05 15:45:16 +00:00
fc8bcc809d
Merge branch 'develop' into application-services
2015-02-05 15:32:45 +00:00
5b99b471b2
Fix unit tests.
2015-02-05 15:12:36 +00:00
aaf50bf6f3
Give server default rules the 'default' attribute and fix various brokenness.
2015-02-05 15:11:38 +00:00
c163357f38
Add CS extension for masquerading as users within the namespaces specified by the AS.
2015-02-05 15:00:33 +00:00
2df41aa138
Server default rules now of all kinds rather than all being at lowest prio.
2015-02-05 14:46:37 +00:00
f90782a658
namespace rule IDs to be unique within their scope and rule type.
2015-02-05 14:46:37 +00:00
951690e54d
Merge branch 'develop' into application-services
2015-02-05 14:28:03 +00:00
c71456117d
Fix user query checks. HS>AS pushing now works.
2015-02-05 14:17:08 +00:00
8f5b858a1b
Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries
2015-02-05 13:50:28 +00:00
e9c85a4d5a
Connection errors in twisted aren't RuntimeErrors
2015-02-05 13:50:15 +00:00
e1515c3e91
Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts
2015-02-05 13:44:42 +00:00
0613666d9c
Serialize events before sending to ASes
2015-02-05 13:42:35 +00:00
51d63ac329
Glue AS work to general event notifications. Add more exception handling when poking ASes.
2015-02-05 13:19:46 +00:00
26a041541b
SYN-202: Log as WARN the 404 'Presence information not visible' errors instead of as ERROR since they were spamming the logs
2015-02-05 13:17:05 +00:00
b932600653
Add unknown room alias check. Call it from directory_handler.get_association
2015-02-05 11:47:11 +00:00
f0c730252f
Add unknown user ID check. Use store.get_aliases_for_room(room_id) when searching for services by alias.
2015-02-05 11:25:32 +00:00
27091f146a
Add hs_token column and generate a different token f.e application service.
2015-02-05 10:08:12 +00:00
a1a4960baf
Impl push_bulk function
2015-02-05 09:43:22 +00:00
77e5ae22a9
Ver bump
2015-02-04 23:51:34 +00:00
19ebdc321d
Pull in python_dependencies.py from develop
2015-02-04 23:51:02 +00:00
543e84fe70
Add SimpleHttpClient.put_json with the same semantics as get_json.
2015-02-04 17:39:51 +00:00
8046df6efa
Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries
2015-02-04 17:37:34 +00:00
6d3e4f4d0a
Update user/alias query APIs to use new format of SimpleHttpClient.get_json
2015-02-04 17:32:44 +00:00
96d4bf9012
Modify API for SimpleHttpClient.get_json and update usages.
...
Previously, this would only return the HTTP body as JSON, and discard other
response information (e.g. the HTTP response code). This has now been changed
to throw a CodeMessageException on a non-2xx response, with the response code
and body, which can then be parsed as JSON.
Affected modules include:
- Registration/Login (when using an email for IS auth)
2015-02-04 17:07:31 +00:00
aa8cce58bf
Add query_user/alias APIs.
2015-02-04 16:44:53 +00:00
d45e2302ed
Merge branch 'signature_failures' of github.com:matrix-org/synapse into federation_client_retries
2015-02-04 16:30:15 +00:00
ae46f10fc5
Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations
2015-02-04 16:28:12 +00:00
2e77ba637a
More s/instance_handle/profile_tag/
2015-02-04 16:24:15 +00:00
ce8bc642ae
Merge branch 'develop' into application-services
2015-02-04 15:31:02 +00:00
89f2e8fbdf
Fix bug in store defer. Add more unit tests.
2015-02-04 15:21:03 +00:00
95e2d2d36d
When returning lists of servers from alias lookups, put the current server first in the list
2015-02-04 15:02:23 +00:00
650e32d455
Change context.auth_events to what the auth_events would be bases on context.current_state, rather than based on the auth_events from the event.
2015-02-04 14:06:46 +00:00
ff78eded01
Retry make_join
2015-02-04 13:55:10 +00:00
525a218b2b
Begin to add unit tests for appservice glue and regex testing.
2015-02-04 12:24:20 +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
f275ba49bb
Fix state resolution to remember join_rules is a type of auth event.
2015-02-04 10:36:28 +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
3c39f42a05
New line
2015-02-03 16:14:19 +00:00
7dd1c5c542
Neaten the handling of state and auth_chain up a bit
2015-02-03 16:12:04 +00:00
9a71add1c0
Use set_tweak instead of set_sound
2015-02-03 16:06:31 +00:00
9bace3a367
Actually, the old prune_event function was non-deterministic, so no point keeping it around :(
2015-02-03 15:32:17 +00:00
8dae5c8108
Remove unused imports
2015-02-03 15:01:12 +00:00
7b810e136e
Add new FederationBase
2015-02-03 15:00:42 +00:00
0dd3aea319
Keep around the old (buggy) version of the prune_event function so that we can use it to check signatures for events on old servers
2015-02-03 14:58:30 +00:00
94a5db9f4d
Add appservice package and move ApplicationService into it.
2015-02-03 14:44:16 +00:00
6efd4d1649
Don't completely die if get auth_chain or querying auth_chain requests fail
2015-02-03 13:57:54 +00:00
77a076bd25
Set combinations is | and not +
2015-02-03 13:35:17 +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
fed29251d7
Spelling
2015-02-03 13:23:58 +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
06c34bfbae
Give exception better message
2015-02-03 11:23:44 +00:00
4ff2273b30
Add FIXME note.
2015-02-03 11:23:26 +00:00
0f48e22ef6
PEP8
2015-02-03 10:43:29 +00:00
51969f9e5f
Return rejected events if asked for it over federation.
2015-02-03 10:40:14 +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
09601255f5
Merge pull request #46 from matrix-org/identicons
...
Add a media/v1/identicon resource for generating identicons
2015-02-02 18:56:34 +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
a2da04b8ab
Add pydenticon to python_dependencies
2015-02-02 17:37:26 +00:00
4574b5a9e6
Generate a list of dependencies from synapse/python_dependencies.py
2015-02-02 17:23:51 +00:00
40c6fe1b81
Don't bother requesting PDUs with bad signatures from the same server
2015-02-02 17:06:37 +00:00
1bb0528316
Add Cache-Control header to identicon
2015-02-02 16:57:26 +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
f2eda123b7
Fix setting identicon width and height
2015-02-02 16:32:33 +00:00
038f5afb07
Spell height more correctly
2015-02-02 16:29:18 +00:00
a006d168c5
Actually merge into develop.
2015-02-02 16:05:34 +00:00
22c1ffb0a0
Add a media/v1/identicon resource for generating identicons using pydenticon
2015-02-02 16:02:31 +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
6e856d7729
Merge master into develop
...
Conflicts:
README.rst
setup.py
2015-02-02 14:05:42 +00:00
d8cf06e525
Bump version to 0.6.1d
2015-02-02 13:18:36 +00:00
3b33529dfd
Bump version
2015-02-02 13:03:25 +00:00
365e007bee
Ignore empty strings for display names & room names in notifications
2015-01-31 12:48:06 +00:00
0b354fcb84
Again, don't assume all member events have displayname.
2015-01-30 23:10:35 +00:00
fe10b882b7
Don't assume all member events have a display nme.
2015-01-30 23:06:39 +00:00
4c0da49d7c
Resign events when we return them via /query_auth/
2015-01-30 22:53:13 +00:00
0b1cc7cc0b
Return empty list rather than None when there are no emphemeral events for a room
2015-01-30 16:56:13 +00:00
2cd29dbdd9
Fix bug where accepting invite over federation didn't work. Add logging.
2015-01-30 16:51:58 +00:00
7d897f5bfc
Merge pull request #43 from matrix-org/rejections
...
Rejections
2015-01-30 16:11:14 +00:00
776ac820f9
Briefly doc structure of query_auth API.
2015-01-30 15:58:28 +00:00
b724a809c4
Only auth_events with event if event in event.auth_events
2015-01-30 15:57:53 +00:00
7a1e881665
Remove debug logging
2015-01-30 15:56:32 +00:00
b4b892f4a3
Spit out server default rules too.
2015-01-30 15:54:51 +00:00
6dc92d3427
Merge pull request #41 from matrix-org/client_v2_sync
...
Client v2 sync
2015-01-30 15:54:25 +00:00
017dfaef4c
Add doc string for __nonzero__ overrides for sync results, raise not implemented if the client attempts to do a gapless sync
2015-01-30 15:52:05 +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
4ffac34a64
Add glob asterisks when running rules.
...
Means that now you can't do exact matches even in override rules,
but I think we can live with that. Advantage is that you'll now
always get back what was put in to the API.
2015-01-30 15:03:56 +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
3d7026e709
Add a slightly more helpful comment
2015-01-30 14:37:31 +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
2aaedab203
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
2015-01-30 14:09:32 +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
875a481a1e
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
2015-01-30 14:04:53 +00:00
7a9f6f083e
Remove commented line
2015-01-30 13:55:46 +00:00
76d7fd39cd
Style changes.
2015-01-30 13:52:02 +00:00
8fe39a0311
Check if the user has joined the room between incremental syncs
2015-01-30 13:38:34 +00:00
a70a801184
Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.
2015-01-30 13:34:01 +00:00
4a67834bc8
Pass client info to the sync_config
2015-01-30 11:50:15 +00:00
c562f237f6
Unused import
2015-01-30 11:43:00 +00:00
8498d348d8
Fix token formatting
2015-01-30 11:42:09 +00:00
e97de6d96a
Filter the recent events before applying the limit when doing an initial sync
2015-01-30 11:35:20 +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
2c9e136d57
Fix bad merge fo python_dependencies.py
2015-01-30 11:14:33 +00:00
bd03947c05
We do need Twisted 14, not 15: we use internal Twisted things that have been removed in 15.
2015-01-30 11:13:42 +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
0c2d245fdf
Update the current state of an event if we update auth events.
2015-01-30 11:08:52 +00:00
823999716e
Fix bug in timeout handling in keyclient
2015-01-30 11:08:01 +00:00
c1d860870b
Fix regression where we no longer correctly handled the case of gaps in our event graph
2015-01-30 10:48:47 +00:00
c1c7b39827
Fix bug where we changes in outlier in metadata dict propogated to other events
2015-01-30 10:30:54 +00:00
fc946f3b8d
Include content in notification pokes
2015-01-29 21:59:17 +00:00
0b16886397
Change 'from' in notification pokes to 'sender' to match client API v2. Send sender display names where they exist.
2015-01-29 18:51:22 +00:00
1235f7f383
Add default push rules including setting a sound for messages mentioning your username / display name
2015-01-29 18:38:22 +00:00
ece828a7b7
Update todo for the filtering on sync
2015-01-29 18:15:24 +00:00
365a186729
Add basic filtering support
2015-01-29 18:11:28 +00:00
7ceda8bf3d
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 18:04:07 +00:00
93ed31dda2
Create a separate filter object to do the actual filtering, so that we can
...
split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event
2015-01-29 17:45:07 +00:00
4bdfce30d7
Renumber priority classes so we can use 0 for defaults.
2015-01-29 17:12:11 +00:00
e0d2c6889b
Allow kind to be set to null to delete a pusher.
2015-01-29 17:05:00 +00:00
78015948a7
Initial implementation of auth conflict resolution
2015-01-29 16:52:33 +00:00
4ad45f2582
Fix indent
2015-01-29 16:41:49 +00:00
722b65f461
Move typing notifs to an "emphermal" event list on the room object
2015-01-29 16:41:21 +00:00
cc42d3f907
Fix check for empty room update
2015-01-29 16:27:38 +00:00
4d9dd9bdc0
Fix v2 initial sync
2015-01-29 16:23:03 +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
8b1dd9f57f
Only send a badge-reset if the user actually has unread notifications.
2015-01-29 16:10:01 +00:00
9150a0d62e
Fix code-style
2015-01-29 16:01:14 +00:00
cf7c54ec93
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 15:55:58 +00:00
33391db5f8
Merge in auth changes from develop
2015-01-29 15:54:54 +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
5a3a15f5c1
Make post_json(...) actually send data.
2015-01-29 13:58:22 +00:00
c183cec8f6
Add post_json(...) method to federation client
2015-01-29 13:44:52 +00:00
83172487b0
Add basic filtering public API unit tests. Use defers in the right places.
2015-01-29 12:20:59 +00:00
777d9914b5
Implement filter algorithm. Add basic event type unit tests to assert it works.
2015-01-29 11:38:06 +00:00
50de1eaad9
Add filtering public API; outline filtering algorithm.
2015-01-29 10:24:57 +00:00
2a4fda7b88
Add filtering.filter_events function, with stub passes_filter function.
2015-01-29 09:27:16 +00:00
3773759c0f
Also edit the filter column on the delta SQL
2015-01-29 09:15:33 +00:00
e3e72b8c5c
Remove typing TODO
2015-01-29 03:35:25 +00:00
3dbce6f4a5
Add typing notifications to sync
2015-01-29 03:33:51 +00:00
b9c442c85c
Include transaction ids in unsigned section of events in the sync results for the clients that made those requests
2015-01-29 02:46:00 +00:00
1b4a164c02
Add support for formatting events in the way a v2 client expects
2015-01-29 02:34:35 +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
8552ed8df2
Change uses of get_user_by_req because it returns a tuple now.
2015-01-28 18:04:40 +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
c81a19552f
Add ports back to demo/start.sh
2015-01-28 17:32:49 +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
3cca61e006
Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier
2015-01-28 17:16:12 +00:00
c18e551640
Add a : to the doc string after the type of the return value
2015-01-28 17:08:53 +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
6840e7cece
Merge branch 'master' into develop
2015-01-28 16:03:35 +00:00
60b143a52e
Move pushers delta to v12 and bump schema version
2015-01-28 15:48:28 +00:00
c59bcabf0b
Return the device_id from get_auth_by_req
2015-01-28 15:43:41 +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
2cfdfee572
spaces
2015-01-28 14:41:51 +00:00
289a249874
Unnecessary newlines.
2015-01-28 14:39:03 +00:00
3cb5b73c0d
Unnecessary newline.
2015-01-28 14:37:55 +00:00
8807f4170e
Better style
2015-01-28 14:35:00 +00:00
032f8d4ed3
Another superfluous newline
2015-01-28 14:33:15 +00:00
d93ce29a86
Ah, the comma of doom.
2015-01-28 14:27:01 +00:00
6741c3dbd9
Brackets are nicer
2015-01-28 14:26:03 +00:00
4fbf2328c2
Unnecessary new line
2015-01-28 14:24:28 +00:00
30fbba168b
Easy on the newlines
2015-01-28 14:23:16 +00:00
dd3abbd61f
2015
2015-01-28 14:22:39 +00:00
6fde707add
doc style fix
2015-01-28 14:14:49 +00:00
5f2665320f
It is 2015
2015-01-28 14:11:45 +00:00
20c47383dc
Oops, bad merge: needed to change the base class of the rest servlets too.
2015-01-28 14:10:46 +00:00
03149ad23a
More code style things
2015-01-28 14:01:24 +00:00
e1ca0f1396
Brackets rather than slashes at end
2015-01-28 13:58:32 +00:00
6df6f5e084
Redundant bracketing & missed space
2015-01-28 13:56:35 +00:00
ca7240a2f0
Update copyright
2015-01-28 13:17:55 +00:00
fb532d8425
Unused import
2015-01-28 13:06:09 +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
273b12729b
Reset badge count to zero when last active time is bumped
2015-01-28 11:55:49 +00:00
e32ded7b3e
Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).
2015-01-28 10:09:54 +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
b19cf6a105
Wait for events if the incremental sync is empty and a timeout is given
2015-01-27 20:09:52 +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
059651efa1
Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely
2015-01-27 16:17:56 +00:00
f7c4daa8f9
Oops, remove debugging
2015-01-27 16:08:47 +00:00
5eacaeb4a7
or of course we could just return the deferred
2015-01-27 16:05:23 +00:00
eba89f093f
Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed.
2015-01-27 16:00:07 +00:00
1d77969124
Unbreak bad presence merge - don't add these blocks together with an and: they're different things.
2015-01-27 15:58:27 +00:00
51449e0665
Add appservice handler and store. Glue together rest > handler > store.
2015-01-27 15:50:28 +00:00
6efdc11cc8
Parse /register and /unregister request JSON.
2015-01-27 15:03:19 +00:00
05c7cba73a
Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
2015-01-27 14:28:56 +00:00
fa8e6ff900
Add stub application services REST API.
2015-01-27 14:01:51 +00:00
0484d7f6e9
Merge branch 'develop' into client_v2_filter
2015-01-27 13:11:03 +00:00
436513068d
Start implementing the non-incremental sync portion of the v2 /sync API
2015-01-26 18:53:31 +00:00
b481889117
Support membership events and more camelcase/underscores
2015-01-26 17:27:28 +00:00
69a75b7ebe
Add brackets to make get room name / alias work
2015-01-26 16:52:47 +00:00
3186c5bdbc
Merge branch 'develop' into client_v2_sync
2015-01-26 16:32:40 +00:00
e5725eb3b9
Remove unused import from server.py
2015-01-26 16:16:50 +00:00
7f6f3f9d62
Pass the current time to serialize event, rather than passing an
...
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
2015-01-26 16:11:28 +00:00
0cfb4591a7
Add handler for /sync API
2015-01-26 15:46:31 +00:00
efac71d6ca
Pushers should only try & look for rejected devices in something that's a list or tuple.
2015-01-26 14:37:14 +00:00
8d7accb28f
Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no actual filter implementation
2015-01-26 14:33:30 +00:00
c92d64a6c3
Make it the responsibility of the replication layer to check signature and hashes.
2015-01-26 14:33:11 +00:00
14ff33bd93
Merge branch 'develop' into client_v2_sync
...
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
2015-01-26 13:14:59 +00:00
7b88619241
Split up replication_layer module into client, server and transaction queue
2015-01-26 10:45:24 +00:00
7b814d3f7f
Add client v2_alpha resource to synapse server resource tree
2015-01-23 18:55:19 +00:00
2b1799883d
Add client v2_alpha resource to synapse server resource tree
2015-01-23 18:49:05 +00:00
e26340cee7
Start implementing the v2_alpha sync API
2015-01-23 18:48:17 +00:00
85419e1257
Stop complaining about Synapse Angular SDK 0.6.1
2015-01-23 18:37:37 +00:00
5f84ba8ea1
Add API to delete push rules.
2015-01-23 17:49:37 +00:00
f21f9fa3c5
Use push settings!
2015-01-23 17:07:06 +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
e0bf18addf
Add RestServlet base class in synapse/http/servlet.py
2015-01-23 14:16:28 +00:00
4be637cb12
Extract the client v1 base RestServlet to a separate class
2015-01-23 14:09:51 +00:00
fc7a05c443
more pep8 suggestions
2015-01-23 13:36:01 +00:00
b3f66ea6fb
more pep8
2015-01-23 13:28:00 +00:00
d3e72b4d87
Make string format tuple an actual tuple
2015-01-23 13:25:58 +00:00
98e1080555
redundant parens
2015-01-23 13:25:36 +00:00
54c689c819
stray space
2015-01-23 13:25:14 +00:00
c4652d7772
Remove hs.parse_eventid
2015-01-23 13:25:07 +00:00
6188c4f69c
make per-device rules work
2015-01-23 13:23:10 +00:00
ada711504e
Replace hs.parse_roomalias with RoomAlias.from_string
2015-01-23 13:21:58 +00:00
1c06c48ce2
Replace hs.parse_roomid with RoomID.from_string
2015-01-23 11:55:12 +00:00
5759bec43c
Replace hs.parse_userid with UserID.from_string
2015-01-23 11:47:15 +00:00
49fe31792b
Add slightly pedantic trailing slash error.
2015-01-23 11:19:02 +00:00
7256def8e4
Merge rest servlets into the client json resource object
2015-01-23 10:37:38 +00:00
f87586e661
right super() param
2015-01-23 10:32:40 +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
6927b6b197
This really serves me right for ever making a map called 'map'.
2015-01-23 10:21:47 +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
ca65a9d03e
Split out TransactionQueue from replication layer
2015-01-22 16:37:08 +00:00
97c68c508d
Move rest APIs back under the rest directory
2015-01-22 16:10:07 +00:00
c2f9768740
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections
2015-01-22 15:57:26 +00:00
73dd81ca62
fix pyflakes
2015-01-22 15:57:08 +00:00
b1b85753d7
Add support for storing rejected events in EventContext and data stores
2015-01-22 15:50:17 +00:00
1d2016b4a8
Move client v1 api rest servlets into a "client/v1" directory
2015-01-22 14:59:08 +00:00
7f058c5ff7
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
...
Conflicts:
synapse/app/homeserver.py
2015-01-22 13:35:34 +00:00
b390bf39f2
Remove unused function. Add comment.
2015-01-21 16:44:04 +00:00
6dcade97be
Implement new state resolution algorithm
2015-01-21 16:27:04 +00:00
5d5932d493
use underscores everywhere, not camelcase.
2015-01-20 11:52:08 +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
dc70d1fef8
Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have
2015-01-19 16:24:54 +00:00
42529cbced
Fix pyflakes errors
2015-01-19 15:33:04 +00:00
00e9c08609
Fix syntax
2015-01-19 15:30:48 +00:00
3e85e52b3f
Allow ':memory:' as the database path for sqlite3
2015-01-19 15:26:19 +00:00
5fed042640
Finish renaming "context" to "room_id" in federation codebase
2015-01-16 19:01:03 +00:00
2408c4b0a4
Fold _do_request_for_transaction into the methods that called it since it was a trivial wrapper around client.get_json
2015-01-16 19:01:03 +00:00
602684eac5
Split transport layer into client and server parts
2015-01-16 19:01:03 +00:00
2bdee98269
Remove temporary debug logging that was accidentally committed
2015-01-16 19:00:40 +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
e3e2fc3255
Don't make the pushers' event streams cause people to appear online
2015-01-15 16:17:21 +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
34a5fbe2b7
Have /join/:room_id return the room ID in response anyway, for consistency of clients (SYN-234)
2015-01-13 17:29:24 +00:00
c2e7c84e58
Don't try to cancel already-expired timers - SYN-230
2015-01-13 16:58:36 +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
70d0a453f3
Split out function to decide whether to notify or a given event
2015-01-13 13:14:41 +00:00
38e3241eb7
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
2015-01-13 10:01:22 +00:00
1d3d37937d
Bump version
2015-01-13 09:59:47 +00:00
39585bf556
Insert 'age' into top level when returning events to clients
2015-01-13 09:57:32 +00:00
02ffbb20d0
Use float rather than integer divisions to turn msec into sec - so timeouts under 1000msec will actually work
2015-01-12 19:09:14 +00:00
67d8305aea
Make typing notification timeouts print a (debug) logging message
2015-01-12 18:22:00 +00:00
c43d898119
SYN-178: Fix off by one.
2015-01-12 17:38:40 +00:00
63403aa7a5
Check the existance and versions of necessary modules when starting synapse, log which modules are used
2015-01-08 17:08:57 +00:00
9d0dcf2e3c
SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with 100MB/file for now.
2015-01-08 15:31:29 +00:00
7f83613733
make our JPEG thumbnail quality less horrifically ugly
2015-01-08 15:11:22 +00:00
b5924cae04
Add raw query param for scrollback.
2015-01-08 14:37:55 +00:00
379a653ae3
Add better help message for --server-name config option.
2015-01-08 14:32:53 +00:00
edb557b2ad
Return the raw federation event rather than adding extra keys for federation data.
2015-01-08 14:28:08 +00:00
5940ec993b
Add missing continuation indent.
2015-01-08 13:59:29 +00:00
5720ab59e0
Add 'raw' query parameter to expose the event graph and signatures to savvy clients.
2015-01-08 13:57:40 +00:00
8ac9199f56
Merge branch 'master' into develop
2015-01-08 09:43:48 +00:00
5a0e687d5c
Bump version
2015-01-08 09:42:23 +00:00
c9d2cecac9
SYN-231: User agent header broken
2015-01-08 09:41:11 +00:00
42507b0011
Log server version on startup
2015-01-07 17:25:28 +00:00
76e1565200
Change error message for missing pillow libs.
2015-01-07 17:11:19 +00:00
333836ff92
PEP8 and pyflakes warnings
2015-01-07 16:18:12 +00:00
4c68460392
SYN-154: Tweak how the m.room.create check is done.
...
Don't perform the check in auth.is_host_in_room but instead do it in _do_join
and also assert that there are no m.room.members in the room before doing so.
2015-01-07 16:09:00 +00:00
9cb4f75d53
SYN-154: Better error messages when joining an unknown room by ID.
...
The simple fix doesn't work here because room creation also involves
unknown room IDs. The check relies on the presence of m.room.create for
rooms being created, whereas bogus room IDs have no state events at all.
2015-01-07 15:21:48 +00:00
9b8e348b15
*cough*
2015-01-07 15:08:32 +00:00
89fc09c3d1
Bump version and changelog
2015-01-07 13:56:56 +00:00
82be4457de
Add twisted Service interface
2015-01-07 13:46:37 +00:00
a039e2544c
Remove unused import
2015-01-07 09:48:03 +00:00
1497e50649
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
2015-01-07 09:40:42 +00:00
5cf45c4319
Merge branch 'master' into develop
2015-01-06 19:48:53 +00:00
dfa05f0cd6
Optimize FrozenEvent creation
2015-01-06 18:51:03 +00:00
36a2a877e2
Use time.time() instead of time.clock()
2015-01-06 16:34:41 +00:00
d5ae67e67d
Fix typo where we used wrong var.
2015-01-06 16:05:01 +00:00
fd9a8db7ea
Only fetch the columns we need.
2015-01-06 15:59:31 +00:00
9e5545a6fa
RoomsForUser now has sender instead of user_id
2015-01-06 15:53:50 +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
bc2ec808f4
SYN-32 Use the ANTIALIAS resize method for thumbnailing images
2015-01-06 14:14:17 +00:00
0529a7e2e9
Add some logging for when we are sending transactions.
2015-01-06 14:06:25 +00:00
b9f77d1ae1
Increase default maximum attachment size to 10M
2015-01-06 14:04:58 +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
773de09774
Set a content-length for JSON responses
2015-01-06 13:05:19 +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
78edb47cc5
SYN-208/SYN-228: Add runtime checks on startup to enforce that JPEG/PNG support is included when installing pillow.
2015-01-06 11:43:04 +00:00
3c8c3bf3b7
SYN-229: Include Content-Length when downloading files
2015-01-06 11:32:36 +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
96a5ba41f5
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
2015-01-06 10:53:04 +00:00
90d60e3fe4
Merge branch 'hotfixes-v0.6.0a'
2014-12-29 14:01:07 +00:00
af61c29527
Return the argument passed to the callback in a deferred callback, otherwise twisted will replace the deferred result with 'None'
2014-12-29 13:54:05 +00:00
407c299828
improve error msg
2014-12-24 17:50:42 +00:00
24b5d01853
Include version in User-Agent and Server headers
2014-12-22 10:16:02 +00:00
74ee4048c2
Merge branch 'master' of github.com:matrix-org/synapse into erikj-perf
2014-12-21 11:47:45 +00:00
67a406a754
Rate limit display names and avatar urls per request rather than per event.
2014-12-19 17:36:33 +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
efd27ff01b
Set a state_key for the topic and room name, otherwise they won't be treated as room state
2014-12-19 15:31:27 +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
f70e622d59
bump_presence_active_time when sending a message event
2014-12-19 14:30:57 +00:00
a999f0dec3
Don't ratelimit room create events
2014-12-19 14:18:27 +00:00
1e7f83b91d
Set display name when joining via alias
2014-12-19 12:31:46 +00:00
5dbe820e9a
Remove unneeded federation keys from events
2014-12-19 12:16:26 +00:00
390e48a8b0
SYN-203: Handle requests for thunbnails for images that are small
2014-12-19 12:05:38 +00:00
5739e6c606
s/user_id/sender/
2014-12-19 11:43:46 +00:00
41ce544abe
Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
2014-12-18 18:57:21 +00:00
041ac476a5
Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them
2014-12-18 18:47:13 +00:00
fead431c18
If we didn't get any events, advance the token or we'll just keep not getting the same events again.
2014-12-18 18:44:33 +00:00
dbe77ec79a
Replace distributor deferred list, with a simple for loop until I understand why the former breaks and the latter doesn't
2014-12-18 17:47:00 +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
dea5d4b03b
Don't yield on sending the event accross federation.
2014-12-18 11:29:46 +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
21cab3a7ec
Fix where we pulled in event.state_events from hotfixes branch
2014-12-16 19:16:15 +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
3defd5b3ee
Add FIXME
2014-12-16 19:07:20 +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
2d7716d4d0
Make error messages slightly more helpful
2014-12-16 18:41:48 +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
4dcad143dd
SYN-142: Use a default log file 'homeserver.log' so people get logging by default.
2014-12-16 17:24:49 +00:00
f06161a307
Enable rate limiting for all events
2014-12-16 16:10:17 +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
23da4a4051
Fix typo where we thought a list was a dict
2014-12-16 15:59:40 +00:00
c3eae8a88c
Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state
2014-12-16 15:59:17 +00:00
3c7857e49b
clean up coding style a bit
2014-12-16 15:24:03 +00:00
42b725ce52
Fix upgrade script to run all the missing deltas.
2014-12-16 15:13:34 +00:00
8b8beba194
Remove annotate_event_with_state as nothing was using it. Update state tests to call annotate_context_with_state
2014-12-16 15:08:37 +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
96cc7c8740
Bump version
2014-12-16 13:57:27 +00:00
5a465b67ba
Fix pyflakes
2014-12-16 13:41:43 +00:00
58168498b0
Remove FrozenEncoder
2014-12-16 13:38:38 +00:00
8133cdcc88
Better english in docstrings are helpful.
2014-12-16 13:32:06 +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
4afac88390
Add basic docstring to annotate_context_with_state
2014-12-16 13:09:44 +00:00
3c77d13aa5
Kill off synapse.api.events.*
2014-12-16 11:29:05 +00:00
6a1da99fab
Add fixme to raising of AuthError in federation land
2014-12-16 09:35:31 +00:00
65b2e49429
Fix pyflakes
2014-12-15 17:35:37 +00:00
9c49054f1d
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
2014-12-15 17:33:23 +00:00
f280929a12
Use frozenutils
2014-12-15 17:31:36 +00:00
009e4b5637
User.is_mine is no longer a thing. Use hs.is_mine instead.
2014-12-15 17:17:51 +00:00
cf6e5f1dbf
Rename MessageHandler.handle_event. Add a few comments.
2014-12-15 17:01:12 +00:00
67c9585656
Update media_repository.py
...
_ not -
2014-12-15 16:57:53 +00:00
670dcdfc14
Remove unused functions
2014-12-15 16:16:58 +00:00
0c1deca574
Remember to hook up the typing event stream to the notifier as well
2014-12-15 16:14:53 +00:00
b75adaedca
Finish up upgrade script
2014-12-15 16:14:34 +00:00
65cdf4e724
Get current member state from current_state snapshot. Fix leave test.
2014-12-15 15:03:27 +00:00
57e0e619f3
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
...
Conflicts:
tests/handlers/test_room.py
2014-12-15 14:45:59 +00:00
20beed9dd4
Still send typing notifications to myself if I'm the only one in the room (it's a lonely life...)
2014-12-15 14:37:12 +00:00
3610641a62
Update docs in media_repository
2014-12-15 13:56:43 +00:00
c8dd3314d6
Fix bug where we ignored event_edge_hashes table
2014-12-15 13:55:22 +00:00
58fa6d3fc6
return an mxc uri rather than a content_token.
2014-12-15 13:54:10 +00:00
0aa8c08478
Merge branch 'develop' into typing_notifications
2014-12-15 11:19:30 +00:00
3983c7fb0f
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop
2014-12-13 18:16:12 +00:00
eea58b8076
Bump version and change log
2014-12-13 18:04:37 +00:00
6380ead2ee
Fix bug while generating the error message when a file path specified in the config doesn't exist
2014-12-13 18:03:01 +00:00
23c7cb6220
Remove unused imports
2014-12-12 16:31:59 +00:00
fc409096ac
Make auth module use EventTypes constants
2014-12-12 16:31:50 +00:00
1fc2a0e33e
Fix tests and remove debug logging
2014-12-12 15:08:29 +00:00
7b43a503f3
Consistently url decode and decode as utf 8 the URL parts
2014-12-12 15:05:37 +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
b0bb1756a9
Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others
2014-12-12 11:59:46 +00:00
63810c777d
Validate message, topic and name event contents
2014-12-12 11:01:09 +00:00
fa4b610ae3
Fix stream test. Make sure we add join to auth_events for invitiations
2014-12-12 10:42:27 +00:00
0b70023373
Merge branch 'develop' into typing_notifications
2014-12-11 18:35:05 +00:00
57b5094545
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2014-12-11 18:34:26 +00:00
cfb963af03
When users leave rooms mark them as no longer typing in them
2014-12-11 18:33:09 +00:00
f25764943c
Add a 'user_left_room' distributor signal analogous to 'user_joined_room'
2014-12-11 18:27:01 +00:00
b3e34a5399
Fix typo in media repository doc string
2014-12-11 18:21:08 +00:00
64bf9f54cc
Fix media repository doc string to include server_name
2014-12-11 18:18:58 +00:00
5ebc994f84
Actually auth-check to ensure people can only send typing notifications for rooms they're actually in
2014-12-11 18:11:43 +00:00
966c4b2b04
Add a sprinkling of logger.debug() into typing notification handler
2014-12-11 18:00:15 +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
d3eb12c7b8
Fix federation test
2014-12-11 17:01:27 +00:00
03d9024cbc
Allow only one download for a given image at a time, so that we don't end up downloading the same image twice if two clients request a remote image at the same time
2014-12-11 16:48:11 +00:00
3b2cc26053
Initial hack at unit tests of room typing REST API
2014-12-11 16:03:12 +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
d80d505b1f
Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server
2014-12-11 14:19:32 +00:00
8cdebce470
Fix redactions. Fix 'age' key
2014-12-11 13:25:19 +00:00
0ca072b3b6
Initial tiny hack at REST API for setting room typing notification status
2014-12-11 10:55:36 +00:00
ead8fc5e38
doc the thumbnail methods
2014-12-11 10:41:43 +00:00
b5eb9124f7
Make sure we pass a tuple to string '%' formatting
2014-12-11 10:08:09 +00:00
5f49914dee
Avoid cyclic dependency in handler setup
2014-12-10 21:17:48 +00:00
1a75ff5c23
Hook up the event stream to typing notifications
2014-12-10 21:01:49 +00:00
4006d58335
Store serial numbers per room for typing event stream purposes
2014-12-10 20:48:25 +00:00
9eb819e828
First hack at implementing timeouts in typing notification handler
2014-12-10 19:39:01 +00:00
4c682143c8
.from_string() no longer takes a HS
2014-12-10 18:00:49 +00:00
02e4c18171
Remove dead code
2014-12-10 18:00:36 +00:00
b245ee34ed
Add some basic event validation
2014-12-10 17:59:47 +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
2d265ef3bd
import Image as PIL.Image.
2014-12-10 16:09:18 +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
cabead6194
Actually fix bug when uploading state with empty state_key
2014-12-10 14:49: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
02db1fd2e7
Fix AttributeError
2014-12-10 12:00:05 +00:00
018443cb59
Make depth increase.
2014-12-10 11:59:53 +00:00
102d2373b4
Add __str__ to FrozenEvent
2014-12-10 11:38:08 +00:00
95aa903ffa
Try and figure out how and why signatures are being changed.
2014-12-10 11:37:47 +00:00
0f4dcab238
turn back on per-request transaction retries, so that every time we try to hit a dead server we actually end up hammering 5 times :|
2014-12-10 10:28:27 +00:00
b8d30899b1
Code style.
2014-12-10 10:16:09 +00:00
71da2bed55
plateau retries after 1h
2014-12-10 00:18:44 +00:00
faf12b64f8
add errbacks to enqueue_pdu deferreds; change logging for failed federation sends to warn rather than exception
2014-12-10 00:12:51 +00:00
2b1acb7671
squidge to 79 columns as per pep8
2014-12-10 00:03:55 +00:00
008303b245
PEP8
2014-12-09 14:49:11 +00:00
5eca288d28
Fix joining from an invite
2014-12-09 14:47:27 +00:00
aa3f66cf7f
Change the way we implement get_events to be less sucky
2014-12-09 13:35:26 +00:00
bc6564bac0
Add PEP8 newlines
2014-12-09 11:01:44 +00:00
8c48450682
Add PEP8 newlines
2014-12-09 10:58:31 +00:00
1c8ee06877
Remove unused snapshot
2014-12-09 10:53:34 +00:00
4e57943cc5
Remove unused import
2014-12-09 10:51:36 +00:00
8529fba02d
fix a million stupid bugs and make it actually work
2014-12-08 19:34:51 +00:00
609c31e8df
More bug fixes
2014-12-08 17:50:56 +00:00
0d3fa1ac6e
add a write-through cache on the retry schedule
2014-12-08 17:48:57 +00:00
ee3df06183
More bug fixes
2014-12-08 14:50:48 +00:00
ba3d1e2fc0
Remove unused import
2014-12-08 12:01:25 +00:00
e8323b9e34
More bug fixes
2014-12-08 10:16:18 +00:00
a295a3c691
Fix registration
2014-12-08 09:24:37 +00:00
721482c83e
Add forgotten file
2014-12-08 09:10:12 +00:00
d044121168
Various typos and bug fixes.
2014-12-08 09:08:26 +00:00
9c43b258ec
actually reset retry schedule if we can successfuly talk to it
2014-12-08 00:17:12 +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
0363820122
Add a class for generating thumbnails using PIL
2014-12-05 16:12:37 +00:00
c5c32266d8
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
2014-12-04 15:58:24 +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
f5d2514fc0
@log_function on PresenceStream's get_new_events_for_user()
2014-12-03 19:48:14 +00:00
52f1d3c886
Store any incoming presence push in the local cache anyway, even if there's no interested observers (yet *hint*) (SYN-115)
2014-12-03 19:06:24 +00:00
797193283e
Bump changes and version
2014-12-03 18:01:47 +00:00
75b4329aaa
WIP for new way of managing events.
2014-12-03 16:07:21 +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
d06dfc70b0
Fix bug where did not always resolve all the deferreds in _attempt_new_transaction
2014-12-03 11:50:23 +00:00
66b0596b7a
Don't log synapse.storage at DEBUG level when under -v; require -v -v for that
2014-12-02 22:28:18 +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
274d137b00
Extra verbosity on logging of received presence info
2014-12-02 20:51:28 +00:00
307f94dcbe
Squash room_ids list to a set() to remove duplicates - with TODO marker as I have no idea /why/ the dups are happening in the first place
2014-12-02 20:51:12 +00:00
2f804a7072
Fix pyflakes and pep8 warnings
2014-12-02 19:55:18 +00:00
5da65085d1
Get uploads working with new media repo
2014-12-02 19:51:47 +00:00
afb646dc1e
Allow GET /room/:room_id/messages without 'limit' parameter to default to 10
2014-12-02 18:01:16 +00:00
23a2c42469
Bump version
2014-12-02 17:45:40 +00:00
7993e3d10d
SYN-187: Set a more sensible default for the content_addr
2014-12-02 17:20:02 +00:00
279c48c8b4
Write the upload portion of version 1 of the media repository
2014-12-02 17:13:14 +00:00
7642d95d5e
Merge branch 'develop' into pushers
2014-12-02 13:50:05 +00:00
c1e66800a9
Begin fleshing out a new Event object
2014-12-02 11:40:22 +00:00
9d53228158
Change DomainSpecificString so that it doesn't use a HomeServer object
2014-12-02 10:42:28 +00:00
ec2b5d8c28
Store full JSON of events in db
2014-12-01 16:22:07 +00:00
ab74afdd8d
Bump version
2014-11-27 17:30:08 +00:00
cce32f8dc5
Bump version and changelog
2014-11-27 17:15:32 +00:00
1505055334
Don't return outliers when we get recent events for rooms.
2014-11-27 16:38:50 +00:00
027542e2e5
Fix bugs when joining a remote room that has dodgy event graphs. This should also fix the number of times a HS will trigger a GET /event/
2014-11-27 16:02:26 +00:00
0294fba042
on_receive_pdu takes more args
2014-11-27 14:46:33 +00:00
07699b5871
Change the way we get missing auth and state events
2014-11-27 14:31:43 +00:00
b8849c8cbf
Re-sign events when we return them via federation as a temporary hack to work around the problem where we reconstruct events differently than when they were signed
2014-11-27 13:53:31 +00:00
00ab5cd6f2
Attempt to fix bug where we 500d an event stream due to trying to cancel a timer twice
2014-11-26 18:04:33 +00:00
858e87ab0d
Add a workaround for bug where some initial join events don't reference creation events in their auth_events
2014-11-26 16:29:03 +00:00
6c485c282d
Catch exceptions when trying to add an entry to rooms tables
2014-11-26 16:06:20 +00:00
5288a7dc9a
Bump version and changelog
2014-11-26 15:19:08 +00:00
4e2ffe79a4
Don't delete the entire current_state_events table
2014-11-26 15:17:08 +00:00
ad13f14432
Bump version numbers and change log
2014-11-26 11:53:12 +00:00
cb76945688
Add update delta for schema change
2014-11-26 11:17:19 +00:00
87538711b6
Update schema to support multiple signatures
2014-11-26 11:14:30 +00:00
3598c11c8d
Correctly handle the case where we get an event for an unknown room, which turns out we are actually in
2014-11-26 10:41:08 +00:00
64fc859dac
Fix bugs in invite/join dances.
...
We now do more implement more of the auth on the events so that we
don't reject valid events.
2014-11-25 17:59:49 +00:00
3536fd7d60
Don't double url-decode state event types.
2014-11-25 11:02:19 +00:00
15099fade5
Drop log level for incorrect logging contexts to WARN if the context is wrong and DEBUG if the context is missing
2014-11-25 10:57:31 +00:00
4961a4fab1
Mark the auth events as possible outlier
2014-11-24 13:55:49 +00:00
e549aac127
Add missing None check
2014-11-24 13:47:58 +00:00
2bca242fdc
Ask for any auth events that we don't have
2014-11-24 13:46:41 +00:00
4bd0ab76c6
We don't always want to Auth get_persisted_pdu
2014-11-24 12:56:17 +00:00
a46e5ef621
SYN-163: Add an order by rowid to selects.
...
This should fix the bug where the edges of the graph get returned in a
different order than they were inserted in, and so no get_event no
longer returned the exact same JSON as was inserted. This meant that
signature checks failed.
2014-11-24 10:56:36 +00:00
ae8ad55cb8
typos
2014-11-24 01:41:12 +00:00
fd40a80a68
Return 404 M_NOT_FOUND when trying to look up a room alias that doesn't exist
2014-11-21 15:11:48 +00:00
eb6aedf92c
More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP pokes work or not yet but the retry semantics are pretty good.
2014-11-21 12:21:00 +00:00
5f19c55731
SYN-58: Allow passing explicit limit=0 to initialSync to request no messages at all; missing still implies default 10
2014-11-20 19:33:45 +00:00
58f82e2e54
Merge branch 'develop' into pushers
2014-11-20 18:25:31 +00:00
23465a30b6
Merge branch 'develop' into pushers
2014-11-20 18:17:46 +00:00
610c2ea131
Fix pep8 and pyflakes warnings
2014-11-20 18:00:10 +00:00
f1c7f8e813
Merge branch 'develop' into http_client_refactor
2014-11-20 17:49:48 +00:00
e377d33652
Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
2014-11-20 17:41:56 +00:00
db9ce032a4
Fix pep8 codestyle warnings
2014-11-20 17:26:36 +00:00
dfdda2c871
Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
2014-11-20 17:10:37 +00:00
32090aee16
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
2014-11-20 16:24:00 +00:00
20326054da
Oops, I removed this param.
2014-11-20 15:24:38 +00:00
ebf6c08a47
Merge branch 'http_client_refactor' into pushers
2014-11-20 14:01:41 +00:00
dc60eee50e
Refactor the HTTP clients a little.
2014-11-20 13:53:34 +00:00
cf66532ac1
CaptchaServerHttpClient should extend the base, not matrix http client.
2014-11-20 12:48:21 +00:00
b2aeaa2dcc
Merge branch 'master' into develop
2014-11-20 10:00:13 +00:00
dcb99e4972
SYN-153: Fix formatting of federation error message
2014-11-20 09:58:23 +00:00
051b185811
remove random half-line
2014-11-19 18:37:00 +00:00
74c3879760
Start creating a module to do generic notifications (just prints them to stdout currently!)
2014-11-19 18:20:59 +00:00
1a9551db82
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
2014-11-19 18:03:03 +00:00
5b46ce579b
Bump version, changelog and upgrade.rst
2014-11-19 18:00:57 +00:00
415ddf59bb
Don't add a 'prev' key to m.room.member messages
2014-11-19 17:59:51 +00:00
03dc63f6c8
Initialise UserPresenceCache instances to always contain a 'presence' key
2014-11-19 17:31:46 +00:00
4eada9a908
Fix backfill request
2014-11-19 17:22:37 +00:00
512993b57f
Only users can set state events which have their own user_id
2014-11-19 17:22:37 +00:00
ca91bb2f7f
Sometimes there isn't a current logging context
2014-11-19 17:18:55 +00:00
8993affdc0
SYN-153: Raise 404 if room alias is not found
2014-11-19 17:14:14 +00:00
0d1221155e
remove unused import
2014-11-19 16:40:01 +00:00
c5eabe3143
replace user_id with sender
2014-11-19 16:38:40 +00:00
97c7c34f6f
Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion
2014-11-19 16:37:43 +00:00
3e54d70ae2
SYN-141: Encode query params as UTF-8.
2014-11-18 19:43:08 +00:00
428581dd05
SYN-144: Remove bad keys from pdu json objects, convert age_ts to age
...
for all pdus sent.
2014-11-18 19:20:25 +00:00
572a1ca42a
Remember also to UTF-8 decode bytes in room alias names in directory server URLs
2014-11-18 18:06:35 +00:00
3bfc3dd45b
Remember to URL decode the room_id in room initialSync
2014-11-18 17:44:55 +00:00
db7e8b5619
SYN-141: Decode the query params as UTF-8
2014-11-18 17:17:57 +00:00
54c438d8d3
Remove unused variable
2014-11-18 16:46:12 +00:00
1731af3f29
SYN-104: When going backwards the end token should be before the last event
2014-11-18 16:45:06 +00:00
11fd81e398
Merge pull request #17 from matrix-org/room-initial-sync
...
Room initial sync
2014-11-18 16:44:25 +00:00
88dfa7baa6
Ensure to parse a real pagination config object out of room initialSync request and pass it on
2014-11-18 16:34:43 +00:00
75e95c45a2
Rename message handler's new snapshot_room to room_initial_sync() as that better suits its purpose
2014-11-18 16:02:44 +00:00
c6ea29d916
Revert accidental commit of bad file
2014-11-18 15:57:00 +00:00
e9f587ecba
Merge remote-tracking branch 'origin/develop' into room-initial-sync
2014-11-18 15:48:30 +00:00
3553101eb3
Null check when determining default power levels
2014-11-18 15:43:17 +00:00
b01dd76be1
SYN-149: Enable auth for events added during room creation since they should pass auth checks
2014-11-18 15:42:53 +00:00
95614e5220
Fix auth to correctly handle initial creation of rooms
2014-11-18 15:36:41 +00:00
ae9c2ab165
SYN-149: Send join event immediately after the room create event
2014-11-18 15:29:48 +00:00
33d328d967
Include room members' presence in room initialSync
2014-11-18 15:28:58 +00:00
759db7d7d5
Added ability to .get_state() from the PresenceHandler by returning a complete m.presence event
2014-11-18 15:25:55 +00:00
4c18e08036
Don't expect all _user_cachemap entries to definitely contain a "last_active" key
2014-11-18 15:10:11 +00:00
Paul "LeoNerd" Evans