50ad8005e4
Put spaces at start of line
2016-04-29 19:16:15 +01:00
83618d719a
Try imports in config
2016-04-29 19:13:52 +01:00
e7a76b5123
Use the constant
2016-04-29 19:10:45 +01:00
29c8cf8db8
Avoid `vars` builtin
2016-04-29 19:09:28 +01:00
d3da5294e8
Use named parameter format
2016-04-29 19:04:40 +01:00
765f2b8446
Default enable email notifs to False
2016-04-29 14:46:18 +01:00
311b5ce051
pep8
2016-04-29 14:37:30 +01:00
3facde2536
Remove rather pointless get function
2016-04-29 14:36:45 +01:00
4364ea1272
Stop processing notifs once we've sent a mail
2016-04-29 14:31:27 +01:00
4b0c3a3270
Correct public_baseurl default
2016-04-29 14:30:15 +01:00
5048455965
Nicer get() shorthand
2016-04-29 14:27:40 +01:00
6c8957be7f
Remove redundant docstring
2016-04-29 14:25:28 +01:00
18ce88bd2d
Correct default template and add text template
2016-04-29 14:24:25 +01:00
40d40e470d
Send mail notifs with a plaintext part too
2016-04-29 13:56:21 +01:00
dc2c527ce9
Fix password reset
...
Default requester to None, otherwise it isn't defined when resetting using email auth
2016-04-29 12:07:54 +01:00
62b51b8452
Fix typo in event_auth servlet path
2016-04-29 12:00:51 +01:00
b2c04da8dc
Add an email pusher for new users
...
If they registered with an email address and email notifs are enabled on the HS
2016-04-29 11:43:57 +01:00
ec9cbe847d
pep8 newline
2016-04-29 10:07:30 +01:00
acded821c4
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-29 10:05:20 +01:00
e800ee2f63
May as well always include room link
2016-04-28 17:28:27 +01:00
cc0874cf71
Put back real delay before mailing
2016-04-28 17:00:40 +01:00
68f8fc2f14
Support file messages & fix plain text
2016-04-28 16:59:57 +01:00
4845c7359d
Support image notifs
2016-04-28 15:55:53 +01:00
351b50a887
Fix more typos in per-request metrics
2016-04-28 15:29:46 +01:00
60f86fc876
pep8
2016-04-28 15:16:30 +01:00
937c407eef
Only import email pusher if email notifs are on
2016-04-28 15:12:14 +01:00
dcfc10b129
Fix typo in request metrics
2016-04-28 15:11:06 +01:00
aebd0c9717
fix typo
2016-04-28 15:09:25 +01:00
1a12766e3b
Add a comment explaining why automatic metric reporting is disabled for JsonResource
2016-04-28 12:31:26 +01:00
6037349512
Check if report_metrics is True
2016-04-28 12:26:07 +01:00
ebbabc4986
Handle room invites in email notifs
2016-04-28 11:49:36 +01:00
8d7ad44331
Report per request metrics for all of the things using request_handler
2016-04-28 10:57:49 +01:00
9dba1b668c
Linkify plain text messages too
2016-04-28 10:55:08 +01:00
424a7f48f8
Run filter_events_for_client
...
so we don't accidentally mail out events people shouldn't see
2016-04-27 17:50:49 +01:00
4ed1e45869
Make html messages work
2016-04-27 17:18:51 +01:00
21d188bf95
Merge pull request #755 from matrix-org/markjh/right_direction
...
Fix backfill replication to advance the stream correctly
2016-04-27 15:54:48 +01:00
8a65666454
Fix backfill replication to advance the stream correctly
2016-04-27 15:38:43 +01:00
8781083960
Better grammar for multiple messages in a room
...
Say who the messages are from if there's no room name, otherwise it's a bit nonsensical
2016-04-27 15:30:41 +01:00
fa12209c1b
Hopefully all remaining bits for email notifs
...
Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails
2016-04-27 15:09:55 +01:00
871357d539
Check that somethign has happend before running the selects
2016-04-27 11:54:13 +01:00
71df327190
Actually start the pusher daemon
2016-04-26 17:07:09 +01:00
c9eab73f2a
Fix typo in default pusher config
2016-04-26 17:06:18 +01:00
b80b93ea0f
Add a log context to the daemonized pusher
2016-04-26 15:57:28 +01:00
6df5a6a833
Optionally daemonize the pusher
2016-04-26 15:37:41 +01:00
3306cf45ca
Merge pull request #750 from matrix-org/erikj/jwt_optional
...
Make pyjwt dependency optional
2016-04-26 11:07:22 +01:00
9c417c54d4
Add a couple of update methods to the PusherSlaveStore
2016-04-26 10:45:02 +01:00
7b4715bad7
More variable calculation for email notifs
...
Include name of the person we're sending to and add summary text at the top giving an overview of what's happened.
2016-04-25 18:27:04 +01:00
f15e9e8de4
Remove the uncomments from the comments
2016-04-25 17:56:24 +01:00
72e2fafa20
Add a metrics listener and a ssh listener to the pusher
2016-04-25 17:34:25 +01:00
f22f46f4f9
Move the listenTCP call outside the manhole function
2016-04-25 14:59:21 +01:00
290f125a13
Typo
2016-04-25 14:42:59 +01:00
52ecbc2843
Make pyjwt dependency optional
2016-04-25 14:30:15 +01:00
05e49ffbdf
No we don't: it's just the display name
2016-04-22 18:44:17 +01:00
bd0f9c2065
Actually do UTF8 correctly
2016-04-22 18:42:00 +01:00
c5b3c6e101
Sort member events
...
So names of people in a room are given in order
2016-04-22 18:33:36 +01:00
83bf65297a
Mime part is binary so encode it first.
...
Doesn't get character enocind right yet but makes it not error.
2016-04-22 18:31:47 +01:00
e8701e64b9
Implement group-of-people names
2016-04-22 17:28:42 +01:00
c553797c4f
No inlineCallbacks necessary on this
2016-04-22 17:27:54 +01:00
5905f36f05
Split out setting up the manhole to a separate file
2016-04-22 17:09:15 +01:00
62607d5452
Merge branch 'develop' into markjh/split_out_site.py
...
Conflicts:
synapse/app/homeserver.py
2016-04-22 16:26:57 +01:00
e856036f4c
Move SynapseSite to its own file
2016-04-22 16:09:55 +01:00
9e7aa98c22
Split out create_resource_tree to a separate file
2016-04-22 15:40:51 +01:00
2022ae0fb9
Merge pull request #746 from matrix-org/markjh/split_out_pusher
...
Optionally split out the pushers into a separate process
2016-04-22 11:34:08 +01:00
64ec3493c1
Merge pull request #745 from matrix-org/erikj/search-index
...
Optimise event_search in postgres
2016-04-22 11:23:49 +01:00
183cacac90
Simplify query and handle finishing correctly
2016-04-22 10:01:57 +01:00
c10ed26c30
Flesh out email templating
...
Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients.
2016-04-21 19:19:07 +01:00
ae571810f2
Order NULLs first
2016-04-21 18:14:18 +01:00
3ddbb1687c
Fix query
2016-04-21 18:02:36 +01:00
8fae3d7b1e
Use special UPDATE syntax
2016-04-21 18:01:49 +01:00
b57dcb4b51
Typo
2016-04-21 17:49:00 +01:00
26db18bc90
Need to do _background_update_progress_txn in actual transaction
2016-04-21 17:45:56 +01:00
b9675ef6e6
Merge pull request #687 from nikriek/jwt-fix
...
Fix issues with JWT login
2016-04-21 17:42:25 +01:00
e395eb1108
Update progress when creating index
2016-04-21 17:39:24 +01:00
3b0fa77f50
Fix SQL statement
2016-04-21 17:37:42 +01:00
129e403487
Create index must be on a conn
2016-04-21 17:35:51 +01:00
a3ac837599
Optionally split out the pushers into a separate process
2016-04-21 17:22:37 +01:00
78741cf025
Merge pull request #743 from matrix-org/markjh/slave_pushers
...
Replicate the pushers
2016-04-21 17:21:29 +01:00
51bb339ab2
Create index concurrently
2016-04-21 17:16:11 +01:00
b743c1237e
Add missing run_upgrade
2016-04-21 17:12:04 +01:00
31719ad124
Merge pull request #744 from matrix-org/markjh/replication_remove_pusher
...
Add a replication endpoint for deleting pushers
2016-04-21 17:10:49 +01:00
565c2edb0a
Fix issues with JWT login
2016-04-21 18:10:48 +02:00
c877f0f034
Optimise event_search in postgres
2016-04-21 16:56:14 +01:00
cfe1ff4bdb
Add a replication endpoint for deleting pushers
2016-04-21 16:33:05 +01:00
d4823efad9
Replicate the pushers
2016-04-21 16:18:00 +01:00
c0d8e0eb63
Replicate push actions
2016-04-21 15:25:58 +01:00
2ed0adb075
Generate mails from a template
2016-04-20 18:35:29 +01:00
05adc6c2de
more pep8
2016-04-20 13:02:45 +01:00
f63bd4ff47
Send a rather basic email notif
...
Also pep8 fixes
2016-04-20 13:02:01 +01:00
5bbc321588
Always use state cache entry if it exists
...
Also check if the resolved state matches an existing state group.
2016-04-20 11:49:10 +01:00
4cf4320593
Add some logging to state resolve_events
2016-04-20 11:06:02 +01:00
eab47ea1e5
Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groups
...
Add cache to _get_state_groups_from_groups
2016-04-19 17:37:19 +01:00
f52dd35ac3
Merge pull request #738 from matrix-org/markjh/slaved_receipts
...
Add a slaved receipts store
2016-04-19 17:31:59 +01:00
61c7edfd34
Add cache to _get_state_groups_from_groups
2016-04-19 17:22:03 +01:00
5bbd424ee0
Add a slaved receipts store
2016-04-19 17:14:08 +01:00
6ac40f7b65
Merge pull request #737 from matrix-org/erikj/spider_ssl_factory
...
Use tls_server_context_factory for SpiderEndpoint
2016-04-19 16:22:05 +01:00
f505575f69
Make InsecureInterceptableContextFactory work with SpiderEndpoint
2016-04-19 16:08:14 +01:00
e99365f601
Replicate get_invited_rooms_for_user
2016-04-19 15:22:14 +01:00
e2a01455af
Add single instance & logging stuff
...
Copy the stuff over from http pusher that prevents multiple instances of process running at once and sets up logging and measure blocks.
2016-04-19 14:52:58 +01:00
e8884e5e9c
Add self.media_repo to PreviewUrlResource
2016-04-19 14:51:34 +01:00
a7001c311b
_make_dirs was moved to MediaRepository
2016-04-19 14:49:31 +01:00
9181e2f4c7
Add store to PreviewUrlResource
2016-04-19 14:48:24 +01:00
fb76a81ff7
Reorder imports
2016-04-19 14:45:05 +01:00
07d765209d
First bits of emailpusher
...
Mostly logic of when to send an email
2016-04-19 14:24:36 +01:00
0c93df89b6
Move MediaRepository to media_repository module
2016-04-19 11:31:43 +01:00
43f0941e8f
Split out BaseMediaResource into MediaRepository
...
This is so that a single MediaRepository can be shared across all
resources, rather than having a "copy" per resource.
In particular this allows us to guard against both the thumbnail and
download resource triggering a download of remote content at the same
time.
2016-04-19 11:24:59 +01:00
eb8619e256
Create log context in Measure if one doesn't exist
2016-04-18 16:08:32 +01:00
4ef7a25c10
Merge pull request #733 from matrix-org/erikj/make_member_timeout
...
Lower timeout for make_membership_event
2016-04-18 15:08:05 +01:00
3727a15764
Merge pull request #732 from matrix-org/erikj/login
...
Simplify _check_password
2016-04-18 15:07:57 +01:00
aaabbd3e9e
explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes better
2016-04-15 14:32:25 +01:00
84f9cac4d0
fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, rather than relying on lxml's heuristics which seem to get it wrong
2016-04-15 13:20:08 +01:00
914f1eafac
Lower timeout for make_membership_event
...
Calls to make_membership_event are done in response to client requests,
and so should not be retried over long timeframes.
2016-04-15 11:22:23 +01:00
6fd2f685fe
Simplify _check_password
2016-04-15 11:17:18 +01:00
cb9c465707
Use SynapseError 504 for Timeout errors
2016-04-15 10:21:32 +01:00
3c79bdd7a0
Fix check_password rather than inverting the meaning of _check_local_password ( #730 )
2016-04-14 19:00:21 +01:00
a4c56bf67b
Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_user
...
Fix login to error for nonexistent users
2016-04-14 18:46:45 +01:00
4c1b32d7e2
Fix login to error for nonexistent users
...
Fixes SYN-680
2016-04-14 18:28:42 +01:00
f78b479118
fix urlparse import thinko breaking tiny URLs
2016-04-14 15:23:55 +01:00
83776d6219
Make v2_alpha reg follow the AS API specification
...
The spec is clear the key should be 'user' not 'username' and this is indeed
the case for v1. This is not true for v2_alpha though, which is what this
commit is fixing.
2016-04-14 14:52:26 +01:00
bd77216d06
comment out 2c838f6459 due to risk of https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve
2016-04-14 14:39:24 +01:00
9ae64c9910
Measure push action generator
2016-04-14 13:42:22 +01:00
b42ad359e9
Merge pull request #725 from matrix-org/dbkr/push_only_joined
...
Don't push for everyone who ever sent an RR to the room
2016-04-14 12:05:13 +01:00
757e2c79b4
Don't push for everyone who ever sent an RR to the room
2016-04-14 12:02:50 +01:00
86e9bbc74e
Add missing yield
2016-04-14 11:56:52 +01:00
e40f25ebe1
Rename log context
2016-04-14 11:54:14 +01:00
2ae91a9e2f
Make send_badge private
2016-04-14 11:37:50 +01:00
d213d69fe3
Add desc arg
2016-04-14 11:36:23 +01:00
56da835eaf
Add necessary logging contexts
2016-04-14 11:33:50 +01:00
96bcfb29c7
Add index
2016-04-14 11:26:33 +01:00
7be1065b8f
Add extra Measure
2016-04-14 11:26:15 +01:00
a2546b9082
Fix query for get_unread_push_actions_for_user_in_range
2016-04-14 11:08:31 +01:00
ceeb5b909f
Merge pull request #721 from matrix-org/erikj/spider
...
Sanitize the optional dependencies for spider API
2016-04-14 09:59:29 +01:00
43a89cca8e
Merge pull request #722 from matrix-org/dbkr/only_unread_event_actions
...
Only return unread notifications
2016-04-13 14:54:26 +01:00
f338bf9257
Give install requirements
2016-04-13 14:33:48 +01:00
767fc0b739
pep8
2016-04-13 14:23:27 +01:00
54d08c8868
Only return unread notifications
...
Make get_unread_push_actions_for_user_in_range only return unread event actions, being more true to its name. Done in two separate sql queries to get actions after a read receipt and those in a room wiht no receipt at all. SQL queries by Erik.
2016-04-13 14:16:45 +01:00
5880bc5417
Merge pull request #718 from matrix-org/erikj/public_room_list
...
Don't return empty public rooms
2016-04-13 14:07:26 +01:00
f613a3e332
Merge pull request #720 from matrix-org/erikj/auth_chec
...
Don't auto log failed auth checks
2016-04-13 14:07:23 +01:00
bfe586843f
Add back in helpful description for missing url_preview_ip_range_blacklist
2016-04-13 13:52:57 +01:00
d0633e6dbe
Sanitize the optional dependencies for spider API
2016-04-13 13:38:09 +01:00
0f2ca8cde1
Measure Auth.check
2016-04-13 11:15:59 +01:00
c53f9d561e
Don't auto log failed auth checks
2016-04-13 11:11:46 +01:00
65141161f6
Unused member variable
2016-04-12 16:25:26 +01:00
72f454b752
Don't return empty public rooms
2016-04-12 16:06:18 +01:00
d33d623f0d
Merge pull request #716 from matrix-org/dbkr/get_pushers
...
Add get endpoint for pushers
2016-04-12 14:40:37 +01:00
7984ffdc6a
Unneccessarywhitespaceisunnecessary
2016-04-12 13:55:57 +01:00
c1267d04c5
Oops, forgot the desc.
2016-04-12 13:55:32 +01:00
a04c076b7f
Make the /set part mandatory
2016-04-12 13:54:41 +01:00
44891b4a0a
Tidy up get_pusher functions
...
Decodes pushers rows on the main thread rather than the db thread and uses _simple_select_list. Also do the same to the function I copied and factor out the duplication into a helper function.
2016-04-12 13:47:17 +01:00
7b39bcdaae
Mis-named function
2016-04-12 13:35:08 +01:00
d937f342bb
Split into separate servlet classes
2016-04-12 13:33:30 +01:00
David Baker