7321f45457
Clean up _ServiceQueuer
2016-08-17 12:03:04 +01:00
b9abf3e4e3
Remove dead appservice code
2016-08-17 11:48:23 +01:00
62c5245c87
Measure notify_interested_services
2016-08-17 11:12:29 +01:00
949629291c
Do it in storage function
2016-08-16 17:05:34 +01:00
ad42322257
Add migration script
...
To port existing rule actions & enable entries to the new name
2016-08-16 16:56:30 +01:00
0bba2799b6
Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override
2016-08-16 16:46:37 +01:00
64a2acb161
Don't update caches replication stream if tokens haven't advanced
2016-08-16 16:44:19 +01:00
1594eba29e
s/underride/override/ in the rule_id too
2016-08-16 16:44:07 +01:00
109a560905
Flake8
2016-08-16 14:57:21 +01:00
48b5829aea
Fix up preview URL API. Add tests.
...
This includes:
- Splitting out methods of a class into stand alone functions, to make
them easier to test.
- Adding unit tests to split out functions, testing HTML -> preview.
- Handle the fact that elements in lxml may have tail text.
2016-08-16 14:53:24 +01:00
7c6f4f9427
Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri
...
Limit number of extremeties in backfill request
2016-08-16 12:55:42 +01:00
25c2332071
Merge pull request #1010 from matrix-org/erikj/refactor_deletions
...
Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
2016-08-16 11:37:53 +01:00
2ee1bd124c
Limit number of extremeties in backfill request
...
This works around a bug where if we make a backfill request with too
many extremeties it causes the request URI to be too long.
2016-08-16 11:34:36 +01:00
a2427981b7
Use cached get_user_by_access_token in slaves
2016-08-16 11:24:32 +01:00
6cbd1b495e
Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into Ralith-fix_integrity_retry
2016-08-16 10:50:24 +01:00
1c7c317df1
Move display name rule
...
As per https://github.com/matrix-org/matrix-doc/pull/373 and comment
2016-08-15 18:34:53 +01:00
dc3a00f24f
Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
2016-08-15 17:04:39 +01:00
75299af4fc
Merge pull request #1009 from matrix-org/erikj/event_split
...
Split out /events to synchrotron
2016-08-15 15:39:05 +01:00
89e786bd85
Doc get_next() context manager usage
2016-08-15 13:45:26 +01:00
d9664344ec
Rename table. Add docs.
2016-08-15 11:45:57 +01:00
784a2d4f2c
Remove broken cache stuff
2016-08-15 11:25:48 +01:00
0be963472b
Use cached version of get_aliases_for_room
2016-08-15 11:24:12 +01:00
64e7e11853
Implement cache replication stream
2016-08-15 11:16:45 +01:00
4d70d1f80e
Add some invalidations to a cache_stream
2016-08-15 11:15:17 +01:00
99bbd90b0d
Always run txn.after_callbacks
2016-08-15 09:45:44 +01:00
8a57cc3123
Add missing database corruption recovery case
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-08-14 11:50:22 -07:00
dfaf0fee31
Log the value which is observed in the first place.
...
The name 'result' is of bool type and has no len property,
resulting in a TypeError. Futhermore in the flow control
conn.response is observed and hence should be reported.
Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
2016-08-14 16:49:05 +02:00
e380538b59
Fix AttributeError when bind_dn is not defined.
...
In case one does not define bind_dn in ldap configuration, filter
attribute is not declared. Since auth code only uses ldap_filter attribute
when according LDAP mode is selected, it is safe to only declare the
attribute in that case.
Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
2016-08-14 16:48:33 +02:00
4e1cebd56f
Make synchrotron accept /events
2016-08-12 15:31:44 +01:00
866a5320de
Dont invoke get_handlers fromClientV1RestServlet
...
hs.get_handlers() can not be invoked from split out processes. Moving
the invocations down a level means that we can slowly split out
individual servlets.
2016-08-12 10:03:19 +01:00
448ac6cf0d
Only process one local membership event per room at a time
2016-08-12 09:32:19 +01:00
832799dbff
Merge pull request #997 from Half-Shot/develop
...
Don't change status_msg on /sync
2016-08-11 14:10:55 +01:00
b4ecf0b886
Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api
2016-08-11 14:09:13 +01:00
5b5148b7ec
Synced up synchrotron set_state with PresenceHandler set_state
2016-08-11 11:48:30 +01:00
1d40373c9d
Include prev_content in redacted state events
2016-08-11 10:24:41 +01:00
c315922b5f
PEP8
2016-08-10 16:34:10 +01:00
ca8abfbf30
Clean up TransactionQueue
2016-08-10 16:24:16 +01:00
5aeadb7414
Merge pull request #999 from matrix-org/erikj/measure_more
...
Measure federation send transaction resources
2016-08-10 14:16:14 +01:00
487bc49bf8
Don't stop on 4xx series errors
2016-08-10 13:39:12 +01:00
739ea29d1e
Also check if server is in the room
2016-08-10 13:32:23 +01:00
ea8c4094db
Also pull out rejected events
2016-08-10 13:26:13 +01:00
7f41bcbeec
Correctly auth /event/ requests
2016-08-10 13:22:20 +01:00
11fdfaf03b
Only resign our own events
2016-08-10 13:16:58 +01:00
2510db3e76
Don't change status_msg on /sync
2016-08-10 12:59:59 +01:00
f91df1f761
Store if we fail to fetch an event from a destination
2016-08-10 11:31:46 +01:00
3bc9629be5
Measure federation send transaction resources
2016-08-10 10:56:38 +01:00
d45489474d
Merge pull request #996 from matrix-org/erikj/tls_error
...
Don't print stack traces when failing to get remote keys
2016-08-10 10:56:08 +01:00
fa1ce4d8ad
Don't print stack traces when failing to get remote keys
2016-08-10 10:44:37 +01:00
79ebfbe7c6
/login: Respond with a 403 when we get an invalid m.login.token
2016-08-09 16:29:28 +01:00
cd41c6ece2
Merge pull request #995 from matrix-org/rav/clean_up_cas_login
...
Clean up CAS login code
2016-08-09 10:21:56 +01:00
27771b2495
Merge pull request #994 from matrix-org/rav/fix_cas_login
...
Fix CAS login
2016-08-08 17:47:45 +01:00
d3250499c1
Merge pull request #993 from matrix-org/rav/fix_token_login
...
Fix token login
2016-08-08 17:43:02 +01:00
65666fedd5
Clean up CAS login code
...
Remove some apparently unused code.
Clean up parse_cas_response, mostly to catch the exception if the CAS response
isn't valid XML.
2016-08-08 17:17:25 +01:00
0682ca04b3
Fix CAS login
...
Attempting to log in with CAS was giving a 500 error.
2016-08-08 17:01:30 +01:00
6fe6a6f029
Fix login with m.login.token
...
login with token (as used by CAS auth) was broken by 067596d
2016-08-08 16:40:39 +01:00
27fe3e2d4f
Bump changelog and version
2016-08-08 11:31:12 +01:00
3410142741
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
2016-08-08 11:24:53 +01:00
7c1a92274c
Make psutil optional
2016-08-08 11:12:21 +01:00
f5deaff424
Merge pull request #991 from matrix-org/erikj/retry_make
...
Retry joining via other servers if first one failed. Fix some other bugs.
2016-08-05 18:21:27 +01:00
5f360182c6
Fix a couple of python bugs
2016-08-05 18:08:32 +01:00
46453bfc2f
Retry joining via other servers if first one failed
2016-08-05 18:02:03 +01:00
6bf6bc1d1d
Merge pull request #990 from matrix-org/erikj/fed_vers
...
Add federation /version API
2016-08-05 16:59:16 +01:00
24f36469bc
Add federation /version API
2016-08-05 16:36:07 +01:00
597c79be10
Change the way we specify if we require auth or not
2016-08-05 16:17:04 +01:00
e6021c370e
Merge pull request #989 from matrix-org/erikj/raise_404
...
Raise 404 when couldn't find event
2016-08-05 15:54:16 +01:00
a8b946decb
Raise 404 when couldn't find event
2016-08-05 15:31:02 +01:00
5bcccfde6c
Don't include html comments in description
2016-08-05 14:45:11 +01:00
4d87d3659a
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
2016-08-05 13:19:22 +01:00
93acf49e9b
Fix backfill auth events
2016-08-05 12:59:04 +01:00
b2c290a6e5
Bump version and changelog
2016-08-05 11:16:54 +01:00
499dc1b349
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
2016-08-05 11:15:48 +01:00
2d4de61fb7
Fix typo
2016-08-05 10:48:56 +01:00
fccadb7719
Check if we already have the events returned by /state/
2016-08-05 10:43:47 +01:00
f0fa66f495
Delete more tables
2016-08-05 10:40:08 +01:00
1515d1b581
Fallback to /state/ on both 400 and 404
2016-08-05 10:24:23 +01:00
a2b7102eea
Tweak integrity error recovery to work as intended
2016-08-04 20:38:08 -07:00
a5d7968b3e
Merge pull request #973 from matrix-org/erikj/xpath_fix
...
Change the way we summarize URLs
2016-08-04 16:37:25 +01:00
b5525c76d1
Typo
2016-08-04 16:10:08 +01:00
e97648c4e2
Test summarization
2016-08-04 16:09:09 +01:00
835ceeee76
Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error
...
Retry event persistence on IntegrityError
2016-08-04 15:40:03 +01:00
b3682df2ca
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix
2016-08-04 15:29:45 +01:00
8ad8490cff
Fix typo
2016-08-04 15:21:29 +01:00
59fa91fe88
Retry event persistence on IntegrityError
...
Due to a bug in the porting script some backfilled events were not
correctly persisted, causing irrecoverable IntegrityErrors on future
attempts to persist those events.
This commit adds a retry mechanism invoked upon IntegrityError,
where when retried the tables are purged for all references to the
events being persisted.
2016-08-04 15:02:15 +01:00
257c41cc2e
Fix typos.
2016-08-04 14:05:45 +01:00
b4e2290d89
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api
2016-08-04 14:04:35 +01:00
e3ee63578f
Tidy up get_events
2016-08-04 14:01:18 +01:00
f131cd9e53
keys/query: Omit device displayname if null
...
... which makes it more consistent with user displaynames.
2016-08-04 10:59:51 +01:00
edb33eb163
Rename fields to _ids
2016-08-03 17:19:15 +01:00
bcc9cda8ca
Fix copy + paste fails
2016-08-03 17:17:26 +01:00
98385888b8
PEP8
2016-08-03 15:42:08 +01:00
68264d7404
Include device name in /keys/query response
...
Add an 'unsigned' section which includes the device display name.
2016-08-03 15:42:08 +01:00
91fa69e029
keys/query: return all users which were asked for
...
In the situation where all of a user's devices get deleted, we want to
indicate this to a client, so we want to return an empty dictionary, rather
than nothing at all.
2016-08-03 15:41:44 +01:00
4c56bedee3
Actually call get_room_state
2016-08-03 15:04:29 +01:00
520ee9bd2c
Fix syntax error
2016-08-03 15:03:15 +01:00
a60a2eaa02
Comment
2016-08-03 14:52:43 +01:00
e3a720217a
Add /state_ids federation API
...
The new API only returns the event_ids for the state, as most
requesters will already have the vast majority of the events already.
2016-08-03 14:47:37 +01:00
530bc862dc
Merge branch 'rav/null_default_device_displayname' into develop
2016-08-03 14:30:32 +01:00
a6f5cc65d9
PEP8
2016-08-03 14:30:06 +01:00
e555bc6551
Merge branch 'rav/refactor_device_query' into develop
2016-08-03 14:26:01 +01:00
a843868fe9
E2eKeysHandler: minor tweaks
...
PR feedback
2016-08-03 14:24:33 +01:00
80ad710217
Remove other bit of deduplication
2016-08-03 13:25:59 +01:00
4fec5e57be
Default device_display_name to null
...
It turns out that it's more useful to return a null device display name (and
let clients decide how to handle it: eg, falling back to device_id) than using
a constant string like "unknown device".
2016-08-03 11:53:00 +01:00
a8a32d2714
Ensure we only persist an event once at a time
2016-08-03 11:23:39 +01:00
921f17f938
Merge branch 'develop' into rav/refactor_device_query
2016-08-03 11:12:47 +01:00
58c9653c6b
Don't infer paragrahs from newlines
2016-08-02 18:50:24 +01:00
6b58ade2f0
Comment on why we clone
2016-08-02 18:41:22 +01:00
9e66c58ceb
Spelling.
2016-08-02 18:37:31 +01:00
f83f5fbce8
Make it actually compile
2016-08-02 18:32:42 +01:00
aecaec3e10
Change the way we summarize URLs
...
Using XPath is slow on some machines (for unknown reasons), so use a
different approach to get a list of text nodes.
Try to generate a summary that respect paragraph and then word
boundaries, adding ellipses when appropriate.
2016-08-02 18:25:53 +01:00
1efee2f52b
E2E keys: Make federation query share code with client query
...
Refactor the e2e query handler to separate out the local query, and then make
the federation handler use it.
2016-08-02 18:12:00 +01:00
49e047c55e
Bump version and changelog
2016-08-02 17:10:26 +01:00
59a2c6d60e
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
2016-08-02 17:07:54 +01:00
c9154b970c
Don't double wrap 200
2016-08-02 16:45:53 +01:00
b3d5c4ad9d
Fix response cache
2016-08-02 16:42:21 +01:00
8f650bd338
Bump changeog and version
2016-08-02 15:43:52 +01:00
7b0f6293f2
Merge pull request #940 from matrix-org/erikj/fed_state_cache
...
Cache federation state responses
2016-08-02 15:21:37 +01:00
342e072024
Merge pull request #967 from matrix-org/erikj/fed_reader
...
Split out the federation reading portions into a separate.
2016-08-02 13:59:47 +01:00
54de6a812a
Merge branch 'develop' into dbkr/fix_add_email_on_register
2016-08-02 10:18:15 +01:00
733bf44290
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
2016-08-02 09:56:31 +01:00
986615b0b2
Move e2e query logic into a handler
2016-08-01 18:02:07 +01:00
b260f92936
Ignore AlreadyCalled errors on timer cancel
2016-07-31 16:00:12 +01:00
271d3e7865
Fix adding emails on registration
...
Synapse was not adding email addresses to accounts registered with an email address, due to too many different variables called 'result'. Rename both of them. Also remove the defer.returnValue() with no params because that's not a thing.
2016-07-29 15:25:24 +01:00
18b7eb830b
Merge pull request #958 from matrix-org/paul/SYN-738
...
Forbid non-ASes from registering users whose names begin with '_'
2016-07-29 14:10:45 +01:00
2a9ce8c422
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
2016-07-29 11:33:46 +01:00
cbea0c7044
Merge pull request #964 from matrix-org/erikj/fed_join_fix
...
Handle the case of missing auth events when joining a room
2016-07-29 11:33:16 +01:00
5aa024e501
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
2016-07-29 11:24:56 +01:00
c51a52f300
Mention that func will fetch auth events
2016-07-29 11:17:04 +01:00
3d13c3a295
Update docstring
2016-07-29 10:45:05 +01:00
8dad08a950
Fix SQL to supply arguments in the same order
2016-07-29 09:57:13 +01:00
0a7d3cd00f
Create separate methods for getting messages to push
...
for the email and http pushers rather than trying to make a single
method that will work with their conflicting requirements.
The http pusher needs to get the messages in ascending stream order, and
doesn't want to miss a message.
The email pusher needs to get the messages in descending timestamp order,
and doesn't mind if it misses messages.
2016-07-28 20:24:24 +01:00
ec8b217722
Add destination retry to slave store
2016-07-28 17:35:53 +01:00
76b89d0edb
Add slace storage functions for public room list
2016-07-28 17:03:40 +01:00
370135ad0b
Comment get_unread_push_actions_for_user_in_range function
2016-07-28 16:47:37 +01:00
0fcbca531f
Add get_auth_chain to slave store
2016-07-28 16:36:28 +01:00
1e2740caab
Handle the case of missing auth events when joining a room
2016-07-28 16:08:33 +01:00
6ede23ff1b
Add more key storage funcs into slave store
2016-07-28 15:41:26 +01:00
5fb41a955c
Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop
2016-07-28 14:56:32 +01:00
4329f20e3f
Merge pull request #962 from matrix-org/markjh/retry
...
Fix retry utils to check if the exception is a subclass of CME
2016-07-28 11:12:19 +01:00
a285194021
Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into release-v0.17.0
2016-07-28 10:47:06 +01:00
bf81e38d36
Fix retry utils to check if the exception is a subclass of CME
2016-07-28 10:47:02 +01:00
78cac3e594
Merge pull request #941 from matrix-org/erikj/key_client_fix
...
Send the correct host header when fetching keys
2016-07-28 10:46:36 +01:00
7871790db1
Bump version and changelog
2016-07-28 10:38:56 +01:00
18e044628e
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
2016-07-28 10:37:43 +01:00
b557b682d9
Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name
...
Don't include name of room for invites in push
2016-07-28 10:36:41 +01:00
389c890f14
Don't include name of room for invites in push
...
Avoids insane pushes like, "Bob invited you to invite from Bob"
2016-07-28 10:20:47 +01:00
cd8738ab63
Merge pull request #960 from matrix-org/rav/support_r0.2
...
Add r0.2.0 to the "supported versions" list
2016-07-28 10:14:33 +01:00
f6f8f81a48
Add r0.1.0 to the "supported versions" list
2016-07-28 10:14:07 +01:00
ecd5e6bfa4
Typo
2016-07-28 10:04:52 +01:00
fda078f995
Add r0.2.0 to the "supported versions" list
2016-07-28 09:14:21 +01:00
40e539683c
Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload
...
Make the device id on e2e key upload optional
2016-07-27 18:16:57 +01:00
Erik Johnston