Erik Johnston
|
978fa53cc2
|
Pull out min stream_ordering from ex_outlier_stream
|
2016-07-15 10:22:30 +01:00 |
|
Erik Johnston
|
eec9609e96
|
event_backwards_extremeties may not be empty
|
2016-07-15 10:22:09 +01:00 |
|
Erik Johnston
|
a3036ac37e
|
Merge pull request #921 from matrix-org/erikj/account_deactivate
Feature: Add an /account/deactivate endpoint
|
2016-07-14 17:25:15 +01:00 |
|
Erik Johnston
|
209e04fa11
|
Merge pull request #918 from negzi/bugfix_for_token_expiry
Bug fix: expire invalid access tokens
|
2016-07-14 15:51:52 +01:00 |
|
Erik Johnston
|
848d3bf2e1
|
Add hs object
|
2016-07-14 10:25:52 +01:00 |
|
Erik Johnston
|
b55c770271
|
Only accept password auth
|
2016-07-14 10:00:38 +01:00 |
|
Erik Johnston
|
d543b72562
|
Add an /account/deactivate endpoint
|
2016-07-14 09:56:53 +01:00 |
|
Negar Fazeli
|
0136a522b1
|
Bug fix: expire invalid access tokens
|
2016-07-13 15:00:37 +02: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
|
c55ad2e375
|
be more pythonic
|
2016-07-12 14:15:10 +01:00 |
|
David Baker
|
aaa9d9f0e1
|
on_OPTIONS isn't neccessary
|
2016-07-12 14:13:14 +01:00 |
|
David Baker
|
75fa7f6b3c
|
Remove other debug logging
|
2016-07-12 14:08:57 +01:00 |
|
David Baker
|
a5db0026ed
|
Separate out requestTokens to separate handlers
|
2016-07-11 09:57:07 +01:00 |
|
David Baker
|
9c491366c5
|
Oops, remove debug logging
|
2016-07-11 09:07:40 +01:00 |
|
David Baker
|
385aec4010
|
Implement https://github.com/matrix-org/matrix-doc/pull/346/files
|
2016-07-08 17:42:48 +01:00 |
|
Mark Haines
|
10f4856b0c
|
Merge pull request #914 from matrix-org/markjh/upgrade
Ensure that the guest user is in the database when upgrading accounts
|
2016-07-08 17:02:06 +01:00 |
|
Mark Haines
|
dfde67a6fe
|
Add a comment explaining allow_none
|
2016-07-08 15:57:06 +01:00 |
|
Mark Haines
|
10c843fcfb
|
Ensure that the guest user is in the database when upgrading accounts
|
2016-07-08 15:15:55 +01:00 |
|
Erik Johnston
|
58930da52b
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2016-07-08 14:11:37 +01:00 |
|
Erik Johnston
|
0870588c20
|
Merge branch 'hotfixes-v0.16.1'
|
2016-07-08 13:22:32 +01:00 |
|
Erik Johnston
|
f90cf150e2
|
Bump version and changelog
|
2016-07-07 16:33:00 +01:00 |
|
Erik Johnston
|
067596d341
|
Fix bug where we did not correctly explode when multiple user_ids were set in macaroon
|
2016-07-07 16:22:24 +01:00 |
|
Erik Johnston
|
70d650be2b
|
Merge pull request #911 from matrix-org/erikj/purge_history
Feature: Purge local room history.
|
2016-07-07 13:34:28 +01:00 |
|
Erik Johnston
|
b92e7955be
|
Comment
|
2016-07-07 11:42:15 +01:00 |
|
Erik Johnston
|
c98e1479bd
|
Return 400 rather than 500
|
2016-07-07 11:41:07 +01:00 |
|
Erik Johnston
|
67f2c901ea
|
Add rest servlet. Fix SQL.
|
2016-07-06 15:56:59 +01:00 |
|
Erik Johnston
|
eef7778af9
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2
|
2016-07-06 14:50:22 +01:00 |
|
Erik Johnston
|
a17e7caeb7
|
Merge branch 'erikj/shared_secret' into erikj/test2
|
2016-07-06 14:46:31 +01:00 |
|
Erik Johnston
|
f0c06ac65c
|
Merge pull request #909 from matrix-org/erikj/shared_secret
Add an admin option to shared secret registration (breaks backwards compat)
|
2016-07-06 14:08:51 +01:00 |
|
Erik Johnston
|
76b18df3d9
|
Check that there are no null bytes in user and passsword
|
2016-07-06 11:17:53 +01:00 |
|
Erik Johnston
|
0da24cac8b
|
Add null separator to hmac
|
2016-07-06 11:05:16 +01:00 |
|
Erik Johnston
|
2e3c8acc68
|
Merge pull request #910 from KentShikama/hash_password_followup
Follow up to adding password pepper
|
2016-07-06 09:59:59 +01:00 |
|
Kent Shikama
|
8d9a884cee
|
Update password config comment
Signed-off-by: Kent Shikama <kent@kentshikama.com>
|
2016-07-06 12:18:19 +09:00 |
|
Kent Shikama
|
896bc6cd46
|
Update hash_password script
Signed-off-by: Kent Shikama <kent@kentshikama.com>
|
2016-07-06 12:17:54 +09:00 |
|
Erik Johnston
|
be3548f7e1
|
Remove spurious txn
|
2016-07-05 17:46:51 +01:00 |
|
Erik Johnston
|
4adf93e0f7
|
Fix for postgres
|
2016-07-05 17:34:25 +01:00 |
|
Erik Johnston
|
651faee698
|
Add an admin option to shared secret registration
|
2016-07-05 17:30:22 +01:00 |
|
Erik Johnston
|
caf33b2d9b
|
Protect password when registering using shared secret
|
2016-07-05 17:18:19 +01:00 |
|
Erik Johnston
|
8f8798bc0d
|
Add ReadWriteLock for pagination and history prune
|
2016-07-05 15:30:25 +01:00 |
|
Erik Johnston
|
7335f0adda
|
Add ReadWriteLock
|
2016-07-05 15:23:17 +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 |
|
Mark Haines
|
04dee11e97
|
Merge pull request #906 from matrix-org/markjh/faster_events_around
Use a query that postgresql optimises better for get_events_around
|
2016-07-05 14:48:34 +01:00 |
|
Mark Haines
|
dd2ccee27d
|
Fix typo
|
2016-07-05 14:06:07 +01:00 |
|
Mark Haines
|
b6b0132ac7
|
Make get_events_around more efficient on sqlite3
|
2016-07-05 13:55:18 +01:00 |
|
Erik Johnston
|
e34cb5e7dc
|
Merge pull request #907 from KentShikama/pepper
Add pepper to password hashing
|
2016-07-05 11:26:22 +01:00 |
|
Kent Shikama
|
252ee2d979
|
Remove default password pepper string
|
2016-07-05 19:15:51 +09:00 |
|
Kent Shikama
|
14362bf359
|
Fix password config
|
2016-07-05 19:12:53 +09:00 |
|
Kent Shikama
|
1ee2584307
|
Fix pep8
|
2016-07-05 19:01:00 +09:00 |
|
Kent Shikama
|
507b8bb091
|
Add comment to prompt changing of pepper
|
2016-07-05 18:42:35 +09:00 |
|
Mark Haines
|
d44d11d864
|
Use true/false for boolean parameter inclusive to avoid potential for sqli, and possibly make the code clearer
|
2016-07-05 10:39:13 +01:00 |
|