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
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
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
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
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
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
Mark Haines
25d80f35f1
Raise a SynapseError if the authorisation header is missing or malformed
2014-10-13 15:53:18 +01:00
Mark Haines
75e517a2da
Remove debug logging, raise a proper SynapseError if the auth header is missing
2014-10-13 15:41:20 +01:00
Mark Haines
6684855767
Verify signatures for server2server requests
2014-10-13 14:37:46 +01:00
Mark Haines
10ef8e6e4b
SYN-75 sign at the request level rather than the transaction level
2014-10-13 11:49:55 +01:00
Mark Haines
cecda27d73
Merge branch 'develop' into server2server_signing
2014-10-13 11:06:36 +01:00
Mark Haines
984e207b59
Merge branch develop into server2server_signing
...
Conflicts:
synapse/app/homeserver.py
2014-10-13 10:58:50 +01:00
Mark Haines
693d0b8f45
Replace on_send_callback with something a bit clearer so that we can sign messages
2014-10-13 10:49:04 +01:00
Matthew Hodgson
66df7f1aaf
remove wishlist in favour of jira
2014-10-12 00:00:37 +01:00
Kegan Dougal
868eb478d8
Fixed test.
2014-10-09 15:55:07 +01:00
Kegan Dougal
3db09c4d15
Still broken.
2014-10-09 15:53:40 +01:00
Kegan Dougal
83c53113af
Break a test.
2014-10-09 15:51:05 +01:00
Kegan Dougal
72aef114ab
Fix unit test.
2014-10-08 15:18:19 +01:00
Kegan Dougal
6045bd89fb
Break unit test.
2014-10-08 15:16:03 +01:00
Erik Johnston
5b096cc3db
Merge pull request #7 from matrix-org/paul/doc
...
Clarify that room alias domain names will be server-scoped; nonlocal edi...
2014-10-07 16:35:32 +01:00
Paul "LeoNerd" Evans
917af4705b
Clarify that room alias domain names will be server-scoped; nonlocal edits are unliekly to work but nonlocal lookups will
2014-10-07 16:23:12 +01:00
Erik Johnston
9ac53ef8cf
SPEC-3: First hack at defining some of the various event related concepts
2014-10-07 11:38:02 +01:00
Erik Johnston
2fc00508fb
Add quick and dirty doc about state resolution
2014-10-06 17:34:44 +01:00
Kegan Dougal
c72074b48e
Clarify how-to some more.
2014-10-06 14:57:26 +01:00
Kegan Dougal
3ef2c946d5
Update JSFiddles/how-to to support the new registration format.
2014-10-06 14:52:46 +01:00
Kegan Dougal
aaf1d499bf
Add more section headings.
2014-10-06 13:18:52 +01:00
Kegan Dougal
94982392be
Clarify room permission / power level information.
2014-10-06 12:41:48 +01:00
Kegan Dougal
51276c60bf
Add information about the initialSync API.
...
Outline and describe the keys from the initial sync API. Hide room-scoped
initial sync API for now as it is not implemented and needs more thought before
it can be specced.
2014-10-06 10:32:04 +01:00
Kegan Dougal
78a3f43d9d
swagger: Added DELETE method for directory server.
2014-10-06 09:23:19 +01:00
Kegan Dougal
02a44664b9
More spec work.
2014-10-03 17:38:30 +01:00
Erik Johnston
1fa0454288
Merge pull request #6 from matrix-org/paul/doc
...
Clarify how m.room.alias event works
2014-10-03 14:50:08 +01:00
