Matthew Hodgson
4fdd02fa24
linting
2017-12-31 14:42:10 +00:00
Matthew Hodgson
843ce19127
fix idiocies and so make tests pass
2017-12-31 14:35:25 +00:00
Matthew Hodgson
7ab77f6502
first cut at a UT
2017-12-31 14:11:15 +00:00
Matthew Hodgson
3a8d9ab16f
don't needlessly return user_id
2017-12-31 14:11:02 +00:00
Matthew Hodgson
ef75daf286
improve docstring
2017-12-31 14:10:49 +00:00
Matthew Hodgson
eb1a429b74
switch get_current_version_info back to being get_version_info
2017-12-31 14:10:31 +00:00
Matthew Hodgson
68e9cfedf3
fix flakes
2017-12-27 23:58:51 +00:00
Matthew Hodgson
1aa87fcca5
fix typos
2017-12-27 23:42:08 +00:00
Matthew Hodgson
fecfa638a6
add a tonne of docstring; make upload_room_keys properly assert version
2017-12-27 23:37:44 +00:00
Matthew Hodgson
98fcffdac4
add a tonne of docstring; make upload_room_keys properly assert version
2017-12-27 23:35:10 +00:00
Matthew Hodgson
a22968d642
more docstring for the e2e_room_keys rest
2017-12-24 17:42:17 +00:00
Matthew Hodgson
dee6849f50
add storage docstring; remove unused set_e2e_room_keys
2017-12-24 16:44:18 +00:00
Matthew Hodgson
a658f4e238
fix factoring out of _should_replace_room_key
2017-12-24 15:03:44 +00:00
Matthew Hodgson
ace298f629
actually spell example right
2017-12-24 14:51:53 +00:00
Matthew Hodgson
59aa35b2c1
Merge branch 'develop' into matthew/e2e_backups
2017-12-24 14:19:04 +00:00
Richard van der Hoff
3f9f1c50f3
Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typo
...
synapse/config/password_auth_providers: Fixed bracket typo
2017-12-18 22:37:21 +00:00
Richard van der Hoff
48fa4e1e5b
Merge pull request #2435 from silkeh/listen-ipv6-default
...
Adapt the default config to bind on both IPv4 and IPv6 on all platforms
2017-12-18 22:34:50 +00:00
Silke
df0f602796
Implement listen_tcp method in remaining workers
...
Signed-off-by: Silke <silke@slxh.eu >
2017-12-18 20:00:42 +01:00
Silke
26cd3f5690
Remove logger argument and do not catch replication listener
...
Signed-off-by: Silke <silke@slxh.eu >
2017-12-18 20:00:42 +01:00
Matthew Hodgson
356829ca16
rename room_key_version table correctly, and fix opt args
2017-12-18 01:58:53 +00:00
Matthew Hodgson
3e98a00658
blindly incorporate PR review - needs testing & fixing
2017-12-18 01:52:46 +00:00
Silke Hofstra
ed48ecc58c
Add methods for listening on multiple addresses
...
Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP
and reactor.listenSSL for multiple addresses.
Signed-off-by: Silke Hofstra <silke@slxh.eu >
2017-12-17 13:15:48 +01:00
Silke Hofstra
37d1a90025
Allow binds to both :: and 0.0.0.0
...
Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed.
This causes a warning explaining the behaviour.
Configuration changed to match.
See #2232
Signed-off-by: Silke Hofstra <silke@slxh.eu >
2017-12-17 13:10:31 +01:00
Willem Mulder
3e59143ba8
Adapt the default config to bind on IPv6.
...
Most deployments are on Linux (or Mac OS), so this would actually bind
on both IPv4 and IPv6.
Resolves #1886 .
Signed-off-by: Willem Mulder <willemmaster@hotmail.com >
2017-12-17 13:07:37 +01:00
Erik Johnston
ba24576f2f
Merge pull request #2717 from matrix-org/erikj/createroom_content
...
Fix wrong avatars when inviting multiple users when creating room
2017-12-07 20:00:34 +00:00
Erik Johnston
d8a6c734fa
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
2017-12-07 14:24:01 +00:00
Erik Johnston
ef045dcd71
Copy dict in update_membership too
2017-12-07 14:17:15 +00:00
Matthew Hodgson
124efee9ea
make /room_keys/version work
2017-12-06 10:02:49 +01:00
Matthew Hodgson
552934ebac
implement /room_keys/version too (untested)
2017-12-06 01:02:57 +00:00
Matthew Hodgson
602b647503
document the API
2017-12-05 23:06:43 +00:00
Matthew Hodgson
7983840682
make it work and fix pep8
2017-12-05 21:44:25 +00:00
Matthew Hodgson
e558f213e9
interim WIP checkin; doesn't build yet
2017-12-05 17:54:48 +00:00
Matthew Hodgson
33cb7ef0b7
Merge pull request #2723 from matrix-org/matthew/search-all-local-users
...
Add all local users to the user_directory and optionally search them
2017-12-05 11:09:47 +00:00
Matthew Hodgson
cdc2cb5d11
fix StoreError syntax
2017-12-05 11:09:31 +00:00
Richard van der Hoff
16ec3805e5
Fix error when deleting devices
...
This was introduced in d7ea8c4 / PR #2728
2017-12-05 09:49:22 +00:00
Richard van der Hoff
8529874368
Merge pull request #2729 from matrix-org/rav/custom_ui_auth
...
support custom login types for validating users
2017-12-05 09:43:43 +00:00
Richard van der Hoff
da1010c83a
support custom login types for validating users
...
Wire the custom login type support from password providers into the UI-auth
user-validation flows.
2017-12-05 09:43:30 +00:00
Richard van der Hoff
cc58e177f3
Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_auth
...
Factor out a validate_user_via_ui_auth method
2017-12-05 09:42:46 +00:00
Richard van der Hoff
d7ea8c4800
Factor out a validate_user_via_ui_auth method
...
Collect together all the places that validate a logged-in user via UI auth.
2017-12-05 09:42:30 +00:00
Richard van der Hoff
aa6ecf0984
Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_return
...
Refactor UI auth implementation
2017-12-05 09:40:38 +00:00
Richard van der Hoff
d5f9fb06b0
Refactor UI auth implementation
...
Instead of returning False when auth is incomplete, throw an exception which
can be caught with a wrapper.
2017-12-05 09:40:05 +00:00
Matthew Hodgson
824b3393cf
total WIP skeleton for /room_keys API
2017-12-05 01:29:25 +00:00
Matthew Hodgson
c22e73293a
speed up the rate of initial spam for users
2017-12-04 18:05:28 +00:00
Matthew Hodgson
b11dca2025
better doc
2017-12-04 17:51:33 +00:00
Matthew Hodgson
7b86c1fdcd
try make tests work a bit more...
2017-12-04 17:10:03 +00:00
Richard van der Hoff
58ebdb037c
Merge pull request #2716 from matrix-org/rav/federation_client_post
...
federation_client script: Support for posting content
2017-12-04 17:04:08 +00:00
Matthew Hodgson
95f8a713dc
erik told me to
2017-12-04 16:56:25 +00:00
Matthew Hodgson
74e0cc74ce
fix pep8 and tests
2017-12-04 15:11:38 +00:00
Matthew Hodgson
1bd40ca73e
switch to a simpler 'search_all_users' button as per review feedback
2017-12-04 14:58:39 +00:00
Matthew Hodgson
f397153dfc
Merge branch 'develop' into matthew/search-all-local-users
2017-11-30 01:51:38 +00:00