617501dd2a
Move token generation to auth handler
...
I prefer the auth handler to worry about all auth, and register to call
into it as needed, than to smatter auth logic between the two.
2015-08-20 11:35:56 +01:00
099ce4bc38
Merge pull request #231 from matrix-org/erikj/pushers_store_last_token
...
Push: store the 'last_token' in the db, even if we processed no events
2015-08-20 11:27:31 +01:00
22346a0ee7
Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails
...
Always return a thumbnail of the requested size.
2015-08-20 11:27:15 +01:00
cbd053bb8f
Merge pull request #233 from matrix-org/erikj/canonical_alias
...
Add server side support for canonical aliases
2015-08-20 11:26:09 +01:00
be27d81808
Merge pull request #234 from matrix-org/email_login
...
Support logging in with email addresses (or other threepids)
2015-08-20 11:15:42 +01:00
ade5342752
Merge branch 'auth' into refresh
2015-08-20 11:03:47 +01:00
4cf302de5b
Comma comma comma comma comma chameleon
2015-08-20 10:31:18 +01:00
c50ad14bae
Merge branch 'develop' into email_login
2015-08-20 10:16:01 +01:00
a0b8e5f2fe
Merge pull request #211 from matrix-org/email_in_use
...
Changes for unique emails
2015-08-20 10:04:04 +01:00
aadb2238c9
Check that the canonical room alias actually points to the room
2015-08-20 09:55:04 +01:00
f9e7493ac2
Merge branch 'develop' into auth
2015-08-19 15:20:09 +01:00
ecc59ae66e
Merge branch 'master' into auth
2015-08-19 15:19:37 +01:00
70e265e695
Re-add whitespace around caveat operators
2015-08-19 14:30:31 +01:00
09d23b6209
Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms
...
Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
2015-08-19 13:50:40 +01:00
daa01842f8
Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
2015-08-19 13:46:03 +01:00
7f08ebb772
Switch to pymacaroons-pynacl
2015-08-19 13:21:36 +01:00
d7272f8d9d
Add canonical alias to the default power levels
2015-08-19 12:03:09 +01:00
78fa346b07
Store the 'last_token' in the db, even if we processed no events
2015-08-19 10:08:31 +01:00
a45ec7c651
Block on storing the current last_tokens
2015-08-19 10:08:12 +01:00
40da1f200d
Remove an access token log line
2015-08-19 09:41:07 +01:00
abc6986a24
Fix regression where we incorrectly responded with a 200 to /login
2015-08-19 09:31:11 +01:00
ce832c38d4
Remove padding space around caveat operators
2015-08-18 17:39:26 +01:00
42e858daeb
Fix units in test
...
I made the non-test seconds instead of ms, but not the test
2015-08-18 17:38:37 +01:00
e624cdec64
Merge pull request #228 from matrix-org/erikj/_get_state_for_groups
...
Ensure we never return a None event from _get_state_for_groups
2015-08-18 16:30:17 +01:00
c3dd2ecd5e
Merge pull request #230 from matrix-org/erikj/appservice_auth_entity
...
Set request.authenticated_entity for application services
2015-08-18 16:30:11 +01:00
38a965b816
Merge pull request #227 from matrix-org/erikj/receipts_take2
...
Re-enable receipts API.
2015-08-18 16:30:04 +01:00
a82938416d
Remove newline because vertical whitespace makes mjark sad
2015-08-18 16:28:13 +01:00
0bfdaf1f4f
Rejig the code to make it nicer
2015-08-18 16:26:07 +01:00
a5cbd20001
Merge pull request #225 from matrix-org/erikj/reactor_metrics
...
Fix pending_calls metric to not lie
2015-08-18 16:21:11 +01:00
128ed32e6b
Bump size of get_presence_state cache
2015-08-18 15:51:23 +01:00
3e6fdfda00
Fix some formatting to use tuples
2015-08-18 15:18:50 +01:00
ee59af9ac0
Set request.authenticated_entity for application services
2015-08-18 15:17:47 +01:00
1469141023
Merge branch 'develop' into auth
2015-08-18 14:43:44 +01:00
cacdb529ab
Remove accidentally added file
2015-08-18 14:27:23 +01:00
2d3462714e
Issue macaroons as opaque auth tokens
...
This just replaces random bytes with macaroons. The macaroons are not
inspected by the client or server.
In particular, they claim to have an expiry time, but nothing verifies
that they have not expired.
Follow-up commits will actually enforce the expiration, and allow for
token refresh.
See https://bit.ly/matrix-auth for more information
2015-08-18 14:22:02 +01:00
f704c10f29
Rename unhelpful variable name
2015-08-18 11:54:03 +01:00
6e7d36a72c
Also check for presence of 'threadCallQueue' in reactor
2015-08-18 11:51:08 +01:00
d3da63f766
Use more helpful variable names
2015-08-18 11:47:00 +01:00
8199475ce0
Ensure we never return a None event from _get_state_for_groups
2015-08-18 11:44:10 +01:00
0d4abf7777
Typo
2015-08-18 11:19:08 +01:00
e55291ce5e
None check
2015-08-18 11:17:37 +01:00
8e254862f4
Don't assume @cachedList function returns keys for everything
2015-08-18 11:11:33 +01:00
85d0bc3bdc
Reduce cache size from obscenely large to quite large
2015-08-18 11:00:38 +01:00
cfc503681f
Comments
2015-08-18 10:49:23 +01:00
dc2a105fca
Merge pull request #226 from matrix-org/erikj/room_presence
...
Add and use cached batched storage.get_state function.
2015-08-18 10:43:50 +01:00
83eb627b5a
More helpful variable names
2015-08-18 10:33:11 +01:00
776ee6d92b
Doc strings
2015-08-18 10:30:07 +01:00
f72ed6c6a3
Remove debug try/catch
2015-08-18 10:29:49 +01:00
8899df13bf
Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation
...
Federation for end-to-end key requests.
2015-08-18 09:12:54 +01:00
8f4165628b
Add index receipts_linearized_room_stream
2015-08-17 14:43:54 +01:00
Daniel Wagner-Hall