David Baker
|
f1c7f8e813
|
Merge branch 'develop' into http_client_refactor
|
2014-11-20 17:49:48 +00:00 |
|
David Baker
|
e377d33652
|
Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
|
2014-11-20 17:41:56 +00:00 |
|
Mark Haines
|
db9ce032a4
|
Fix pep8 codestyle warnings
|
2014-11-20 17:26:36 +00:00 |
|
Mark Haines
|
dfdda2c871
|
Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
|
2014-11-20 17:10:37 +00:00 |
|
Mark Haines
|
32090aee16
|
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
|
2014-11-20 16:24:00 +00:00 |
|
David Baker
|
20326054da
|
Oops, I removed this param.
|
2014-11-20 15:24:38 +00:00 |
|
David Baker
|
dc60eee50e
|
Refactor the HTTP clients a little.
|
2014-11-20 13:53:34 +00:00 |
|
David Baker
|
cf66532ac1
|
CaptchaServerHttpClient should extend the base, not matrix http client.
|
2014-11-20 12:48:21 +00:00 |
|
Mark Haines
|
b2aeaa2dcc
|
Merge branch 'master' into develop
|
2014-11-20 10:00:13 +00:00 |
|
Mark Haines
|
dcb99e4972
|
SYN-153: Fix formatting of federation error message
|
2014-11-20 09:58:23 +00:00 |
|
Erik Johnston
|
1a9551db82
|
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
|
2014-11-19 18:03:03 +00:00 |
|
Erik Johnston
|
5b46ce579b
|
Bump version, changelog and upgrade.rst
|
2014-11-19 18:00:57 +00:00 |
|
Erik Johnston
|
415ddf59bb
|
Don't add a 'prev' key to m.room.member messages
|
2014-11-19 17:59:51 +00:00 |
|
Paul "LeoNerd" Evans
|
03dc63f6c8
|
Initialise UserPresenceCache instances to always contain a 'presence' key
|
2014-11-19 17:31:46 +00:00 |
|
Erik Johnston
|
4eada9a908
|
Fix backfill request
|
2014-11-19 17:22:37 +00:00 |
|
Erik Johnston
|
512993b57f
|
Only users can set state events which have their own user_id
|
2014-11-19 17:22:37 +00:00 |
|
Mark Haines
|
ca91bb2f7f
|
Sometimes there isn't a current logging context
|
2014-11-19 17:18:55 +00:00 |
|
Mark Haines
|
8993affdc0
|
SYN-153: Raise 404 if room alias is not found
|
2014-11-19 17:14:14 +00:00 |
|
Mark Haines
|
0d1221155e
|
remove unused import
|
2014-11-19 16:40:01 +00:00 |
|
Mark Haines
|
c5eabe3143
|
replace user_id with sender
|
2014-11-19 16:38:40 +00:00 |
|
Mark Haines
|
97c7c34f6f
|
Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion
|
2014-11-19 16:37:43 +00:00 |
|
Mark Haines
|
3e54d70ae2
|
SYN-141: Encode query params as UTF-8.
|
2014-11-18 19:43:08 +00:00 |
|
Mark Haines
|
428581dd05
|
SYN-144: Remove bad keys from pdu json objects, convert age_ts to age
for all pdus sent.
|
2014-11-18 19:20:25 +00:00 |
|
Paul "LeoNerd" Evans
|
572a1ca42a
|
Remember also to UTF-8 decode bytes in room alias names in directory server URLs
|
2014-11-18 18:06:35 +00:00 |
|
Paul "LeoNerd" Evans
|
3bfc3dd45b
|
Remember to URL decode the room_id in room initialSync
|
2014-11-18 17:44:55 +00:00 |
|
Mark Haines
|
db7e8b5619
|
SYN-141: Decode the query params as UTF-8
|
2014-11-18 17:17:57 +00:00 |
|
Mark Haines
|
54c438d8d3
|
Remove unused variable
|
2014-11-18 16:46:12 +00:00 |
|
Mark Haines
|
1731af3f29
|
SYN-104: When going backwards the end token should be before the last event
|
2014-11-18 16:45:06 +00:00 |
|
Paul Evans
|
11fd81e398
|
Merge pull request #17 from matrix-org/room-initial-sync
Room initial sync
|
2014-11-18 16:44:25 +00:00 |
|
Paul "LeoNerd" Evans
|
88dfa7baa6
|
Ensure to parse a real pagination config object out of room initialSync request and pass it on
|
2014-11-18 16:34:43 +00:00 |
|
Paul "LeoNerd" Evans
|
75e95c45a2
|
Rename message handler's new snapshot_room to room_initial_sync() as that better suits its purpose
|
2014-11-18 16:02:44 +00:00 |
|
Erik Johnston
|
c6ea29d916
|
Revert accidental commit of bad file
|
2014-11-18 15:57:00 +00:00 |
|
Paul "LeoNerd" Evans
|
e9f587ecba
|
Merge remote-tracking branch 'origin/develop' into room-initial-sync
|
2014-11-18 15:48:30 +00:00 |
|
Mark Haines
|
3553101eb3
|
Null check when determining default power levels
|
2014-11-18 15:43:17 +00:00 |
|
Mark Haines
|
b01dd76be1
|
SYN-149: Enable auth for events added during room creation since they should pass auth checks
|
2014-11-18 15:42:53 +00:00 |
|
Erik Johnston
|
95614e5220
|
Fix auth to correctly handle initial creation of rooms
|
2014-11-18 15:36:41 +00:00 |
|
Mark Haines
|
ae9c2ab165
|
SYN-149: Send join event immediately after the room create event
|
2014-11-18 15:29:48 +00:00 |
|
Paul "LeoNerd" Evans
|
33d328d967
|
Include room members' presence in room initialSync
|
2014-11-18 15:28:58 +00:00 |
|
Paul "LeoNerd" Evans
|
759db7d7d5
|
Added ability to .get_state() from the PresenceHandler by returning a complete m.presence event
|
2014-11-18 15:25:55 +00:00 |
|
Paul "LeoNerd" Evans
|
4c18e08036
|
Don't expect all _user_cachemap entries to definitely contain a "last_active" key
|
2014-11-18 15:10:11 +00:00 |
|
Mark Haines
|
a5b88c489e
|
Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room
|
2014-11-18 15:03:13 +00:00 |
|
Paul "LeoNerd" Evans
|
17f977a9de
|
Include 'messages' snapshot in room initialSync
|
2014-11-18 14:07:51 +00:00 |
|
Mark Haines
|
26fc878944
|
Stop before starting when restarting
|
2014-11-17 19:16:15 +00:00 |
|
Paul "LeoNerd" Evans
|
31a049eb69
|
Merge branch 'develop' into room-initial-sync
Conflicts:
synapse/handlers/message.py
|
2014-11-17 16:59:24 +00:00 |
|
Mark Haines
|
cf45e57d9c
|
SYN-148: Add the alias after creating the room
|
2014-11-17 16:37:33 +00:00 |
|
Mark Haines
|
2eaf689f71
|
These lines aren't doing anything
|
2014-11-17 10:41:35 +00:00 |
|
Mark Haines
|
cb4b6c844a
|
Merge PDUs and Events into one object
|
2014-11-14 21:25:02 +00:00 |
|
Mark Haines
|
8c2b5ea7c4
|
Fix PDU and event signatures
|
2014-11-14 19:11:04 +00:00 |
|
Mark Haines
|
de1ec90133
|
Validate signatures on incoming events
|
2014-11-14 19:11:04 +00:00 |
|
David Baker
|
fe3401e037
|
Be more helpful and tell the user how to generate a config too.
|
2014-11-14 13:30:06 +00:00 |
|
David Baker
|
933ce76057
|
Adding --generate-config will not help if the user has not specified a config file.
|
2014-11-14 13:24:12 +00:00 |
|
Mark Haines
|
e903c941cb
|
Merge branch 'develop' into request_logging
Conflicts:
setup.py
synapse/storage/_base.py
synapse/util/async.py
|
2014-11-14 11:16:50 +00:00 |
|
Mark Haines
|
8d8a133c89
|
SYN-103: Remove "origin" and "destination" keys from edus
|
2014-11-13 15:49:03 +00:00 |
|
Mark Haines
|
e7c6d2c9d9
|
SYN-138: Rewrite synctl in python and include it in the python distribution
|
2014-11-13 14:39:30 +00:00 |
|
Erik Johnston
|
f04b3d5042
|
Store all signatures on events rather than just dropping them
|
2014-11-12 17:02:34 +00:00 |
|
Erik Johnston
|
b2596c660b
|
Add a few more comments to the federation handler
|
2014-11-12 16:20:30 +00:00 |
|
Erik Johnston
|
e715741abc
|
Update some of the docs in event_federation
|
2014-11-12 16:20:30 +00:00 |
|
Erik Johnston
|
e24d5cb97d
|
Document StateStore and use transactions
|
2014-11-12 14:33:48 +00:00 |
|
Erik Johnston
|
58c0ef90c9
|
Add indices to state group tables
|
2014-11-12 14:33:48 +00:00 |
|
Erik Johnston
|
3db0efa69f
|
Fix pyflake warnings and add a FIXME comment to deal with auth_chains received when joining
|
2014-11-12 11:27:02 +00:00 |
|
Erik Johnston
|
6fea478d2e
|
Fix bugs with invites/joins across federatiom.
Both in terms of auth and not trying to fetch missing PDUs for invites,
joins etc.
|
2014-11-12 11:24:11 +00:00 |
|
Erik Johnston
|
61ecb13bf0
|
PEP8ify
|
2014-11-11 18:00:13 +00:00 |
|
Erik Johnston
|
37900a92db
|
Only allow people in a room to look up room state.
|
2014-11-11 17:55:32 +00:00 |
|
Erik Johnston
|
997ed151db
|
synapse.state docs.
|
2014-11-11 17:45:46 +00:00 |
|
Erik Johnston
|
3db2c0d43e
|
Rename annotate_state_groups to annotate_event_with_state
|
2014-11-11 16:58:53 +00:00 |
|
Mark Haines
|
a8ceeec0fd
|
Merge pull request #12 from matrix-org/federation_authorization
Federation authorization
|
2014-11-11 16:40:50 +00:00 |
|
Erik Johnston
|
092979b8cc
|
Fix bugs which broke federation due to changes in function signatures.
|
2014-11-11 14:19:13 +00:00 |
|
Erik Johnston
|
5ff0bfb81d
|
Fix bug where we /always/ created a new state group
|
2014-11-11 14:16:41 +00:00 |
|
Erik Johnston
|
2cdff00788
|
Fix typo in validator
|
2014-11-11 10:31:47 +00:00 |
|
Erik Johnston
|
0292d991af
|
Add EventValidator module
|
2014-11-11 08:09:28 +00:00 |
|
Matthew Hodgson
|
7df8c8c287
|
apply some cache headers to try to make the content repo less nutso
|
2014-11-11 05:36:39 +00:00 |
|
Paul "LeoNerd" Evans
|
c23afed39a
|
Include room membership in room initialSync
|
2014-11-10 19:34:47 +00:00 |
|
Paul "LeoNerd" Evans
|
1fd8139138
|
Put room state in room initialSync output - I guess this is right; I really can't find any other tests similar...
|
2014-11-10 19:29:58 +00:00 |
|
Paul "LeoNerd" Evans
|
269f80bf8e
|
Have room initialSync return the room's room_id
|
2014-11-10 19:02:19 +00:00 |
|
Erik Johnston
|
a8e565eca8
|
Add an EventValidator. Fix bugs in auth ++ storage
|
2014-11-10 18:25:42 +00:00 |
|
Erik Johnston
|
cdc1b5d629
|
Fix regression where we did not return redacted events.
|
2014-11-10 15:21:30 +00:00 |
|
Erik Johnston
|
5d439b127b
|
PEP8
|
2014-11-10 13:46:44 +00:00 |
|
Erik Johnston
|
c46088405a
|
Remove useless comments
|
2014-11-10 13:39:33 +00:00 |
|
Erik Johnston
|
003668cfaa
|
Add auth to the various server-server APIs
|
2014-11-10 13:37:24 +00:00 |
|
Erik Johnston
|
6447db063a
|
Fix backfill to work. Add auth to backfill request
|
2014-11-10 11:59:51 +00:00 |
|
Erik Johnston
|
65f846ade0
|
Notify users about invites.
|
2014-11-10 11:15:02 +00:00 |
|
Erik Johnston
|
407d8a5019
|
Fix invite auth
|
2014-11-10 10:35:43 +00:00 |
|
Erik Johnston
|
6cb6cb9e69
|
Tidy up some of the unused sql tables
|
2014-11-10 10:31:00 +00:00 |
|
Erik Johnston
|
1c06806f90
|
Finish redaction algorithm.
|
2014-11-10 10:21:32 +00:00 |
|
Erik Johnston
|
07286a73b1
|
Use current state to get room hosts, rather than querying the database
|
2014-11-07 16:03:31 +00:00 |
|
Erik Johnston
|
02c3b1c9e2
|
Add '/event_auth/' federation api
|
2014-11-07 15:35:53 +00:00 |
|
Erik Johnston
|
d2fb2b8095
|
Implement invite part of invite join dance
|
2014-11-07 13:41:00 +00:00 |
|
Erik Johnston
|
328dab2463
|
Remove /context/ request
|
2014-11-07 11:40:38 +00:00 |
|
Erik Johnston
|
97a096b507
|
Add hash of current state to events
|
2014-11-07 11:37:06 +00:00 |
|
Erik Johnston
|
3b4dec442d
|
Return auth chain when handling send_join
|
2014-11-07 11:22:12 +00:00 |
|
Erik Johnston
|
16a0815fac
|
Fix bug in _get_auth_chain_txn
|
2014-11-07 11:21:20 +00:00 |
|
Erik Johnston
|
3cb678f84c
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
|
2014-11-07 10:55:28 +00:00 |
|
Erik Johnston
|
49948d72f3
|
Fix joining over federation
|
2014-11-07 10:53:38 +00:00 |
|
Erik Johnston
|
8b0e96474b
|
Implement method to get auth_chain from a given event_id
|
2014-11-07 10:53:38 +00:00 |
|
Erik Johnston
|
bf6b72eb55
|
Start implementing auth chains
|
2014-11-07 10:53:38 +00:00 |
|
Erik Johnston
|
8421cabb9d
|
Neaten things up a bit
|
2014-11-07 10:53:38 +00:00 |
|
Erik Johnston
|
46de65cab9
|
Don't query the DB for user power levels
|
2014-11-07 10:53:38 +00:00 |
|
Erik Johnston
|
351c64e99e
|
Amalgamate all power levels.
Remove concept of reqired power levels, something similiar can be done
using the new power level event.
|
2014-11-06 16:59:13 +00:00 |
|
Erik Johnston
|
233969bb58
|
Update to use replaces_state rather than prev_state
|
2014-11-06 15:25:03 +00:00 |
|
Erik Johnston
|
c6766d45b5
|
Don't send prev_state to clients anymore
|
2014-11-06 15:19:00 +00:00 |
|
Erik Johnston
|
4317c8e583
|
Implement new replace_state and changed prev_state
`prev_state` is now a list of previous state ids, similiar to
prev_events. `replace_state` now points to what we think was replaced.
|
2014-11-06 15:10:55 +00:00 |
|
Erik Johnston
|
cc44ecc62f
|
Get correct prev_events
|
2014-11-05 13:23:35 +00:00 |
|
Kegan Dougal
|
d3a02ec038
|
Fix url decoding bugs with /redact and /send APIs.
|
2014-11-05 12:05:11 +00:00 |
|
Kegan Dougal
|
9f6d1b10ad
|
Be sure to urlencode/decode event types correctly in both the web client and HS.
|
2014-11-05 11:21:55 +00:00 |
|
Erik Johnston
|
96c001e668
|
Fix auth checks to all use the given old_event_state
|
2014-11-05 11:07:54 +00:00 |
|
Erik Johnston
|
dfb3d21a6d
|
Fix room handler tests
|
2014-11-04 17:12:39 +00:00 |
|
Erik Johnston
|
da4a09f977
|
Don't bother locking
|
2014-11-04 16:51:23 +00:00 |
|
Mark Haines
|
dca3ba2f77
|
Determine webclient path by the python module it is contained in
|
2014-11-04 16:19:16 +00:00 |
|
Erik Johnston
|
a5a4ef3fd7
|
Fix bug in replication
|
2014-11-04 15:16:43 +00:00 |
|
Erik Johnston
|
2a49f177fe
|
On AuthError, raise a FederationError
|
2014-11-04 15:10:43 +00:00 |
|
Erik Johnston
|
8918422156
|
Move FederationError to synapse.api.errors
|
2014-11-04 15:10:27 +00:00 |
|
Erik Johnston
|
fc7b2b11a2
|
PEP8
|
2014-11-04 15:09:34 +00:00 |
|
Erik Johnston
|
440cbd5235
|
Add support for sending failures
|
2014-11-04 14:17:55 +00:00 |
|
Erik Johnston
|
d7412c4df1
|
Remove unused interface
|
2014-11-04 14:16:19 +00:00 |
|
Erik Johnston
|
aa76bf39ab
|
Remove unused imports
|
2014-11-04 14:14:02 +00:00 |
|
Erik Johnston
|
68698e0ac8
|
Fix bugs in generating event signatures and hashing
|
2014-11-03 17:51:42 +00:00 |
|
Erik Johnston
|
af7ae048f8
|
Add option to not bind to HTTPS port. This is useful if running behind an ssl load balancer
|
2014-11-03 15:06:40 +00:00 |
|
Erik Johnston
|
ad6eacb3e9
|
Rename PDU fields to match that of events.
|
2014-11-03 13:06:58 +00:00 |
|
Erik Johnston
|
d59aa6af25
|
For now, don't store txn -> pdu mappings.
|
2014-11-03 11:35:19 +00:00 |
|
Erik Johnston
|
f139c02e95
|
Formatting
|
2014-11-03 11:34:49 +00:00 |
|
Erik Johnston
|
7249785bcb
|
Sign events we create.
|
2014-11-03 11:33:28 +00:00 |
|
Erik Johnston
|
0a8b026ccf
|
Add 'origin' key to events
|
2014-11-03 11:32:42 +00:00 |
|
Erik Johnston
|
82a6b83524
|
Don't assume event has hashes key already
|
2014-11-03 11:32:12 +00:00 |
|
Erik Johnston
|
9024a19658
|
Remove dead code.
|
2014-11-03 11:31:47 +00:00 |
|
Erik Johnston
|
7a07263281
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
|
2014-11-03 10:17:37 +00:00 |
|
Erik Johnston
|
1c6825cc7a
|
Use python logger, not the twisted logger
|
2014-11-03 10:16:28 +00:00 |
|
Erik Johnston
|
13fad06239
|
Bump version numbers and change log
|
2014-10-31 17:23:01 +00:00 |
|
Erik Johnston
|
ecabff7eb4
|
Sign evnets
|
2014-10-31 17:08:52 +00:00 |
|
Erik Johnston
|
80b2710e6f
|
Remove unused signature storage methods
|
2014-10-31 17:08:36 +00:00 |
|
Erik Johnston
|
fb3a01fa3a
|
Remove unused sql file.
|
2014-10-31 16:04:27 +00:00 |
|
Erik Johnston
|
d30d79b5be
|
Make prev_event signing work again.
|
2014-10-31 15:35:39 +00:00 |
|
Erik Johnston
|
2f39dc19a2
|
Remove more references to dead PDU tables
|
2014-10-31 14:27:14 +00:00 |
|
Erik Johnston
|
bfa36a72b9
|
Remove PDU tables.
|
2014-10-31 14:00:32 +00:00 |
|
Erik Johnston
|
946d02536b
|
Remove unused functions.
|
2014-10-31 11:45:08 +00:00 |
|
Erik Johnston
|
21fe249d62
|
Actually don't store any PDUs
|
2014-10-31 10:47:34 +00:00 |
|
Erik Johnston
|
d84f5b30b8
|
old_state_events should be a dict not list
|
2014-10-31 10:47:04 +00:00 |
|
Erik Johnston
|
841df4da71
|
Don't store any PDUs
|
2014-10-31 09:59:59 +00:00 |
|
Erik Johnston
|
f2de2d644a
|
Move the impl of backfill to use events.
|
2014-10-31 09:59:02 +00:00 |
|
Erik Johnston
|
4a1597f295
|
Fix bug in redaction auth.
This caused a 500 when sending a redaction due to a typo in a method
invocation.
|
2014-10-31 09:48:59 +00:00 |
|
Erik Johnston
|
12ce441e67
|
Convert event ids to be of the form :example.com
|
2014-10-30 17:00:11 +00:00 |
|
Erik Johnston
|
da511334d2
|
Make federation return the old current state, so that we can use it to do auth
|
2014-10-30 11:53:35 +00:00 |
|
Erik Johnston
|
ef9c4476a0
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
|
2014-10-30 11:18:28 +00:00 |
|
Mark Haines
|
7a756e5d9d
|
Remove unused 'context' variables to appease pyflakes
|
2014-10-30 11:15:39 +00:00 |
|
Mark Haines
|
7c06399512
|
Merge branch 'develop' into request_logging
Conflicts:
synapse/config/logger.py
|
2014-10-30 11:13:58 +00:00 |
|
Mark Haines
|
7d709542ca
|
Fix pep8 warnings
|
2014-10-30 11:10:17 +00:00 |
|
Mark Haines
|
fa955cc2a4
|
Pep8 and a few doc strings
|
2014-10-30 10:13:46 +00:00 |
|
Erik Johnston
|
aa80900a8e
|
Fix SQL so that accepts we may want to persist events twice.
|
2014-10-30 10:11:06 +00:00 |
|
Mark Haines
|
b29517bd01
|
Add a request-id to each log line
|
2014-10-30 01:21:33 +00:00 |
|
Paul "LeoNerd" Evans
|
beae9acfcc
|
Use floating-point rather than integer division to handle timeouts so that non-zero but sub-second waits don't collapse to zero
|
2014-10-29 17:03:02 +00:00 |
|
Erik Johnston
|
53216a500d
|
Add a run_on_reactor function
|
2014-10-29 17:02:22 +00:00 |
|
Erik Johnston
|
e7858b6d7e
|
Start filling out and using new events tables
|
2014-10-29 16:59:24 +00:00 |
|
Paul "LeoNerd" Evans
|
b1ee6fd7ed
|
Fix an off-by-one bug in presence event stream pagination; this might be responsible for any number of bug reports
|
2014-10-29 16:16:01 +00:00 |
|
Paul "LeoNerd" Evans
|
d6bcffa929
|
Construct a source-specific 'SourcePaginationConfig' to pass into get_pagination_rows; meaning each source doesn't have to care about its own name any more
|
2014-10-29 16:16:01 +00:00 |
|
Paul "LeoNerd" Evans
|
c5a25f610a
|
Remove redundant (and incorrect) presence pagination fetching code
|
2014-10-29 16:16:01 +00:00 |
|
Erik Johnston
|
a10c2ec88d
|
Don't reference PDU when persisting event
|
2014-10-28 17:15:32 +00:00 |
|
Erik Johnston
|
2d1dfb3b34
|
Begin implementing all the PDU storage stuff in Events land
|
2014-10-28 16:42:35 +00:00 |
|
Erik Johnston
|
da1dda3e1d
|
Add transaction level logging and timing information. Add a _simple_delete method
|
2014-10-28 11:18:04 +00:00 |
|
Erik Johnston
|
967ce43b59
|
Clean up LoggingTransaction
|
2014-10-28 10:53:11 +00:00 |
|
Erik Johnston
|
8e358ef35a
|
Add timer to LoggingTransaction
|
2014-10-28 10:34:05 +00:00 |
|
Mark Haines
|
4841b6d4ba
|
Remove duplicate join_event from create_room
|
2014-10-27 16:55:51 +00:00 |
|
Erik Johnston
|
c372929ab6
|
Remove duplicate import
|
2014-10-27 16:31:39 +00:00 |
|
Erik Johnston
|
ad9226eeec
|
Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
synapse/storage/__init__.py
|
2014-10-27 11:58:32 +00:00 |
|
Mark Haines
|
5e2236f9ff
|
fix pyflakes warnings
|
2014-10-27 11:19:15 +00:00 |
|
Mark Haines
|
acb2d171e8
|
Merge branch 'develop' into event_signing
|
2014-10-27 11:14:11 +00:00 |
|
Kegan Dougal
|
f3bb3943c9
|
Remove test_pyflakes.
|
2014-10-27 11:13:04 +00:00 |
|
Mark Haines
|
7bd604e3be
|
Test pyflakes jenikns integration
|
2014-10-27 10:56:38 +00:00 |
|
Mark Haines
|
d56e389a95
|
Fix pyflakes warnings
|
2014-10-27 10:33:17 +00:00 |
|
Erik Johnston
|
bb4a20174c
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
synapse/federation/transport.py
synapse/handlers/message.py
|
2014-10-27 10:20:44 +00:00 |
|
Mark Haines
|
15be181642
|
Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 doesn't seem to have ECC
|
2014-10-24 19:27:12 +01:00 |
|
Mark Haines
|
db2e350e29
|
Wrap preparing the database in a transaction. Otherwise it will take many seconds to complete because sqlite will create a transaction per statement
|
2014-10-24 19:04:26 +01:00 |
|
David Baker
|
51edfeb3d0
|
Coturn's timestamps are in seconds, not milliseconds
|
2014-10-21 18:57:13 +01:00 |
|
Mark Haines
|
4be99c2989
|
Add get_json method to 3pid http client. Better logging for errors in 3pid requests
|
2014-10-20 14:10:08 +01:00 |
|
Mark Haines
|
9c0826592c
|
Fix auto generating signing_keys
|
2014-10-18 16:56:44 +01:00 |
|
Erik Johnston
|
b3e6cd59a1
|
Bump the other version
|
2014-10-18 00:29:55 +02:00 |
|
Erik Johnston
|
ac9345b47a
|
Check that we have auth headers and fail nicely
|
2014-10-17 21:00:58 +01:00 |
|
Erik Johnston
|
cd198dfea8
|
More log lines.
|
2014-10-17 20:58:47 +01:00 |
|
Mark Haines
|
3187b5ba2d
|
add log line for checking verifying signatures
|
2014-10-17 20:56:21 +01:00 |
|
Erik Johnston
|
71e6a94af7
|
Bump version and changelog
|
2014-10-17 20:26:26 +01:00 |
|
Erik Johnston
|
5662be894e
|
Bump database version number.
|
2014-10-17 20:26:18 +01:00 |
|
Erik Johnston
|
bf8cdda2f5
|
It doesn't want a dict
|
2014-10-17 20:10:34 +01:00 |
|
Mark Haines
|
8afbece683
|
Remove signatures from pdu when computing hashes to use for prev pdus, make sure is_state is a boolean.
|
2014-10-17 19:41:32 +01:00 |
|
Erik Johnston
|
b3b1961496
|
Fix bug where people could join private rooms
|
2014-10-17 19:37:41 +01:00 |
|
Erik Johnston
|
5ffe5ab43f
|
Use state groups to get current state. Make join dance actually work.
|
2014-10-17 18:56:42 +01:00 |
|
Mark Haines
|
dc3c2823ac
|
Merge branch 'develop' into event_signing
Conflicts:
synapse/federation/replication.py
|
2014-10-17 17:33:58 +01:00 |
|
Mark Haines
|
82c5820767
|
keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema
|
2014-10-17 17:31:48 +01:00 |
|
Mark Haines
|
f5cf7ac25b
|
SPEC-7: Rename 'ts' to 'origin_server_ts'
|
2014-10-17 17:12:25 +01:00 |
|
Mark Haines
|
456017e0ae
|
SPEC-7: Don't stamp event contents with 'hsob_ts'
|
2014-10-17 16:55:55 +01:00 |
|
Mark Haines
|
c5cec1cc77
|
Rename 'meta' to 'unsigned'
|
2014-10-17 16:50:04 +01:00 |
|
Mark Haines
|
4d1a7624f4
|
move 'age' into 'meta' subdict so that it is clearer that it is not part of the signed data
|
2014-10-17 15:27:11 +01:00 |
|
Erik Johnston
|
f71627567b
|
Finish implementing the new join dance.
|
2014-10-17 15:04:17 +01:00 |
|
Mark Haines
|
c8f996e29f
|
Hash the same content covered by the signature when referencing previous PDUs rather than reusing the PDU content hashes
|
2014-10-17 11:40:35 +01:00 |
|
Mark Haines
|
bb04447c44
|
Include hashes of previous pdus when referencing them
|
2014-10-16 23:25:12 +01:00 |
|
Erik Johnston
|
1116f5330e
|
Start implementing the invite/join dance. Continue moving auth to use event.state_events
|
2014-10-16 16:56:51 +01:00 |
|
Mark Haines
|
66104da10c
|
Sign outgoing PDUs.
|
2014-10-16 00:09:48 +01:00 |
|
Mark Haines
|
1c445f88f6
|
persist hashes and origin signatures for PDUs
|
2014-10-15 17:09:04 +01:00 |
|
Erik Johnston
|
e7bc1291a0
|
Begin making auth use event.old_state_events
|
2014-10-15 16:06:59 +01:00 |
|
Mark Haines
|
27d0c1ecc2
|
Merge branch 'develop' into event_signing
|
2014-10-15 13:57:12 +01:00 |
|
Erik Johnston
|
80472ac198
|
Add missing package storate.state
|
2014-10-15 10:04:55 +01:00 |
|
Erik Johnston
|
5fefc12d1e
|
Begin implementing state groups.
|
2014-10-14 16:59:51 +01:00 |
|
Paul "LeoNerd" Evans
|
13b560971e
|
Make sure to return an empty JSON object ({}) from presence PUT/POST requests rather than an empty string ("") because most deserialisers won't like the latter
|
2014-10-14 16:48:15 +01:00 |
|