dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-09-26 13:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,586 Commits 1,219 Branches 851 Tags
e252ffadbc1df609d9455e0bfbc68dfe5cd146ee
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker 59975f9a63 Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login 
Fix SSO fallback login
 2019-09-12 12:02:14 +01:00
David Baker f2d2ae03da Add some logging to 3pid invite sig verification (#5015) 
I had to add quite a lot of logging to diagnose a problem with 3pid
invites - we only logged the one failure which isn't all that
informative.

NB. I'm not convinced the logic of this loop is right: I think it
should just accept a single valid signature from a trusted source
rather than fail if *any* signature is invalid. Also it should
probably not skip the rest of middle loop if a check fails? However,
I'm deliberately not changing the logic here.
 2019-06-18 22:51:24 +01:00
David Baker 07cff7b121 Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only 
Re-order registration stages to do msisdn & email auth last
 2019-05-16 17:27:39 +01:00
David Baker fafb936de5 Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering 
Only check 3pids not in use when registering
 2019-05-16 10:58:09 +01:00
David Baker cd0faba7cd Make newsfile clearer 2019-05-15 20:53:48 +01:00
David Baker 1c0051114a Add 'sandbox' to CSP for media repo (#4284) 
* Add 'sandbox' to the CSP for media repo

* Changelog
 2018-12-20 11:09:18 +00:00
David Baker 89ac2a5bdb Add 'sandbox' to CSP for media repo (#4284) 
* Add 'sandbox' to the CSP for media repo

* Changelog
 2018-12-11 04:05:02 +11:00
David Baker 0869566ad3 Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbers 
Make e2e backup versions numeric in the DB
 2018-11-14 07:55:48 +00:00
David Baker 03c11032c3 Merge pull request #4019 from matrix-org/dbkr/e2e_backups 
E2E backups
 2018-10-15 10:19:43 +01:00
David Baker c91a44572e Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults 
Comment dummy TURN parameters in default config
 2018-07-18 11:56:18 +01:00
David Baker 187a546bff Merge pull request #3276 from matrix-org/dbkr/unbind 
Remove email addresses / phone numbers from ID servers when they're removed from synapse
 2018-06-11 16:02:00 +01:00
David Baker 0e505b1913 Merge pull request #3372 from matrix-org/rav/better_verification_logging 
Try to log more helpful info when a sig verification fails
 2018-06-08 13:32:02 +01:00
David Baker ad9edd1d96 Merge pull request #3371 from matrix-org/rav/fix_get_missing_events 
Fix event filtering in get_missing_events handler
 2018-06-08 13:19:15 +01:00
David Baker ecc4b88bd1 Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir 
Remove users from user directory on deactivate
 2018-05-24 16:12:12 +01:00
David Baker 8cbbfd16fb Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate 
Part user from rooms on account deactivate
 2018-05-14 11:31:48 +01:00
David Baker 7190a550dc Merge pull request #2650 from matrix-org/dbkr/push_include_content_option 
Rename redact_content option to include_content
 2017-11-15 10:47:38 +00:00
David Baker f851bc8182 Merge pull request #2630 from matrix-org/luke/fix-rooms-in-group 
Make the get_rooms_in_group API more sane
 2017-11-02 17:23:17 +00:00
David Baker 9e09a1800b Merge pull request #2629 from matrix-org/rav/register_inhibit_login 
support inhibit_login in /register
 2017-11-02 16:51:35 +00:00
David Baker 4a6754baf2 Merge pull request #2628 from matrix-org/rav/module_api_hooks 
Add more hooks to ModuleApi
 2017-11-02 15:37:14 +00:00
David Baker d4553818a0 Merge pull request #2627 from matrix-org/rav/custom_rest_endpoints 
Add a hook for custom rest endpoints
 2017-11-02 15:18:37 +00:00
David Baker 6b6f03ae05 Merge pull request #2626 from matrix-org/rav/refactor_module_api 
Factor _AccountHandler proxy out to ModuleApi
 2017-11-02 15:15:30 +00:00
David Baker 77e3757fa9 Merge pull request #2625 from matrix-org/rav/named_resource_refactor 
Factor out _configure_named_resource
 2017-11-02 15:11:30 +00:00
David Baker b19d9e2174 Merge pull request #2624 from matrix-org/rav/password_provider_notify_logout 
Notify auth providers on logout
 2017-11-02 10:55:17 +00:00
David Baker 1f080a6c97 Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providers 
Allow password_auth_providers to return a callback
 2017-11-02 10:49:03 +00:00
David Baker 04897c9dc1 Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providers 
Let auth providers get to the database
 2017-11-02 10:41:25 +00:00
David Baker c9b9ef575b Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_delete 
Move access token deletion into auth handler
 2017-11-01 16:26:06 +00:00
David Baker e5e930aec3 Merge pull request #2615 from matrix-org/rav/break_auth_device_dep 
Break dependency of auth_handler on device_handler
 2017-11-01 16:06:31 +00:00
David Baker fbbacb284e Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens 
Remove the last vestiges of refresh_tokens
 2017-11-01 15:57:35 +00:00
David Baker 691cc4e036 Merge pull request #2618 from matrix-org/dbkr/log_login_requests 
Log login requests
 2017-11-01 14:11:28 +00:00
David Baker c31a7c3ff6 Merge pull request #2609 from matrix-org/rav/refactor_login 
Refactor some logic from LoginRestServlet into AuthHandler
 2017-10-31 13:51:36 +00:00
David Baker a1f8b0fd64 Merge pull request #2608 from matrix-org/rav/password_provider_doc 
Start some documentation on password providers
 2017-10-31 13:40:10 +00:00
David Baker 4e242b3e20 Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms 
Add config option to auto-join new users to rooms
 2017-10-17 11:45:49 +01:00
David Baker 99a6c9dbf2 Merge pull request #2542 from matrix-org/dbkr/room_notif_no_glob 
Omit the *s for @room notifications
 2017-10-16 13:46:17 +01:00
David Baker b8d8ed1ba9 Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages 
Allow error strings from spam checker
 2017-10-12 10:31:03 +01:00
David Baker 5de926d66f Merge pull request #2502 from matrix-org/dbkr/allow_dms_to_admins 
Spam checking: add the invitee to user_may_invite
 2017-10-05 14:14:13 +01:00
David Baker 44f8e383f3 Merge pull request #2500 from matrix-org/dbkr/fix_word_boundary_mentions 
Fix notif kws that start/end with non-word chars
 2017-10-05 12:27:59 +01:00
David Baker 93b0cf7a99 Merge pull request #2495 from matrix-org/dbkr/spam_check_room_creation 
Add room creation checks to spam checker
 2017-10-04 14:49:20 +01:00
David Baker 5f20a91fa1 Merge pull request #2492 from matrix-org/dbkr/spam_check_invites 
Allow spam checker to reject invites too
 2017-10-03 18:10:23 +01:00
David Baker 74e494b010 Merge pull request #2474 from matrix-org/dbkr/spam_check_module 
Make the spam checker a module
 2017-09-27 11:31:00 +01:00
David Baker ccc67d445b Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loading 
Factor out module loading to a separate place
 2017-09-26 18:12:17 +01:00
David Baker 862c8da560 Merge pull request #2450 from matrix-org/dbkr/push_event_id_only 
Add support for event_id_only push format
 2017-09-18 16:41:29 +01:00
David Baker 60833c8978 Merge pull request #2147 from matrix-org/dbkr/http_request_propagate_error 
Propagate errors sensibly from proxied IS requests
 2017-05-03 11:23:25 +01:00
David Baker 405ba4178a Merge pull request #2102 from DanielDent/add-auth-email 
Support authenticated SMTP
 2017-04-10 15:42:16 +01:00
David Baker e36950dec5 Merge pull request #2055 from matrix-org/dbkr/fix_add_msisdn_requestToken 
Fix token request for addition of phone numbers
 2017-03-24 10:32:57 +00:00
David Baker f902e89d4b Merge pull request #2056 from matrix-org/dbkr/fix_invite_reject 
Fix rejection of invites not reaching sync
 2017-03-24 10:32:51 +00:00
David Baker 0ad44acb5a Merge pull request #1997 from matrix-org/dbkr/cas_partialdownload 
Handle PartialDownloadError in CAS login
 2017-03-15 13:52:34 +00:00
David Baker 663396e45d Merge pull request #1971 from matrix-org/dbkr/msisdn_signin 
Support registration & login with phone number
 2017-03-09 10:18:51 +00:00
David Baker ec8d7603e6 Merge pull request #1925 from matrix-org/dbkr/pushers_lang_lengthen 
Make the pushers lang field column longer
 2017-02-17 11:29:06 +00:00
David Baker 8c87bb550e Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban 
Allow forgetting rooms you're banned from
 2017-02-17 10:52:30 +00:00
David Baker fa467e62a9 Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work 
Make kick & ban reasons work
 2017-02-14 16:10:06 +00:00
David Baker 9adcd3a514 Merge pull request #1891 from matrix-org/dbkr/remove_unused_constants 
Remove a few aspirational but unused constants
 2017-02-08 13:30:40 +00:00
David Baker 691c8198b7 Merge pull request #1832 from xsteadfastx/xsteadfastx/turn-username-password 
Added username and password for turn server
 2017-01-19 14:28:31 +00:00
David Baker 97d3918377 Merge pull request #1811 from aperezdc/unhardcode-riot-urls 
Allow configuring the Riot URL used in notification emails
 2017-01-18 14:38:49 +00:00
David Baker 6f6bf2a1eb Merge pull request #1827 from matrix-org/dbkr/email_case_insensitive 
Lowercase all email addresses before querying db
 2017-01-18 13:39:47 +00:00
David Baker bea15fb599 Merge pull request #1714 from matrix-org/dbkr/delete_threepid 
Add /account/3pid/delete endpoint
 2016-12-21 09:51:04 +00:00
David Baker 9164bfa1c3 Merge pull request #1191 from matrix-org/dbkr/non_ascii_passwords 
Don't error on non-ascii passwords
 2016-11-03 11:21:07 +00:00
David Baker 7d2cf7e960 Merge pull request #1170 from matrix-org/dbkr/password_reset_case_insensitive 
Make password reset email field case insensitive
 2016-10-19 13:29:44 +01:00
David Baker b5665f7516 Merge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brand 
Add Riot brand to email notifs
 2016-10-04 12:47:05 +01:00
David Baker d213884c41 Merge pull request #1099 from matrix-org/dbkr/make_notif_highlight_query_fast 
Add index to event_push_actions
 2016-09-09 19:39:09 +01:00
David Baker c3276aef25 Merge pull request #1080 from matrix-org/dbkr/fix_notifications_api_with_from 
Fix /notifications API when used with `from` param
 2016-09-08 17:35:35 +01:00
David Baker 0d7cef0943 Merge pull request #1011 from matrix-org/dbkr/contains_display_name_override 
Move display name rule
 2016-08-17 16:15:45 +01:00
David Baker 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
David Baker 27771b2495 Merge pull request #994 from matrix-org/rav/fix_cas_login 
Fix CAS login
 2016-08-08 17:47:45 +01:00
David Baker 26a8c1d7ab Merge pull request #968 from matrix-org/dbkr/fix_add_email_on_register 
Fix adding emails on registration
 2016-08-02 10:32:17 +01:00
David Baker d34e9f93b7 Merge pull request #949 from matrix-org/rav/update_devices 
Implement updates and deletes for devices
 2016-07-26 10:49:55 +01:00
David Baker 4fcdf7b4b2 Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostname 
Log the hostname the reCAPTCHA was completed on
 2016-07-25 16:10:39 +01:00
David Baker 68a92afcff Merge pull request #944 from matrix-org/rav/devices_returns_list 
make /devices return a list
 2016-07-21 17:00:26 +01:00
David Baker 2c28e25bda Merge pull request #943 from matrix-org/rav/get_device_api 
Implement GET /device/{deviceId}
 2016-07-21 13:41:42 +01:00
David Baker 1e6e370b76 Merge pull request #942 from matrix-org/rav/fix_register_deviceid 
Preserve device_id from first call to /register
 2016-07-21 13:16:31 +01:00
David Baker 44adde498e Merge pull request #939 from matrix-org/rav/get_devices_api 
GET /devices endpoint
 2016-07-21 11:54:47 +01:00
David Baker 742056be0d Merge pull request #937 from matrix-org/rav/register_device_on_register 
Register a device_id in the /v2/register flow.
 2016-07-20 16:51:27 +01:00
David Baker e967bc86e7 Merge pull request #932 from matrix-org/rav/register_refactor 
Further registration refactoring
 2016-07-20 11:03:33 +01:00
David Baker b9e997f561 Merge pull request #931 from matrix-org/rav/refactor_register 
rest/client/v2_alpha/register.py: Refactor flow somewhat.
 2016-07-19 16:13:45 +01:00
David Baker a37ee2293c Merge pull request #915 from matrix-org/dbkr/more_requesttokens 
Add requestToken endpoints
 2016-07-13 11:51:46 +01:00
David Baker ef535178ff Merge pull request #904 from matrix-org/dbkr/register_email_no_untrusted_id_server 
requestToken update
 2016-07-05 15:13:34 +01:00
David Baker 7846ac3125 Merge pull request #900 from RickCogley/RickCogley-coturn-readme-2 
Rick cogley coturn readme 2
 2016-06-28 10:49:02 +01:00
David Baker db74dcda5b Merge pull request #894 from matrix-org/dbkr/push_room_naming 
Use similar naming we use in email notifs for push
 2016-06-28 10:12:24 +01:00
David Baker 13517e2914 Merge pull request #892 from matrix-org/dbkr/email_notif_most_recent 
Put most recent 20 messages in notif
 2016-06-23 09:25:45 +01:00
David Baker 0126a5d60a Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail 
Fix substitution failure in mail template
 2016-06-21 13:48:54 +01:00
David Baker 81d226888f Merge pull request #834 from matrix-org/dbkr/fix_email_from 
Fix email notif From
 2016-06-03 16:54:29 +01:00
David Baker 6bb9aacf9d Merge pull request #821 from matrix-org/dbkr/email_unsubscribe 
Email unsubscribe links that don't require logging in
 2016-06-02 17:44:55 +01:00
David Baker 7a5a5f2df2 Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_error 
Fix error in email notification string formatting
 2016-06-02 17:26:06 +01:00
David Baker fb2193cc63 Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler 
Split out the auth handler
 2016-06-02 14:31:35 +01:00
David Baker 07233a1ec8 Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none 
Use user_id in email greeting if display name is null
 2016-06-02 09:52:19 +01:00
David Baker 00c487a8db Merge pull request #808 from matrix-org/dbkr/room_list_spider 
Add secondary_directory_servers option to fetch room list from other servers
 2016-06-01 15:32:52 +01:00
David Baker 1db79d6192 Merge pull request #810 from matrix-org/dbkr/limit_email_notifs 
Limit number of notifications in an email notification
 2016-06-01 12:49:22 +01:00
David Baker 163e48c0e3 Merge pull request #802 from matrix-org/dbkr/split_room_list_handler 
Split out the room list handler
 2016-05-31 11:32:44 +01:00
David Baker 209ba4d024 Merge pull request #795 from matrix-org/dbkr/delete_push_actions_after_a_month 
Only delete push actions after 30 days
 2016-05-24 16:22:13 +01:00
David Baker cbf8d146ac Merge pull request #799 from matrix-org/matthew/quieter-email-notifs 
Tune email notifs to make them quieter:
 2016-05-24 14:30:51 +01:00
David Baker 56aae0eaf5 Merge pull request #758 from matrix-org/dbkr/fix_password_reset 
Fix password reset
 2016-04-29 12:45:39 +01:00
David Baker 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
David Baker 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
David Baker d33d623f0d Merge pull request #716 from matrix-org/dbkr/get_pushers 
Add get endpoint for pushers
 2016-04-12 14:40:37 +01:00
David Baker 2547dffccc Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions 
Change pushers to use the event_actions table
 2016-04-11 12:58:55 +01:00
David Baker c9500a9c1d Merge pull request #678 from matrix-org/dbkr/push_obey_enable 
Don't ignore the obey overlay if the rule has an enabled attribute of False
 2016-03-31 10:26:22 +01:00
David Baker 31e6f8636f Merge pull request #667 from matrix-org/dbkr/never_notify_member_events 
Never notify for member events.
 2016-03-24 13:48:02 +00:00
David Baker 384ee6eafb Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username 
Make registration idempotent, part 2
 2016-03-17 14:34:08 +00:00
David Baker 48b2e853a8 Merge pull request #649 from matrix-org/dbkr/idempotent_registration 
Make registration idempotent
 2016-03-16 16:35:45 +00:00
David Baker c00f4e48ba Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params 
Encode unicode objects given to post_urlencode*
 2016-03-08 13:51:49 +00:00
David Baker f40131b4d9 Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id 
Send the user ID matching the guest access token
 2016-03-08 10:20:41 +00:00