Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add exception logging. Fix typo | Erik Johnston | 2016-08-22 | 1 | -3/+3 |
| | |||||
* | Allow request handlers to override metric name | Erik Johnston | 2016-08-22 | 1 | -21/+31 |
| | |||||
* | Use top level measure | Erik Johnston | 2016-08-22 | 1 | -15/+1 |
| | |||||
* | Add a top level measure | Erik Johnston | 2016-08-19 | 1 | -45/+46 |
| | |||||
* | Remove redundant measure | Erik Johnston | 2016-08-19 | 1 | -35/+34 |
| | |||||
* | Measure http.server render | Erik Johnston | 2016-08-19 | 1 | -28/+30 |
| | |||||
* | Clean up TransactionQueue | Erik Johnston | 2016-08-10 | 1 | -3/+1 |
| | |||||
* | Log when adding listeners | Richard van der Hoff | 2016-07-25 | 1 | -0/+1 |
| | |||||
* | Work around TLS bug in twisted | Richard van der Hoff | 2016-06-15 | 1 | -2/+26 |
| | | | | | | Wrap up twisted's FileBodyProducer to work around https://twistedmatrix.com/trac/ticket/8473. Hopefully this fixes https://matrix.org/jira/browse/SYN-700. | ||||
* | Clean up the blacklist/whitelist handling. | Mark Haines | 2016-05-16 | 1 | -2/+1 |
| | | | | | | | Always set the config key with an empty list, even if a list isn't specified. This means that the codepaths are the same for both the empty list and for a missing key. Since the behaviour is the same for both cases this makes the code somewhat easier to reason about. | ||||
* | add a url_preview_ip_range_whitelist config param so we can whitelist the ↵ | Matthew Hodgson | 2016-05-01 | 2 | -7/+13 |
| | | | | matrix.org IP space | ||||
* | Fix more typos in per-request metrics | Mark Haines | 2016-04-28 | 1 | -4/+5 |
| | |||||
* | Fix typo in request metrics | Mark Haines | 2016-04-28 | 1 | -1/+1 |
| | |||||
* | Add a comment explaining why automatic metric reporting is disabled for ↵ | Mark Haines | 2016-04-28 | 1 | -0/+4 |
| | | | | JsonResource | ||||
* | Check if report_metrics is True | Mark Haines | 2016-04-28 | 1 | -3/+4 |
| | |||||
* | Report per request metrics for all of the things using request_handler | Mark Haines | 2016-04-28 | 1 | -38/+63 |
| | |||||
* | Move SynapseSite to its own file | Mark Haines | 2016-04-22 | 1 | -0/+146 |
| | |||||
* | Make InsecureInterceptableContextFactory work with SpiderEndpoint | Erik Johnston | 2016-04-19 | 1 | -1/+4 |
| | |||||
* | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 2 | -5/+197 |
|\ | | | | | URL previewing support | ||||
| * | actually throw meaningful errors | Matthew Hodgson | 2016-04-08 | 1 | -5/+16 |
| | | |||||
| * | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵ | Matthew Hodgson | 2016-04-08 | 2 | -7/+72 |
| | | | | | | | | | | | | | | | | | | defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback | ||||
| * | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 1 | -30/+51 |
| |\ | |||||
| * | | pep8 | Matthew Hodgson | 2016-04-03 | 1 | -4/+10 |
| | | | |||||
| * | | add a persistent cache of URL lookups, and fix up the in-memory one to work | Matthew Hodgson | 2016-04-03 | 1 | -3/+3 |
| | | | |||||
| * | | support gzip compression, and don't pass through error msgs | Matthew Hodgson | 2016-04-02 | 1 | -3/+8 |
| | | | |||||
| * | | handle spidered relative images correctly | Matthew Hodgson | 2016-03-31 | 1 | -1/+1 |
| | | | |||||
| * | | sync in changes from matrixfederationclient | Matthew Hodgson | 2016-03-31 | 1 | -2/+6 |
| | | | |||||
| * | | handle requests with missing content-length headers (e.g. YouTube) | Matthew Hodgson | 2016-03-31 | 1 | -7/+26 |
| | | | |||||
| * | | implement redirects | Matthew Hodgson | 2016-03-29 | 1 | -3/+3 |
| | | | |||||
| * | | make it work | Matthew Hodgson | 2016-03-29 | 1 | -1/+2 |
| | | | |||||
| * | | make it build | Matthew Hodgson | 2016-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-29 | 1 | -4/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-27 | 4 | -27/+159 |
| |\ \ \ | |||||
| * | | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵ | Matthew Hodgson | 2016-01-24 | 1 | -0/+81 |
| | | | | | | | | | | | | | | | | | | | | experimental, etc. just putting it here for safekeeping for now | ||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache | Erik Johnston | 2016-04-07 | 1 | -30/+51 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -30/+51 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | ||||
* | | | | Allow clock to be passed in to func | Erik Johnston | 2016-03-31 | 1 | -3/+3 |
| | | | | |||||
* | | | | Read from DNS cache if within TTL | Erik Johnston | 2016-03-31 | 1 | -16/+23 |
|/ / / | |||||
* | / | Intern all the things | Erik Johnston | 2016-03-23 | 1 | -4/+6 |
| |/ |/| | |||||
* | | Fix regression where synapse checked whether push rules were valid JSON ↵ | Mark Haines | 2016-03-14 | 1 | -4/+17 |
| | | | | | | | | before the compatibility hack that handled clients sending invalid JSON | ||||
* | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 1 | -5/+12 |
| | | |||||
* | | Add a parse_json_object function | Mark Haines | 2016-03-09 | 1 | -5/+65 |
| | | | | | | | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions. | ||||
* | | pep8 | David Baker | 2016-03-08 | 1 | -2/+5 |
| | | |||||
* | | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ↵ | David Baker | 2016-03-08 | 1 | -2/+12 |
| | | | | | | | | chokes. | ||||
* | | Catch the exceptions thrown by twisted when you write to a closed connection | Mark Haines | 2016-02-12 | 1 | -1/+20 |
| | | |||||
* | | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -3/+2 |
| | | |||||
* | | Add metrics to pushers | Erik Johnston | 2016-02-08 | 1 | -0/+10 |
| | | |||||
* | | Allowing tagging log contexts | Erik Johnston | 2016-02-03 | 1 | -15/+26 |
| | | |||||
* | | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 1 | -1/+1 |
|/ | |||||
* | Fix AttributeError | Erik Johnston | 2016-01-21 | 1 | -1/+1 |
| | |||||
* | Cache dns lookups, and use the cache if we fail to lookup servers later | Erik Johnston | 2016-01-20 | 1 | -30/+71 |
| | |||||
* | copyrights | Matthew Hodgson | 2016-01-07 | 6 | -6/+6 |
| | |||||
* | Fix typo | Daniel Wagner-Hall | 2015-12-16 | 1 | -1/+1 |
| | |||||
* | Include errcode on Internal Server Error | Daniel Wagner-Hall | 2015-12-14 | 1 | -2/+5 |
| | |||||
* | Track the time spent in the database per request. | Mark Haines | 2015-12-07 | 1 | -0/+15 |
| | | | | and track the number of transactions that request started. | ||||
* | Add metrics to track the cpu on the main thread consumed by each type of request | Mark Haines | 2015-12-04 | 1 | -0/+17 |
| | |||||
* | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 2 | -10/+11 |
| | |||||
* | Fix typo | Erik Johnston | 2015-11-20 | 1 | -2/+2 |
| | |||||
* | Don't limit connections to perspective servers | Erik Johnston | 2015-11-20 | 1 | -1/+4 |
| | |||||
* | Use min and not max to set an upper bound on retry interval | Erik Johnston | 2015-11-20 | 1 | -2/+2 |
| | |||||
* | Add comment | Erik Johnston | 2015-11-17 | 1 | -0/+2 |
| | |||||
* | Only retry federation requests for a long time for background requests | Erik Johnston | 2015-11-17 | 1 | -7/+19 |
| | |||||
* | Implement required method 'resumeProducing' | Erik Johnston | 2015-11-17 | 1 | -0/+3 |
| | |||||
* | Slightly more aggressive retry timers at HTTP level | Erik Johnston | 2015-11-17 | 1 | -2/+3 |
| | |||||
* | Retry dead servers a lot less often | Erik Johnston | 2015-11-02 | 1 | -2/+8 |
| | |||||
* | Verify third party ID server certificates | Daniel Wagner-Hall | 2015-10-16 | 1 | -4/+0 |
| | |||||
* | Fix previous merge to s/version_string/user_agent/ | Erik Johnston | 2015-10-10 | 1 | -2/+2 |
| | |||||
* | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than ↵ | Steven Hammerton | 2015-10-10 | 1 | -19/+36 |
| | | | | requests | ||||
* | Use space not dash as delimiter | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+1 |
| | |||||
* | Use space not dash as delimiter | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+1 |
| | |||||
* | Preserve version string in user agent | Daniel Wagner-Hall | 2015-10-05 | 1 | -3/+3 |
| | |||||
* | Allow synapse's useragent to be customized | Daniel Wagner-Hall | 2015-10-02 | 1 | -6/+9 |
| | | | | | This will allow me to write tests which verify which server made HTTP requests in a federation context. | ||||
* | Rename context factory | Daniel Wagner-Hall | 2015-09-15 | 1 | -3/+3 |
| | | | | Mjark is officially no fun. | ||||
* | Fix random formatting | Daniel Wagner-Hall | 2015-09-09 | 1 | -1/+2 |
| | |||||
* | Allow configuration to ignore invalid SSL certs | Daniel Wagner-Hall | 2015-09-09 | 2 | -4/+25 |
| | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name. | ||||
* | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 3 | -9/+10 |
| | |||||
* | PEP8 | Erik Johnston | 2015-08-13 | 1 | -1/+0 |
| | |||||
* | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-08-12 | 3 | -123/+130 |
|\ | | | | | | | | | Conflicts: synapse/http/matrixfederationclient.py | ||||
| * | Don't 500 if a group is missing from the regex | Mark Haines | 2015-07-06 | 1 | -1/+1 |
| | | |||||
| * | Fix log context when sending requests | Erik Johnston | 2015-06-19 | 2 | -33/+35 |
| | | |||||
| * | Remove stale debug lines | Erik Johnston | 2015-06-19 | 1 | -10/+0 |
| | | |||||
| * | Add IDs to outbound transactions | Erik Johnston | 2015-06-19 | 1 | -53/+71 |
| | | |||||
| * | Disable twisted access logging. Move access logging to SynapseRequest object | Erik Johnston | 2015-06-15 | 1 | -58/+32 |
| | | |||||
| * | Log more when we have processed the request | Erik Johnston | 2015-06-15 | 1 | -2/+12 |
| | | |||||
| * | Create SynapseRequest that overrides __repr__ to not print access_token | Erik Johnston | 2015-06-15 | 1 | -11/+3 |
| | | |||||
| * | Make http.server request logging more verbose, but redact access_tokens | Erik Johnston | 2015-06-15 | 1 | -2/+12 |
| | | |||||
| * | Log requests and responses sent via http.client | Erik Johnston | 2015-06-15 | 1 | -3/+15 |
| | | |||||
* | | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-06-01 | 1 | -4/+12 |
|\| | | | | | | | | | Conflicts: synapse/python_dependencies.py | ||||
| * | Remove log line | Erik Johnston | 2015-05-29 | 1 | -1/+0 |
| | | |||||
| * | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 1 | -4/+13 |
| | | | | | | | | ujson.loads | ||||
* | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵ | Mark Haines | 2015-06-01 | 1 | -50/+25 |
|/ | | | | own Agent | ||||
* | Correctly pass connection pool parameter | Erik Johnston | 2015-05-28 | 2 | -2/+2 |
| | |||||
* | Up maxPersistentPerHost count | Erik Johnston | 2015-05-28 | 2 | -0/+2 |
| | |||||
* | Add connection pooling to SimpleHttpClient | Erik Johnston | 2015-05-28 | 1 | -2/+4 |
| | |||||
* | Use connection pool for federation connections | Erik Johnston | 2015-05-28 | 1 | -2/+3 |
| | |||||
* | Add doc strings | Erik Johnston | 2015-05-22 | 1 | -0/+3 |
| | |||||
* | Add a timeout param to get_event | Erik Johnston | 2015-05-19 | 1 | -5/+8 |
| | |||||
* | Fix up leak. Add warnings. | Erik Johnston | 2015-05-08 | 1 | -2/+4 |
| | |||||
* | Change the way we do logging contexts so that they survive divergences | Erik Johnston | 2015-05-08 | 2 | -17/+21 |
| | |||||
* | Unused import | David Baker | 2015-04-30 | 1 | -1/+1 |
| | |||||
* | Doesn't look like this is used anymore | David Baker | 2015-04-30 | 1 | -13/+0 |
| | |||||
* | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 2 | -152/+179 |
|\ | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| * | Combine the request wrappers in rest/media/v1 and http/server into a single ↵ | Mark Haines | 2015-04-21 | 2 | -58/+67 |
| | | | | | | | | wrapper decorator | ||||
| * | Split out the JsonResource request logging and error handling into a ↵ | Mark Haines | 2015-04-21 | 1 | -94/+113 |
| | | | | | | | | separate wrapper function | ||||
* | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 1 | -93/+0 |
|\| | |||||
| * | Move server key api into rest/key/v1 | Mark Haines | 2015-04-14 | 1 | -93/+0 |
| | | |||||
* | | Explain how I justified to myself making JsonResource not always send JSON. | David Baker | 2015-04-01 | 1 | -0/+7 |
| | | |||||
* | | Completely replace fallback auth for C/S V2: | David Baker | 2015-04-01 | 1 | -2/+5 |
| | | | | | | | | | | | | | | * Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now. | ||||
* | | Make docs a bit more true | David Baker | 2015-03-31 | 1 | -1/+1 |
| | | |||||
* | | Grammar and deduplication | David Baker | 2015-03-31 | 1 | -5/+4 |
| | | |||||
* | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #109 from matrix-org/default_registration | Erik Johnston | 2015-03-18 | 1 | -2/+2 |
|\ | | | | | Disable registration by default. Add script to register new users. | ||||
| * | Add missing commas | Erik Johnston | 2015-03-13 | 1 | -2/+2 |
| | | |||||
* | | Add a DistributionMetric to HTTP request/response processing time in the server | Paul "LeoNerd" Evans | 2015-03-16 | 1 | -0/+9 |
| | | |||||
* | | actually uphold the bind_host parameter. in theory should make ipv6 binds ↵ | Matthew Hodgson | 2015-03-14 | 1 | -1/+6 |
| | | | | | | | | work like bind_host: 'fe80::1%lo0' | ||||
* | | Appease pep8 | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -9/+19 |
| | | |||||
* | | Count incoming HTTP requests per servlet that responds | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -7/+11 |
| | | |||||
* | | Use _ instead of . as a metric namespacing separator, for Prometheus | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -6/+6 |
| | | |||||
* | | Rename Metrics' "keys" to "labels" | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -6/+6 |
| | | |||||
* | | Add vector counters to HTTP clients and servers; count the requests by ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -4/+61 |
| | | | | | | | | method and responses by method and response code | ||||
* | | Pull out all uses of the underlying HTTP user agent .request() method into a ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -5/+10 |
|/ | | | | single wrapper function, to make adding metrics easier | ||||
* | Slightly reduce the insane amounts of indentation in main http server ↵ | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -21/+23 |
| | | | | response path, by 'continue'ing around a non-match or falling through | ||||
* | Fix bug which prevented the HS pushing events to the AS due to FrozenEvents | Kegan Dougal | 2015-03-02 | 1 | -1/+1 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1 | Erik Johnston | 2015-02-18 | 5 | -35/+30 |
|\ | |||||
| * | Make /keys/ return correct Server version | Erik Johnston | 2015-02-18 | 1 | -1/+5 |
| | | |||||
| * | Use git aware version string in User-Agent and Server headers | Erik Johnston | 2015-02-18 | 4 | -34/+25 |
| | | |||||
* | | Don't convert DNSLookupError to a 4xx SynapseError | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
|/ | |||||
* | Add .__name__ after type(e) | Erik Johnston | 2015-02-18 | 1 | -2/+2 |
| | |||||
* | Fix up ResponseNeverReceived to str | Erik Johnston | 2015-02-18 | 1 | -9/+11 |
| | |||||
* | strings.join() expects iterable of strings | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | |||||
* | Remove unused import | Erik Johnston | 2015-02-17 | 1 | -1/+0 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into failures | Erik Johnston | 2015-02-17 | 1 | -10/+57 |
|\ | |||||
| * | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 1 | -10/+57 |
| |\ | | | | | | | Application Services | ||||
| | * | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 1 | -2/+1 |
| | |\ | |||||
| | * | | Minor tweaks based on PR feedback. | Kegan Dougal | 2015-02-11 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 2 | -3/+23 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -6/+36 |
| | |\ \ \ | |||||
| | * | | | | Add SimpleHttpClient.put_json with the same semantics as get_json. | Kegan Dougal | 2015-02-04 | 1 | -2/+46 |
| | | | | | | |||||
| | * | | | | Update user/alias query APIs to use new format of SimpleHttpClient.get_json | Kegan Dougal | 2015-02-04 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Modify API for SimpleHttpClient.get_json and update usages. | Kegan Dougal | 2015-02-04 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would only return the HTTP body as JSON, and discard other response information (e.g. the HTTP response code). This has now been changed to throw a CodeMessageException on a non-2xx response, with the response code and body, which can then be parsed as JSON. Affected modules include: - Registration/Login (when using an email for IS auth) | ||||
* | | | | | | Make matrixfederationclient log more nicely | Erik Johnston | 2015-02-17 | 1 | -11/+12 |
|/ / / / / | |||||
* | | | | | Use encode_canonical_json for http client | Erik Johnston | 2015-02-11 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #61 from matrix-org/timeout-federation-requests | Erik Johnston | 2015-02-11 | 1 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Timeout federation requests | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-11 | 1 | -2/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | timeout-federation-requests | ||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-11 | 4 | -13/+228 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | timeout-federation-requests | ||||
| * | | | | | PEP8 | Erik Johnston | 2015-02-11 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Move time_bound_deferred into Clock | Erik Johnston | 2015-02-11 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Time out HTTP federation requests | Erik Johnston | 2015-02-10 | 1 | -2/+9 |
| | | | | | | |||||
* | | | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 2 | -2/+2 |
| |_|/ / / |/| | | | | |||||
* | | | | | Fix bug where variable was not always defined | Erik Johnston | 2015-02-11 | 1 | -2/+1 |
| |/ / / |/| | | | |||||
* | | | | Log when we receive a request, when we send a response and how long it took ↵ | Erik Johnston | 2015-02-09 | 1 | -2/+21 |
| | | | | | | | | | | | | | | | | to process it. | ||||
* | | | | Return body of response in HttpResponseException | Erik Johnston | 2015-02-06 | 1 | -1/+2 |
| |_|/ |/| | | |||||
* | | | Apply sanity to the transport client interface. Convert 'make_join' and ↵ | Erik Johnston | 2015-02-04 | 1 | -6/+36 |
| |/ |/| | | | | | 'send_join' to accept iterables of destinations | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 3 | -6/+78 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| * \ | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 1 | -0/+113 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| | * | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 1 | -0/+57 |
| | | | | |||||
| * | | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| * | | | | Oops: second part of commit dc938606 | David Baker | 2015-01-22 | 1 | -6/+2 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 7 | -12/+42 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 3 | -235/+129 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py | ||||
| * \ \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-12-02 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP ↵ | David Baker | 2014-11-21 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | pokes work or not yet but the retry semantics are pretty good. | ||||
* | | | | | | | Make post_json(...) actually send data. | Erik Johnston | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Add post_json(...) method to federation client | Erik Johnston | 2015-01-29 | 1 | -0/+37 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Add RestServlet base class in synapse/http/servlet.py | Mark Haines | 2015-01-23 | 1 | -0/+56 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Finish renaming "context" to "room_id" in federation codebase | Mark Haines | 2015-01-16 | 1 | -1/+0 |
| |_|_|/ |/| | | | |||||
* | | | | SYN-231: User agent header broken | Mark Haines | 2015-01-08 | 1 | -3/+3 |
| | | | | |||||
* | | | | Update copyright notices | Mark Haines | 2015-01-06 | 7 | -8/+8 |
| | | | | |||||
* | | | | Set a content-length for JSON responses | Mark Haines | 2015-01-06 | 1 | -0/+1 |
| | | | | |||||
* | | | | Include version in User-Agent and Server headers | Mark Haines | 2014-12-22 | 4 | -6/+35 |
| |_|/ |/| | | |||||
* | | | Fix tests and remove debug logging | Erik Johnston | 2014-12-12 | 1 | -4/+0 |
| | | | |||||
* | | | Consistently url decode and decode as utf 8 the URL parts | Erik Johnston | 2014-12-12 | 1 | -1/+11 |
| | | | |||||
* | | | Limit the size of images that are thumbnailed serverside. Limit the size of ↵ | Mark Haines | 2014-12-11 | 1 | -6/+19 |
| | | | | | | | | | | | | file that a server will download from a remote server | ||||
* | | | Merge branch 'develop' into media_repository | Mark Haines | 2014-12-10 | 1 | -9/+26 |
|\ \ \ | |||||
| * | | | turn back on per-request transaction retries, so that every time we try to ↵ | Matthew Hodgson | 2014-12-10 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | hit a dead server we actually end up hammering 5 times :| | ||||
| * | | | Code style. | Erik Johnston | 2014-12-10 | 1 | -8/+21 |
| | | | | |||||
| * | | | add errbacks to enqueue_pdu deferreds; change logging for failed federation ↵ | Matthew Hodgson | 2014-12-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | sends to warn rather than exception | ||||
| * | | | squidge to 79 columns as per pep8 | Matthew Hodgson | 2014-12-10 | 1 | -3/+4 |
| | | | | |||||
| * | | | track replication destination health, and perform exponential back-off when ↵ | Matthew Hodgson | 2014-12-07 | 1 | -6/+10 |
| | |/ | |/| | | | | | | | sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover. | ||||
* | | | Implement download support for media_repository | Mark Haines | 2014-12-04 | 1 | -5/+68 |
| | | | |||||
* | | | Get uploads working with new media repo | Mark Haines | 2014-12-02 | 1 | -2/+2 |
| | | | |||||
* | | | Write the upload portion of version 1 of the media repository | Mark Haines | 2014-12-02 | 2 | -219/+14 |
|/ / | |||||
* / | typos | Matthew Hodgson | 2014-11-24 | 1 | -2/+2 |
|/ | |||||
* | Fix pep8 and pyflakes warnings | Mark Haines | 2014-11-20 | 3 | -7/+8 |
| | |||||
* | Merge branch 'develop' into http_client_refactor | David Baker | 2014-11-20 | 2 | -8/+9 |
|\ | |||||
| * | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 2 | -8/+9 |
| | | |||||
| * | Use module loggers rather than the root logger. Exceptions caused by bad ↵ | Mark Haines | 2014-11-20 | 1 | -1/+1 |
| | | | | | | | | clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str' | ||||
* | | Separate out the matrix http client completely because just about all of its ↵ | David Baker | 2014-11-20 | 3 | -323/+338 |
| | | | | | | | | code it now separate from the simple case we need for standard HTTP(S) | ||||
* | | Refactor the HTTP clients a little. | David Baker | 2014-11-20 | 1 | -79/+75 |
| | | |||||
* | | CaptchaServerHttpClient should extend the base, not matrix http client. | David Baker | 2014-11-20 | 1 | -1/+1 |
|/ | |||||
* | SYN-141: Encode query params as UTF-8. | Mark Haines | 2014-11-18 | 1 | -1/+7 |
| | |||||
* | Merge branch 'develop' into request_logging | Mark Haines | 2014-11-14 | 1 | -0/+8 |
|\ | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py | ||||
| * | apply some cache headers to try to make the content repo less nutso | Matthew Hodgson | 2014-11-11 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'develop' into request_logging | Mark Haines | 2014-10-30 | 3 | -11/+7 |
|\| | | | | | | | | | Conflicts: synapse/config/logger.py | ||||
| * | Fix pep8 warnings | Mark Haines | 2014-10-30 | 3 | -12/+10 |
| | | |||||
* | | Add a request-id to each log line | Mark Haines | 2014-10-30 | 2 | -12/+27 |
|/ | |||||
* | Add get_json method to 3pid http client. Better logging for errors in 3pid ↵ | Mark Haines | 2014-10-20 | 1 | -1/+39 |
| | | | | requests | ||||
* | remove debugging logging for signing requests | Mark Haines | 2014-10-14 | 1 | -4/+0 |
| | |||||
* | Verify signatures for server2server requests | Mark Haines | 2014-10-13 | 1 | -3/+7 |
| | |||||
* | SYN-75 sign at the request level rather than the transaction level | Mark Haines | 2014-10-13 | 1 | -7/+45 |
| | |||||
* | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-10-13 | 1 | -11/+35 |
|\ | |||||
| * | Replace on_send_callback with something a bit clearer so that we can sign ↵ | Mark Haines | 2014-10-13 | 1 | -11/+35 |
| | | | | | | | | messages | ||||
* | | Merge branch develop into server2server_signing | Mark Haines | 2014-10-13 | 1 | -154/+136 |
|\| | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| * | Fix pyflakes errors | Mark Haines | 2014-10-02 | 1 | -8/+2 |
| | | |||||
| * | Add a keyword argument to get_json to avoid retrying on DNS failures. Rather ↵ | Mark Haines | 2014-10-02 | 1 | -8/+1 |
| | | | | | | | | than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter | ||||
| * | Split PlainHttpClient into separate clients for talking to Identity servers ↵ | Mark Haines | 2014-10-02 | 1 | -144/+146 |
| | | | | | | | | and talking to Capatcha servers | ||||
| * | remove "red", "blue" and "green" server_name mappings | Mark Haines | 2014-10-01 | 1 | -7/+0 |
| | | |||||
* | | Fix a few pyflakes errors in the server_key_resource | Mark Haines | 2014-09-23 | 1 | -5/+1 |
| | | |||||
* | | Add a _matrix/key/v1 resource with the verification keys of the local server | Mark Haines | 2014-09-23 | 1 | -0/+93 |
|/ | |||||
* | Fix 'age' key to update on retries | Erik Johnston | 2014-09-15 | 1 | -3/+10 |
| | |||||
* | Captchas now work on registration. Missing x-forwarded-for config arg ↵ | Kegan Dougal | 2014-09-05 | 1 | -1/+27 |
| | | | | support. Missing reloading a new captcha on the web client / displaying a sensible error message. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2014-09-03 | 5 | -169/+232 |
|\ | | | | | | | | | Conflicts: synapse/http/client.py | ||||
| * | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 5 | -5/+5 |
| | | | | | | | | hasn't been incorporated in time for launch. | ||||
| * | Limit the size of uploads | Mark Haines | 2014-09-03 | 1 | -0/+14 |
| | | |||||
| * | Make retrying requests on DNS failures configurable, and turn off retrying ↵ | Kegan Dougal | 2014-09-03 | 1 | -6/+19 |
| | | | | | | | | only in directory.get_association | ||||
| * | hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately. | Kegan Dougal | 2014-09-03 | 1 | -1/+6 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-03 | 2 | -163/+193 |
| |\ | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py synapse/http/content_repository.py | ||||
| | * | move contentrepo class to it's own file | Mark Haines | 2014-09-03 | 2 | -162/+192 |
| | | | |||||
| * | | Add option to change content repo location | Erik Johnston | 2014-09-03 | 1 | -3/+4 |
| |/ | |||||
* / | Add support for registering with a threepid to the HS (get credentials from ↵ | David Baker | 2014-09-03 | 1 | -5/+35 |
|/ | | | | the client and check them against an ID server). | ||||
* | Merge branch 'master' into develop | Erik Johnston | 2014-09-03 | 1 | -2/+2 |
|\ | |||||
| * | Update default endpoint port to match the default ports in the config | Erik Johnston | 2014-09-02 | 1 | -2/+2 |
| | | |||||
* | | Set status message for ratelimit error responses | Mark Haines | 2014-09-03 | 1 | -5/+9 |
|/ | |||||
* | given everything's apparently gone https:// by default for c-s, change this ↵ | Matthew Hodgson | 2014-09-01 | 1 | -1/+5 |
| | | | | hardcoding... | ||||
* | Fix SSL for federation http client | Mark Haines | 2014-09-01 | 2 | -2/+2 |
| | |||||
* | Enable SSL for s2s http client | Mark Haines | 2014-09-01 | 1 | -2/+6 |
| | |||||
* | missed a s#/matrix#/_matrix/g | Matthew Hodgson | 2014-08-31 | 1 | -1/+1 |
| | |||||
* | For the content repo, don't just use homeserver.hostname as that might not ↵ | Erik Johnston | 2014-08-24 | 1 | -1/+3 |
| | | | | include the port due to SRV. | ||||
* | Make the content repo work with in daemon mode. Return the full url on ↵ | Erik Johnston | 2014-08-22 | 1 | -6/+20 |
| | | | | upload. Update the webclient to use new content repo api. | ||||
* | Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. ↵ | Kegan Dougal | 2014-08-19 | 1 | -1/+13 |
| | | | | SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests. | ||||
* | Small amounts of cleanup and bonus round comments. | Kegan Dougal | 2014-08-18 | 1 | -4/+8 |
| | |||||
* | Implemented GETs for the ContentRepoResource. It all actually appears to be ↵ | Kegan Dougal | 2014-08-18 | 1 | -11/+60 |
| | | | | working. | ||||
* | hs: Make the uploads directory if it doesn't exist. Namespace uploads by the ↵ | Kegan Dougal | 2014-08-18 | 1 | -5/+46 |
| | | | | 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. | ||||
* | Auth content uploads. Added a mapping function from request > filename. ↵ | Kegan Dougal | 2014-08-18 | 1 | -12/+32 |
| | | | | 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. | ||||
* | Added /matrix/content path, HS resource_for_content_repo attribute and ↵ | Kegan Dougal | 2014-08-18 | 1 | -0/+28 |
| | | | | FileUploadResource. Added stub methods. | ||||
* | If the web client is enabled, automatically redirect root '/' to the web ↵ | Kegan Dougal | 2014-08-14 | 1 | -0/+17 |
| | | | | client path. | ||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 1 | -9/+3 |
| | | | | resource_for_federation or resource_for_client depending on what is being tested. | ||||
* | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 1 | -0/+5 |
| | | | | 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. | ||||
* | fix http client GET parameters; somehow missing named param. how could this ↵ | Matthew Hodgson | 2014-08-14 | 1 | -2/+2 |
| | | | | have ever worked!? | ||||
* | Update get_json()'s documentation to match the actual observed behaviour | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -4/+3 |
| | |||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 4 | -0/+4 |
| | |||||
* | Just say yes to OPTIONS requests, since we want to turn on CORS headers for ↵ | Erik Johnston | 2014-08-12 | 1 | -0/+5 |
| | | | | all paths | ||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 4 | -0/+612 |