9295fa30a8
Annotate the removed indicies with why they were removed.
2016-05-13 14:16:57 +01:00
5e50058473
Remove unused indices
...
This includes removing both unused indices and indices that are subsets
of other indices.
2016-05-13 13:28:07 +01:00
cdda850ce1
Merge pull request #781 from matrix-org/markjh/replication_problems
...
Fix a bug in replication that was causing the pusher to tight loop
2016-05-13 12:05:19 +01:00
0e792e7903
Log the stream IDs in an order that makes sense
2016-05-13 11:54:44 +01:00
3547e66bc6
Make sure we advance our stream position
2016-05-13 11:53:00 +01:00
6da7f39d95
Use tree cache for get_linearized_receipts_for_room
2016-05-13 11:41:23 +01:00
b5e646a18c
Make email notifs work on the pusher synapse
...
Plus general bugfix to email notif code
2016-05-13 11:36:50 +01:00
13d37c3c56
Fixup add_pusher
2016-05-13 11:25:02 +01:00
a458a40337
missed a spot
2016-05-12 18:19:58 +01:00
7e23476814
move filter_events_for_client out of base handler
2016-05-11 13:42:37 +01:00
1620578b13
Shuffle when we get the signing_key attribute.
...
Wait until we sign a message to get the signing key from the homeserver
config. This means that the message handler can be created without
having a signing key in the config which means that separate processes
like the pusher that don't send messages and don't need to sign them can
still access the handlers.
2016-05-11 12:20:57 +01:00
108434e53d
Merge pull request #775 from matrix-org/erikj/password_hash
...
Correctly handle NULL password hashes from the database
2016-05-11 12:18:13 +01:00
1400bb1663
Correctly handle NULL password hashes from the database
2016-05-11 12:06:02 +01:00
458a435114
Fix typo
2016-05-11 10:35:33 +01:00
30057b1e15
Move _create_new_client_event and handle_new_client_event out of base handler
2016-05-11 09:09:20 +01:00
ae1af262f6
Pass through _get_state_group_for_events
2016-05-10 19:18:03 +02:00
90afc07f39
StateStore, not EventsStore
2016-05-10 19:10:46 +02:00
89b5ef7c4b
Cached functions must be accessed through the dict
2016-05-10 19:05:22 +02:00
35b6e6d2a8
Pass though _get_state_group_for_events
2016-05-10 18:56:40 +02:00
3367e65476
Pass through get_state_groups
2016-05-10 18:53:15 +02:00
0c4ccdcb83
Also pass through get_profile_displayname
2016-05-10 18:51:14 +02:00
f28643cea9
Uncommit accidentally commited edit to cipher list
2016-05-10 18:44:32 +02:00
5f46be19a7
Pass through get_events to pusher too
2016-05-10 18:43:40 +02:00
d46b18a00f
Pass through _get_event_txn
2016-05-10 18:27:06 +02:00
3b1930e8ec
unbreak schema
2016-05-10 16:42:37 +01:00
fe97b81c09
Merge pull request #759 from matrix-org/dbkr/email_notifs
...
Send email notifications for missed messages
2016-05-10 16:30:05 +02:00
997db04648
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-05-10 14:40:19 +02:00
c00b484eff
More consistent config naming
2016-05-10 14:39:16 +02:00
94040b0798
Add config option to not send email notifs for new users
2016-05-10 14:34:53 +02:00
e04b1d6b0a
Make pep8 happy
2016-05-10 14:23:16 +02:00
5599608887
Switch from CSS to Table layout for HTML mails so they work in Outlook aka Word
...
Remove templates-vector and theme templates with variables instead
Switch to matrix.to URLs by default for links
2016-05-10 00:14:48 +02:00
c9eb6dfc1b
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
2016-05-09 13:21:06 +01:00
3f84da139c
Merge pull request #773 from matrix-org/erikj/get_domian_from_id
...
Add and use get_domain_from_id
2016-05-09 13:21:00 +01:00
def64d6ef3
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
2016-05-09 13:05:09 +01:00
100e2c42f6
Merge pull request #764 from matrix-org/erikj/replication_logging
...
Add some log information at returned replication streams
2016-05-09 11:18:00 +01:00
8715731559
Merge pull request #772 from matrix-org/erikj/get_user_cache
...
Add cache to get_user_by_id
2016-05-09 11:12:11 +01:00
34b3af3363
Merge pull request #770 from matrix-org/erikj/transaction_reactor
...
Run transaction queue on reactor
2016-05-09 11:12:06 +01:00
08dfa8eee2
Add and use get_domian_from_id
2016-05-09 10:36:03 +01:00
f6ebaf4a32
Run transaction queue on reactor
...
This ensures that any CPU work that happens doesn't block message
sending.
2016-05-09 10:10:06 +01:00
4ea762c1a2
Add cache to get_user_by_id
2016-05-09 10:08:21 +01:00
012cb5416c
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actions_delete
2016-05-06 15:59:20 +01:00
fcb2c3f0db
Remove unused import
2016-05-06 15:47:40 +01:00
fd85b167ec
Pull loop one level up
2016-05-06 15:38:42 +01:00
b6e0be701e
Queue events for persistence
2016-05-06 14:31:44 +01:00
d13459636f
Pull prev txn from in memory
2016-05-06 11:30:55 +01:00
1d275dba69
Don't needlessly enter transaction
2016-05-06 11:25:58 +01:00
56b5e83e36
Reduce database inserts when sending transactions
2016-05-06 11:20:18 +01:00
53ca739f1f
better mail subject lines
2016-05-05 15:55:44 +01:00
81c2176cba
fix layout; handle app naming in synapse, not jinja
2016-05-05 15:54:29 +01:00
573ef3f1c9
Rename openid/token to openid/request_token
2016-05-05 15:15:00 +01:00
8940281d1b
Don't warn
2016-05-05 15:10:03 +01:00
9c272da05f
Add an openidish mechanism for proving to third parties that you own a given user_id
2016-05-05 13:42:44 +01:00
5d8a93a10e
Add some log information at returned replication streams
2016-05-05 10:29:21 +01:00
1f0f5ffa1e
Add bulk fetch storage API
2016-05-05 10:03:15 +01:00
634efb65f1
pep8
2016-05-05 02:10:57 +01:00
ce81ccb063
handle fragments correctly on mxc URLs.
...
switch to vector.im permalinks as matrix.to isn't ready yet.
merge overlapping notifications together.
give one message of context after a notification (in the unlikely event it exists, but it's possible thanks to throttling).
include name of app in mail templates
2016-05-05 02:00:33 +01:00
1cf5c379cb
spell out emailpusher full path
2016-05-05 01:59:39 +01:00
fee1118a20
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
2016-05-04 19:08:27 +01:00
97b9141245
Merge pull request #762 from matrix-org/erikj/report_event
...
Add /report endpoint
2016-05-04 19:05:49 +01:00
fcd1eb642d
Add primary key
2016-05-04 16:51:51 +01:00
8e6a163f27
Add timestamp and auto incrementing ID
2016-05-04 15:19:12 +01:00
39d0a99972
Include no context
...
until we can de-dup between the context and other notifs
2016-05-04 14:52:49 +01:00
9ef05a12c3
Add date header & message id
2016-05-04 14:52:10 +01:00
80be396464
Correct SQL statement for postgres
...
In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently).
2016-05-04 13:19:59 +01:00
5650e38e7d
Move event_id to path
2016-05-04 13:19:39 +01:00
8cc82aad87
Add db functions used for email to the pusher app
2016-05-04 11:47:59 +01:00
de22001ab5
pep8
2016-05-04 11:41:35 +01:00
f1026418ea
copyright
2016-05-04 11:38:01 +01:00
17cbf773b9
fix assorted typos in default config
2016-05-04 11:38:01 +01:00
984d4a2c0f
Add /report endpoint
2016-05-04 11:28:10 +01:00
e6bffa4475
Unused import
2016-05-04 11:26:58 +01:00
92f0f3d21d
Catch all exceptions when creating a pusher
2016-05-04 11:24:07 +01:00
a438a6d2bc
Implement basic ignore user
2016-05-04 10:16:46 +01:00
7ea3b4118d
Merge pull request #757 from matrix-org/erikj/event_auth_typo
...
Fix typo in event_auth servlet path
2016-05-03 14:23:15 +01:00
183f23f10d
Delete old pushers
2016-05-03 14:22:33 +01:00
792def4928
add a url_preview_ip_range_whitelist config param so we can whitelist the matrix.org IP space
2016-05-01 12:44:24 +01:00
2df75de505
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-29 20:28:47 +01:00
b084e4d963
Add constant for throttle multiplier
2016-04-29 20:14:55 +01:00
35b7b8e4bc
Remove unused function
2016-04-29 20:10:34 +01:00
6b9b6a9169
Remove unused arg
2016-04-29 20:02:52 +01:00
c7c75e87dc
Docstring
2016-04-29 19:47:35 +01:00
b0a1036d93
Use explicit join
2016-04-29 19:28:56 +01:00
8f99cd5996
Oops, actually specify the user id
2016-04-29 19:27:03 +01:00
60f44c098d
Remove unnecessary if
2016-04-29 19:17:10 +01:00
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
Mark Haines