Commit Graph

1743 Commits (a5b88c489ebf23e076a99306e7c95e9b60e83864)

Author SHA1 Message Date
Erik Johnston f22d023c4b Bump version 2014-10-18 00:29:15 +02:00
Erik Johnston 4c8111ef98 Bunp to change log. 2014-10-18 00:28:36 +02:00
Erik Johnston f05dce54a7 Merge pull request #9 from matrix-org/develop
Fix issue with timestamps in webclient
2014-10-18 00:25:57 +02:00
Matthew Hodgson 514e0fd4b6 fix webclient to know about right timestamps 2014-10-17 23:11:55 +01:00
Erik Johnston cb939ed450 I can't type apparently 2014-10-17 21:29:28 +01:00
Erik Johnston 7ea38a0c9d Update changelong and upgrade 2014-10-17 21:28:32 +01:00
Erik Johnston f1ddbfaae4 Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse into develop 2014-10-17 21:04:07 +01:00
Erik Johnston 449739e6a3 Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse 2014-10-17 21:02:16 +01: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
Mark Haines eea3a29699 Add script to hash exisitng history 2014-10-17 20:36:04 +01:00
Erik Johnston 5356044b77 Bump syutil dependency 2014-10-17 20:35:28 +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 a065becea5 Merge branch 'docs-restructuring' of github.com:matrix-org/synapse into develop 2014-10-17 20:18:02 +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
Matthew Hodgson be2a9a8d1a move gendoc into matrix-doc project 2014-10-17 02:09:07 +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
Kegan Dougal 79bd6e77b8 Remove warning since the end result is still $sanitize'd 2014-10-15 14:45:38 +01:00
Kegan Dougal da19fd0d1a Add unsanitizedLinky filter to fix links in formatted messages.
This filter is identical to ngSanitize's linky but instead of
sanitizing text which isn't linkified in the addText function,
it doesn't.
2014-10-15 14:42:14 +01:00
Kegan Dougal 07890b43ca Remove org.matrix.custom.text.html event type and replace it with 'format' and 'formatted_body' keys on m.text messages 2014-10-15 13:57:19 +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
Kegan Dougal f4667f86af Add support for org.matrix.custom.text.html
This format will remain undocumented as it is not yet suitable for
introduction into the specification.
2014-10-15 09:32:02 +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
Mark Haines 9aed791fc3 SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin from the transaction itself 2014-10-14 16:44:27 +01:00
Mark Haines 3dac27a8a9 Storage for pdu signatures 2014-10-14 14:58:31 +01:00
Mark Haines f74e850b5c remove debugging logging for signing requests 2014-10-14 11:46:13 +01:00
Erik Johnston 4fe5dfa74c Note that this breaks federation 2014-10-14 10:30:50 +01:00
Mark Haines 636a0dbde7 Merge pull request #8 from matrix-org/server2server_signing
Server2server signing
2014-10-14 10:06:04 +01:00
Matthew Hodgson c18a6433d4 typoe 2014-10-13 23:24:14 +01:00
Mark Haines 34034af1c9 Better response message when signature is missing or unsupported 2014-10-13 16:47:23 +01:00
Mark Haines 07639c79d9 Respond with more helpful error messages for unsigned requests 2014-10-13 16:39:15 +01:00