Matthew Hodgson
b3e346f40c
don't pass a requester if we don't have one to set_displayname
2018-05-04 01:56:01 +01:00
Matthew Hodgson
fb47ce3e6a
make set_profile_* an upsert rather than update, now create_profile is gone
2018-05-04 01:46:26 +01:00
Matthew Hodgson
debf04556b
fix user in user regexp
2018-05-04 01:15:33 +01:00
Matrix
907a62df28
fix strip_invalid_mxid_characters
2018-05-03 23:54:36 +00:00
Matrix
41b987cbc5
unbreak 3pid deletion
2018-05-03 23:54:36 +00:00
Matthew Hodgson
5c74ab4064
fix user_id / user confusion
2018-05-04 00:53:56 +01:00
Matthew Hodgson
383c4ae59c
Merge branch 'dinsic' into matthew/derive-mxid-from-3pid
2018-05-03 23:39:08 +01:00
Matthew Hodgson
f639ac143d
Merge pull request #3180 from matrix-org/matthew/disable-3pid-changes
...
add option to disable changes to the 3PIDs for an account.
2018-05-03 18:19:58 +01:00
Matthew Hodgson
ad0424bab0
Merge pull request #3179 from matrix-org/matthew/disable-set-profile
...
options to disable setting profile info
2018-05-03 18:19:48 +01:00
Matthew Hodgson
2992125561
special case msisdns when deriving mxids from 3pids
2018-05-03 17:52:46 +01:00
David Baker
53d6245529
Change profile replication URI
2018-05-03 14:55:40 +01:00
Matthew Hodgson
25e471dac3
fix defaults in config example
2018-05-03 11:46:56 +01:00
Matthew Hodgson
76fca1730e
fix defaults in example config
2018-05-03 11:46:11 +01:00
Matthew Hodgson
32e4420a66
improve mxid & displayname selection for register_mxid_from_3pid
...
* [x] strip invalid characters from generated mxid
* [x] append numbers to disambiguate clashing mxids
* [x] generate displayanames from 3pids using a dodgy heuristic
* [x] get rid of the create_profile_with_localpart and instead
explicitly set displaynames so they propagate correctly
2018-05-03 04:21:20 +01:00
Matthew Hodgson
79b2583f1b
Merge branch 'dinsic' into matthew/derive-mxid-from-3pid
2018-05-03 02:51:49 +01:00
Matthew Hodgson
8a24c4eee5
add option to disable changes to the 3PIDs for an account.
...
This only considers the /account/3pid API, which should be sufficient
as currently we can't change emails associated with push notifs
(which are provisioned at registration), and we can't directly create
mappings for accounts in an IS other than by answering an invite
2018-05-03 02:47:55 +01:00
Matthew Hodgson
f93cb7410d
options to disable setting profile info
2018-05-03 01:29:12 +01:00
Matthew Hodgson
50d5a97c1b
Merge branch 'master' into dinsic
2018-05-03 00:26:33 +01:00
Neil Johnson
8570bb84cc
Update __init__.py
...
bump version
2018-05-01 18:22:53 +01:00
Richard van der Hoff
d5eee5d601
Merge commit '33f469b' into release-v0.28.1
2018-05-01 18:14:18 +01:00
Richard van der Hoff
d858f3bd4e
Miscellaneous fixes to python_dependencies
...
* add some doc about wtf this thing does
* pin Twisted to < 18.4
* add explicit dep on six (fixes #3089 )
2018-05-01 18:13:54 +01:00
Richard van der Hoff
33f469ba19
Apply some limits to depth to counter abuse
...
* When creating a new event, cap its depth to 2^63 - 1
* When receiving events, reject any without a sensible depth
As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI
2018-05-01 17:54:19 +01:00
David Baker
3a62cacfb0
Use COALESCE rather than IFNULL
...
as this works on sqlite and postgres (postgres doesn't have IFNULL)
2018-05-01 17:54:03 +01:00
David Baker
4d55b16faa
Fix python synatx
2018-05-01 14:32:30 +01:00
David Baker
105709bf32
Fix profile repl
2018-05-01 14:27:14 +01:00
Neil Johnson
28dd536e80
update changelog and bump version to 0.28.0
2018-04-26 15:51:39 +01:00
Erik Johnston
7ec8e798b4
Fix media admin APIs
2018-04-26 11:31:22 +01:00
David Baker
8fddcf703e
Merge remote-tracking branch 'origin/dinsic' into dbkr/user_directory_defer_to_is
2018-04-26 10:23:12 +01:00
Erik Johnston
22881b3d69
Also fix reindexing of search
2018-04-25 15:32:04 +01:00
Erik Johnston
ba3166743c
Fix quarantine media admin API
2018-04-25 15:11:18 +01:00
David Baker
47ed4a4aa7
PR feedback
...
Unnecessary inlineCallbacks, missing yield, SQL comments & trailing
commas.
2018-04-25 13:58:37 +01:00
David Baker
7fafa838ae
Comment why the looping call loops
2018-04-25 11:59:22 +01:00
David Baker
de341bec1b
Add 'ex[erimental API' comment
2018-04-25 11:51:57 +01:00
David Baker
643c89d497
Fix spelling & add experimental API comment
2018-04-25 11:40:37 +01:00
Neil Johnson
2c3e995f38
Bump version and update changelog
2018-04-24 15:33:22 +01:00
Richard van der Hoff
77ebef9d43
Merge pull request #3118 from matrix-org/rav/reject_prev_events
...
Reject events which have lots of prev_events
2018-04-23 17:51:38 +01:00
Richard van der Hoff
9b9c38373c
Remove spurious param
2018-04-23 12:00:06 +01:00
Richard van der Hoff
dc875d2712
Merge pull request #3106 from NotAFile/py3-six-itervalues-1
...
Use six.itervalues in some places
2018-04-20 15:43:52 +01:00
Richard van der Hoff
8dc4a6144b
Merge pull request #3107 from NotAFile/py3-bool-nonzero
...
add __bool__ alias to __nonzero__ methods
2018-04-20 15:43:39 +01:00
Richard van der Hoff
c09a6daf09
Merge pull request #3110 from NotAFile/py3-six-queue
...
Replace Queue with six.moves.queue
2018-04-20 15:35:00 +01:00
Richard van der Hoff
692a3cc806
Merge pull request #3103 from NotAFile/py3-baseexcepton-message
...
Use str(e) instead of e.message
2018-04-20 15:34:49 +01:00
Richard van der Hoff
3de7d9fe99
accept stupid events over backfill
2018-04-20 11:41:03 +01:00
Richard van der Hoff
11a67b7c9d
Merge pull request #3093 from matrix-org/rav/response_cache_wrap
...
Refactor ResponseCache usage
2018-04-20 11:31:17 +01:00
Richard van der Hoff
0c280d4d99
Reinstate linearizer for federation_server.on_context_state_request
2018-04-20 11:10:04 +01:00
Richard van der Hoff
bc381d5798
Merge pull request #3117 from matrix-org/rav/refactor_have_events
...
Refactor store.have_events
2018-04-20 10:26:12 +01:00
Richard van der Hoff
b1dfbc3c40
Refactor store.have_events
...
It turns out that most of the time we were calling have_events, we were only
using half of the result. Replace have_events with have_seen_events and
get_rejection_reasons, so that we can see what's going on a bit more clearly.
2018-04-20 10:25:56 +01:00
David Baker
6554253f48
Option to defer to an ID server for user_directory
2018-04-19 19:28:12 +01:00
Richard van der Hoff
1f4b498b73
Add some comments
2018-04-18 00:15:36 +01:00
Richard van der Hoff
e585228860
Check events on backfill too
2018-04-18 00:06:42 +01:00
Richard van der Hoff
9b7794262f
Reject events which have too many auth_events or prev_events
...
... this should protect us from being dossed by people making silly events
(deliberately or otherwise)
2018-04-18 00:06:42 +01:00