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 |
|
Mark Haines
|
b9cdc443d7
|
Fix pyflakes errors
|
2014-10-02 14:37:30 +01:00 |
|
Mark Haines
|
574377636e
|
Add a keyword argument to get_json to avoid retrying on DNS failures. Rather than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter
|
2014-10-02 14:26:13 +01:00 |
|
Mark Haines
|
4f11518934
|
Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers
|
2014-10-02 14:03:26 +01:00 |
|
Mark Haines
|
c8d67beb9c
|
remove "red", "blue" and "green" server_name mappings
|
2014-10-01 15:52:07 +01:00 |
|
Mark Haines
|
bf4b224fcf
|
Fix a few pyflakes errors in the server_key_resource
|
2014-09-23 18:43:34 +01:00 |
|
Mark Haines
|
e3117a2a23
|
Add a _matrix/key/v1 resource with the verification keys of the local server
|
2014-09-23 18:43:34 +01:00 |
|
Erik Johnston
|
6ac0b4ade8
|
Fix 'age' key to update on retries
|
2014-09-15 16:24:03 +01:00 |
|
Kegan Dougal
|
1829b55bb0
|
Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.
|
2014-09-05 19:18:23 -07:00 |
|
David Baker
|
d72ce4da64
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
synapse/http/client.py
|
2014-09-03 18:25:17 +01:00 |
|
David Baker
|
d6ecbbdf0a
|
Add support for registering with a threepid to the HS (get credentials from the client and check them against an ID server).
|
2014-09-03 18:22:27 +01:00 |
|
Matthew Hodgson
|
8a7c1d6a00
|
fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
|
2014-09-03 17:31:57 +01:00 |
|
Mark Haines
|
ee2bcdec65
|
Limit the size of uploads
|
2014-09-03 17:04:16 +01:00 |
|
Kegan Dougal
|
7fc84c7019
|
Make retrying requests on DNS failures configurable, and turn off retrying only in directory.get_association
|
2014-09-03 14:26:52 +01:00 |
|
Kegan Dougal
|
b1195c125f
|
hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately.
|
2014-09-03 13:51:17 +01:00 |
|
Erik Johnston
|
b50ea730b1
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
synapse/http/server.py
synapse/http/content_repository.py
|
2014-09-03 12:01:14 +01:00 |
|
Erik Johnston
|
bc21350298
|
Add option to change content repo location
|
2014-09-03 11:57:23 +01:00 |
|
Mark Haines
|
bf10cf5f1a
|
move contentrepo class to it's own file
|
2014-09-03 11:10:44 +01:00 |
|
Erik Johnston
|
ddc16d8642
|
Merge branch 'master' into develop
|
2014-09-03 09:46:39 +01:00 |
|
Mark Haines
|
112c7ea315
|
Set status message for ratelimit error responses
|
2014-09-03 09:37:44 +01:00 |
|
Erik Johnston
|
235f686da9
|
Update default endpoint port to match the default ports in the config
|
2014-09-02 16:56:57 +01:00 |
|
Matthew Hodgson
|
68a04b9282
|
given everything's apparently gone https:// by default for c-s, change this hardcoding...
|
2014-09-01 23:28:43 +01:00 |
|
Mark Haines
|
5452a8ee29
|
Fix SSL for federation http client
|
2014-09-01 18:43:08 +01:00 |
|
Mark Haines
|
a53946a8a1
|
Enable SSL for s2s http client
|
2014-09-01 18:30:00 +01:00 |
|
Matthew Hodgson
|
2b7918bd6f
|
missed a s#/matrix#/_matrix/g
|
2014-08-31 14:54:58 +01:00 |
|
Erik Johnston
|
0c3b4a1f63
|
For the content repo, don't just use homeserver.hostname as that might not include the port due to SRV.
|
2014-08-24 11:56:55 +01:00 |
|
Erik Johnston
|
acf5127604
|
Make the content repo work with in daemon mode. Return the full url on upload. Update the webclient to use new content repo api.
|
2014-08-22 10:25:32 +01:00 |
|
Kegan Dougal
|
f48792eec4
|
Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests.
|
2014-08-19 10:56:43 +01:00 |
|
Kegan Dougal
|
e37b040bc3
|
Small amounts of cleanup and bonus round comments.
|
2014-08-18 17:22:31 +01:00 |
|
Kegan Dougal
|
58548ab557
|
Implemented GETs for the ContentRepoResource. It all actually appears to be working.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
590ab24c85
|
hs: Make the uploads directory if it doesn't exist. Namespace uploads by the base64 encoded user id of the uploader. Make a reasonable attempt to retry clashing upload paths. Try to guess a sensible file extension depending on the content type.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
35da1bf4a3
|
Auth content uploads. Added a mapping function from request > filename. Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
a18b1a649c
|
Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
9fd445eb92
|
If the web client is enabled, automatically redirect root '/' to the web client path.
|
2014-08-14 11:37:13 +01:00 |
|
Kegan Dougal
|
9a1638ed21
|
Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.
|
2014-08-14 10:18:54 +01:00 |
|
Kegan Dougal
|
9f863d3466
|
Start phasing out HttpServer: we should be using Resources instead. Added resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
|
2014-08-14 09:55:16 +01:00 |
|
Matthew Hodgson
|
a4da962bab
|
fix http client GET parameters; somehow missing named param. how could this have ever worked!?
|
2014-08-14 02:59:54 +01:00 |
|
Paul "LeoNerd" Evans
|
1ddae5f40b
|
Update get_json()'s documentation to match the actual observed behaviour
|
2014-08-13 17:23:49 +01:00 |
|
Matthew Hodgson
|
f98e6380f1
|
add in whitespace after copyright statements to improve legibility
|
2014-08-13 03:14:34 +01:00 |
|
Erik Johnston
|
4add1c70e9
|
Just say yes to OPTIONS requests, since we want to turn on CORS headers for all paths
|
2014-08-12 17:17:14 +01:00 |
|
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |