summary refs log tree commit diff
path: root/synapse/http (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Work around TLS bug in twistedRichard van der Hoff2016-06-151-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 Haines2016-05-161-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 Hodgson2016-05-012-7/+13
| | | | matrix.org IP space
* Fix more typos in per-request metricsMark Haines2016-04-281-4/+5
|
* Fix typo in request metricsMark Haines2016-04-281-1/+1
|
* Add a comment explaining why automatic metric reporting is disabled for ↵Mark Haines2016-04-281-0/+4
| | | | JsonResource
* Check if report_metrics is TrueMark Haines2016-04-281-3/+4
|
* Report per request metrics for all of the things using request_handlerMark Haines2016-04-281-38/+63
|
* Move SynapseSite to its own fileMark Haines2016-04-221-0/+146
|
* Make InsecureInterceptableContextFactory work with SpiderEndpointErik Johnston2016-04-191-1/+4
|
* Merge pull request #688 from matrix-org/matthew/preview_urlsMatthew Hodgson2016-04-112-5/+197
|\ | | | | URL previewing support
| * actually throw meaningful errorsMatthew Hodgson2016-04-081-5/+16
| |
| * Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵Matthew Hodgson2016-04-082-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_urlsMatthew Hodgson2016-04-041-30/+51
| |\
| * | pep8Matthew Hodgson2016-04-031-4/+10
| | |
| * | add a persistent cache of URL lookups, and fix up the in-memory one to workMatthew Hodgson2016-04-031-3/+3
| | |
| * | support gzip compression, and don't pass through error msgsMatthew Hodgson2016-04-021-3/+8
| | |
| * | handle spidered relative images correctlyMatthew Hodgson2016-03-311-1/+1
| | |
| * | sync in changes from matrixfederationclientMatthew Hodgson2016-03-311-2/+6
| | |
| * | handle requests with missing content-length headers (e.g. YouTube)Matthew Hodgson2016-03-311-7/+26
| | |
| * | implement redirectsMatthew Hodgson2016-03-291-3/+3
| | |
| * | make it workMatthew Hodgson2016-03-291-1/+2
| | |
| * | make it buildMatthew Hodgson2016-03-291-1/+1
| | |
| * | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-291-4/+6
| |\ \
| * \ \ Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-274-27/+159
| |\ \ \
| * | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵Matthew Hodgson2016-01-241-0/+81
| | | | | | | | | | | | | | | | | | | | experimental, etc. just putting it here for safekeeping for now
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cacheErik Johnston2016-04-071-30/+51
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Use google style doc strings.Mark Haines2016-04-011-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 funcErik Johnston2016-03-311-3/+3
| | | |
* | | | Read from DNS cache if within TTLErik Johnston2016-03-311-16/+23
|/ / /
* | / Intern all the thingsErik Johnston2016-03-231-4/+6
| |/ |/|
* | Fix regression where synapse checked whether push rules were valid JSON ↵Mark Haines2016-03-141-4/+17
| | | | | | | | before the compatibility hack that handled clients sending invalid JSON
* | Use parse_json_object_from_request to parse JSON out of request bodiesMark Haines2016-03-111-5/+12
| |
* | Add a parse_json_object functionMark Haines2016-03-091-5/+65
| | | | | | | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.
* | pep8David Baker2016-03-081-2/+5
| |
* | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ↵David Baker2016-03-081-2/+12
| | | | | | | | chokes.
* | Catch the exceptions thrown by twisted when you write to a closed connectionMark Haines2016-02-121-1/+20
| |
* | Fix up logcontextsErik Johnston2016-02-081-3/+2
| |
* | Add metrics to pushersErik Johnston2016-02-081-0/+10
| |
* | Allowing tagging log contextsErik Johnston2016-02-031-15/+26
| |
* | Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-021-1/+1
|/
* Fix AttributeErrorErik Johnston2016-01-211-1/+1
|
* Cache dns lookups, and use the cache if we fail to lookup servers laterErik Johnston2016-01-201-30/+71
|
* copyrightsMatthew Hodgson2016-01-076-6/+6
|
* Fix typoDaniel Wagner-Hall2015-12-161-1/+1
|
* Include errcode on Internal Server ErrorDaniel Wagner-Hall2015-12-141-2/+5
|
* Track the time spent in the database per request.Mark Haines2015-12-071-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 requestMark Haines2015-12-041-0/+17
|
* Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-012-10/+11
|
* Fix typoErik Johnston2015-11-201-2/+2
|
* Don't limit connections to perspective serversErik Johnston2015-11-201-1/+4
|
* Use min and not max to set an upper bound on retry intervalErik Johnston2015-11-201-2/+2
|
* Add commentErik Johnston2015-11-171-0/+2
|
* Only retry federation requests for a long time for background requestsErik Johnston2015-11-171-7/+19
|
* Implement required method 'resumeProducing'Erik Johnston2015-11-171-0/+3
|
* Slightly more aggressive retry timers at HTTP levelErik Johnston2015-11-171-2/+3
|
* Retry dead servers a lot less oftenErik Johnston2015-11-021-2/+8
|
* Verify third party ID server certificatesDaniel Wagner-Hall2015-10-161-4/+0
|
* Fix previous merge to s/version_string/user_agent/Erik Johnston2015-10-101-2/+2
|
* Add get_raw method to SimpleHttpClient, use this in CAS auth rather than ↵Steven Hammerton2015-10-101-19/+36
| | | | requests
* Use space not dash as delimiterDaniel Wagner-Hall2015-10-061-1/+1
|
* Use space not dash as delimiterDaniel Wagner-Hall2015-10-061-1/+1
|
* Preserve version string in user agentDaniel Wagner-Hall2015-10-051-3/+3
|
* Allow synapse's useragent to be customizedDaniel Wagner-Hall2015-10-021-6/+9
| | | | | This will allow me to write tests which verify which server made HTTP requests in a federation context.
* Rename context factoryDaniel Wagner-Hall2015-09-151-3/+3
| | | | Mjark is officially no fun.
* Fix random formattingDaniel Wagner-Hall2015-09-091-1/+2
|
* Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-092-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 librariesMark Haines2015-08-243-9/+10
|
* PEP8Erik Johnston2015-08-131-1/+0
|
* Merge branch 'develop' into markjh/twisted-15Mark Haines2015-08-123-123/+130
|\ | | | | | | | | Conflicts: synapse/http/matrixfederationclient.py
| * Don't 500 if a group is missing from the regexMark Haines2015-07-061-1/+1
| |
| * Fix log context when sending requestsErik Johnston2015-06-192-33/+35
| |
| * Remove stale debug linesErik Johnston2015-06-191-10/+0
| |
| * Add IDs to outbound transactionsErik Johnston2015-06-191-53/+71
| |
| * Disable twisted access logging. Move access logging to SynapseRequest objectErik Johnston2015-06-151-58/+32
| |
| * Log more when we have processed the requestErik Johnston2015-06-151-2/+12
| |
| * Create SynapseRequest that overrides __repr__ to not print access_tokenErik Johnston2015-06-151-11/+3
| |
| * Make http.server request logging more verbose, but redact access_tokensErik Johnston2015-06-151-2/+12
| |
| * Log requests and responses sent via http.clientErik Johnston2015-06-151-3/+15
| |
* | Merge branch 'develop' into markjh/twisted-15Mark Haines2015-06-011-4/+12
|\| | | | | | | | | Conflicts: synapse/python_dependencies.py
| * Remove log lineErik Johnston2015-05-291-1/+0
| |
| * Add config option to turn off freezing events. Use new encode_json api and ↵Erik Johnston2015-05-291-4/+13
| | | | | | | | ujson.loads
* | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵Mark Haines2015-06-011-50/+25
|/ | | | own Agent
* Correctly pass connection pool parameterErik Johnston2015-05-282-2/+2
|
* Up maxPersistentPerHost countErik Johnston2015-05-282-0/+2
|
* Add connection pooling to SimpleHttpClientErik Johnston2015-05-281-2/+4
|
* Use connection pool for federation connectionsErik Johnston2015-05-281-2/+3
|
* Add doc stringsErik Johnston2015-05-221-0/+3
|
* Add a timeout param to get_eventErik Johnston2015-05-191-5/+8
|
* Fix up leak. Add warnings.Erik Johnston2015-05-081-2/+4
|
* Change the way we do logging contexts so that they survive divergencesErik Johnston2015-05-082-17/+21
|
* Unused importDavid Baker2015-04-301-1/+1
|
* Doesn't look like this is used anymoreDavid Baker2015-04-301-13/+0
|
* Merge branch 'develop' into csauthDavid Baker2015-04-242-152/+179
|\ | | | | | | | | Conflicts: synapse/http/server.py
| * Combine the request wrappers in rest/media/v1 and http/server into a single ↵Mark Haines2015-04-212-58/+67
| | | | | | | | wrapper decorator
| * Split out the JsonResource request logging and error handling into a ↵Mark Haines2015-04-211-94/+113
| | | | | | | | separate wrapper function
* | Merge branch 'develop' into csauthDavid Baker2015-04-171-93/+0
|\|
| * Move server key api into rest/key/v1Mark Haines2015-04-141-93/+0
| |
* | Explain how I justified to myself making JsonResource not always send JSON.David Baker2015-04-011-0/+7
| |
* | Completely replace fallback auth for C/S V2:David Baker2015-04-011-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 trueDavid Baker2015-03-311-1/+1
| |
* | Grammar and deduplicationDavid Baker2015-03-311-5/+4
| |
* | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-301-0/+2
|/
* Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-181-2/+2
|\ | | | | Disable registration by default. Add script to register new users.
| * Add missing commasErik Johnston2015-03-131-2/+2
| |
* | Add a DistributionMetric to HTTP request/response processing time in the serverPaul "LeoNerd" Evans2015-03-161-0/+9
| |
* | actually uphold the bind_host parameter. in theory should make ipv6 binds ↵Matthew Hodgson2015-03-141-1/+6
| | | | | | | | work like bind_host: 'fe80::1%lo0'
* | Appease pep8Paul "LeoNerd" Evans2015-03-123-9/+19
| |
* | Count incoming HTTP requests per servlet that respondsPaul "LeoNerd" Evans2015-03-121-7/+11
| |
* | Use _ instead of . as a metric namespacing separator, for PrometheusPaul "LeoNerd" Evans2015-03-123-6/+6
| |
* | Rename Metrics' "keys" to "labels"Paul "LeoNerd" Evans2015-03-123-6/+6
| |
* | Add vector counters to HTTP clients and servers; count the requests by ↵Paul "LeoNerd" Evans2015-03-123-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" Evans2015-03-121-5/+10
|/ | | | single wrapper function, to make adding metrics easier
* Slightly reduce the insane amounts of indentation in main http server ↵Paul "LeoNerd" Evans2015-03-051-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 FrozenEventsKegan Dougal2015-03-021-1/+1
|
* Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-185-35/+30
|\
| * Make /keys/ return correct Server versionErik Johnston2015-02-181-1/+5
| |
| * Use git aware version string in User-Agent and Server headersErik Johnston2015-02-184-34/+25
| |
* | Don't convert DNSLookupError to a 4xx SynapseErrorErik Johnston2015-02-181-1/+1
|/
* Add .__name__ after type(e)Erik Johnston2015-02-181-2/+2
|
* Fix up ResponseNeverReceived to strErik Johnston2015-02-181-9/+11
|
* strings.join() expects iterable of stringsErik Johnston2015-02-181-1/+1
|
* Remove unused importErik Johnston2015-02-171-1/+0
|
* Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-171-10/+57
|\
| * Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-131-10/+57
| |\ | | | | | | Application Services
| | * Merge branch 'develop' into application-servicesKegan Dougal2015-02-111-2/+1
| | |\
| | * | Minor tweaks based on PR feedback.Kegan Dougal2015-02-111-1/+2
| | | |
| | * | Merge branch 'develop' into application-servicesKegan Dougal2015-02-092-3/+23
| | |\ \
| | * \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-6/+36
| | |\ \ \
| | * | | | Add SimpleHttpClient.put_json with the same semantics as get_json.Kegan Dougal2015-02-041-2/+46
| | | | | |
| | * | | | Update user/alias query APIs to use new format of SimpleHttpClient.get_jsonKegan Dougal2015-02-041-0/+3
| | | | | |
| | * | | | Modify API for SimpleHttpClient.get_json and update usages.Kegan Dougal2015-02-041-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 nicelyErik Johnston2015-02-171-11/+12
|/ / / / /
* | | | | Use encode_canonical_json for http clientErik Johnston2015-02-111-1/+3
| | | | |
* | | | | Merge pull request #61 from matrix-org/timeout-federation-requestsErik Johnston2015-02-111-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Timeout federation requests
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-111-2/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | timeout-federation-requests
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-114-13/+228
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | timeout-federation-requests
| * | | | | PEP8Erik Johnston2015-02-111-1/+0
| | | | | |
| * | | | | Move time_bound_deferred into ClockErik Johnston2015-02-111-3/+2
| | | | | |
| * | | | | Time out HTTP federation requestsErik Johnston2015-02-101-2/+9
| | | | | |
* | | | | | Blunty replace json with simplejsonErik Johnston2015-02-112-2/+2
| |_|/ / / |/| | | |
* | | | | Fix bug where variable was not always definedErik Johnston2015-02-111-2/+1
| |/ / / |/| | |
* | | | Log when we receive a request, when we send a response and how long it took ↵Erik Johnston2015-02-091-2/+21
| | | | | | | | | | | | | | | | to process it.
* | | | Return body of response in HttpResponseExceptionErik Johnston2015-02-061-1/+2
| |_|/ |/| |
* | | Apply sanity to the transport client interface. Convert 'make_join' and ↵Erik Johnston2015-02-041-6/+36
| |/ |/| | | | | 'send_join' to accept iterables of destinations
* | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-303-6/+78
|\ \ | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
| * \ Merge branch 'develop' into pushersDavid Baker2015-01-281-0/+113
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py
| | * | Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-231-0/+57
| | | |
| * | | Merge branch 'develop' into pushersDavid Baker2015-01-221-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py
| * | | | Oops: second part of commit dc938606David Baker2015-01-221-6/+2
| | | | |
| * | | | Merge branch 'develop' into pushersDavid Baker2015-01-137-12/+42
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'develop' into pushersDavid Baker2014-12-183-235/+129
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
| * \ \ \ \ Merge branch 'develop' into pushersDavid Baker2014-12-021-2/+2
| |\ \ \ \ \
| * | | | | | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP ↵David Baker2014-11-211-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pokes work or not yet but the retry semantics are pretty good.
* | | | | | | Make post_json(...) actually send data.Erik Johnston2015-01-291-1/+1
| | | | | | |
* | | | | | | Add post_json(...) method to federation clientErik Johnston2015-01-291-0/+37
| |_|_|_|_|/ |/| | | | |
* | | | | | Add RestServlet base class in synapse/http/servlet.pyMark Haines2015-01-231-0/+56
| |_|_|_|/ |/| | | |
* | | | | Finish renaming "context" to "room_id" in federation codebaseMark Haines2015-01-161-1/+0
| |_|_|/ |/| | |
* | | | SYN-231: User agent header brokenMark Haines2015-01-081-3/+3
| | | |
* | | | Update copyright noticesMark Haines2015-01-067-8/+8
| | | |
* | | | Set a content-length for JSON responsesMark Haines2015-01-061-0/+1
| | | |
* | | | Include version in User-Agent and Server headersMark Haines2014-12-224-6/+35
| |_|/ |/| |
* | | Fix tests and remove debug loggingErik Johnston2014-12-121-4/+0
| | |
* | | Consistently url decode and decode as utf 8 the URL partsErik Johnston2014-12-121-1/+11
| | |
* | | Limit the size of images that are thumbnailed serverside. Limit the size of ↵Mark Haines2014-12-111-6/+19
| | | | | | | | | | | | file that a server will download from a remote server
* | | Merge branch 'develop' into media_repositoryMark Haines2014-12-101-9/+26
|\ \ \
| * | | turn back on per-request transaction retries, so that every time we try to ↵Matthew Hodgson2014-12-101-4/+3
| | | | | | | | | | | | | | | | hit a dead server we actually end up hammering 5 times :|
| * | | Code style.Erik Johnston2014-12-101-8/+21
| | | |
| * | | add errbacks to enqueue_pdu deferreds; change logging for failed federation ↵Matthew Hodgson2014-12-101-2/+2
| | | | | | | | | | | | | | | | sends to warn rather than exception
| * | | squidge to 79 columns as per pep8Matthew Hodgson2014-12-101-3/+4
| | | |
| * | | track replication destination health, and perform exponential back-off when ↵Matthew Hodgson2014-12-071-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_repositoryMark Haines2014-12-041-5/+68
| | |
* | | Get uploads working with new media repoMark Haines2014-12-021-2/+2
| | |
* | | Write the upload portion of version 1 of the media repositoryMark Haines2014-12-022-219/+14
|/ /
* / typosMatthew Hodgson2014-11-241-2/+2
|/
* Fix pep8 and pyflakes warningsMark Haines2014-11-203-7/+8
|
* Merge branch 'develop' into http_client_refactorDavid Baker2014-11-202-8/+9
|\
| * Fix pep8 codestyle warningsMark Haines2014-11-202-8/+9
| |
| * Use module loggers rather than the root logger. Exceptions caused by bad ↵Mark Haines2014-11-201-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 Baker2014-11-203-323/+338
| | | | | | | | code it now separate from the simple case we need for standard HTTP(S)
* | Refactor the HTTP clients a little.David Baker2014-11-201-79/+75
| |
* | CaptchaServerHttpClient should extend the base, not matrix http client.David Baker2014-11-201-1/+1
|/
* SYN-141: Encode query params as UTF-8.Mark Haines2014-11-181-1/+7
|
* Merge branch 'develop' into request_loggingMark Haines2014-11-141-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 nutsoMatthew Hodgson2014-11-111-0/+8
| |
* | Merge branch 'develop' into request_loggingMark Haines2014-10-303-11/+7
|\| | | | | | | | | Conflicts: synapse/config/logger.py
| * Fix pep8 warningsMark Haines2014-10-303-12/+10
| |
* | Add a request-id to each log lineMark Haines2014-10-302-12/+27
|/
* Add get_json method to 3pid http client. Better logging for errors in 3pid ↵Mark Haines2014-10-201-1/+39
| | | | requests
* remove debugging logging for signing requestsMark Haines2014-10-141-4/+0
|
* Verify signatures for server2server requestsMark Haines2014-10-131-3/+7
|
* SYN-75 sign at the request level rather than the transaction levelMark Haines2014-10-131-7/+45
|
* Merge branch 'develop' into server2server_signingMark Haines2014-10-131-11/+35
|\
| * Replace on_send_callback with something a bit clearer so that we can sign ↵Mark Haines2014-10-131-11/+35
| | | | | | | | messages
* | Merge branch develop into server2server_signingMark Haines2014-10-131-154/+136
|\| | | | | | | | | Conflicts: synapse/app/homeserver.py
| * Fix pyflakes errorsMark Haines2014-10-021-8/+2
| |
| * Add a keyword argument to get_json to avoid retrying on DNS failures. Rather ↵Mark Haines2014-10-021-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 Haines2014-10-021-144/+146
| | | | | | | | and talking to Capatcha servers
| * remove "red", "blue" and "green" server_name mappingsMark Haines2014-10-011-7/+0
| |
* | Fix a few pyflakes errors in the server_key_resourceMark Haines2014-09-231-5/+1
| |
* | Add a _matrix/key/v1 resource with the verification keys of the local serverMark Haines2014-09-231-0/+93
|/
* Fix 'age' key to update on retriesErik Johnston2014-09-151-3/+10
|
* Captchas now work on registration. Missing x-forwarded-for config arg ↵Kegan Dougal2014-09-051-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 developDavid Baker2014-09-035-169/+232
|\ | | | | | | | | Conflicts: synapse/http/client.py
| * fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵Matthew Hodgson2014-09-035-5/+5
| | | | | | | | hasn't been incorporated in time for launch.
| * Limit the size of uploadsMark Haines2014-09-031-0/+14
| |
| * Make retrying requests on DNS failures configurable, and turn off retrying ↵Kegan Dougal2014-09-031-6/+19
| | | | | | | | only in directory.get_association
| * hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately.Kegan Dougal2014-09-031-1/+6
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-09-032-163/+193
| |\ | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py synapse/http/content_repository.py
| | * move contentrepo class to it's own fileMark Haines2014-09-032-162/+192
| | |
| * | Add option to change content repo locationErik Johnston2014-09-031-3/+4
| |/
* / Add support for registering with a threepid to the HS (get credentials from ↵David Baker2014-09-031-5/+35
|/ | | | the client and check them against an ID server).
* Merge branch 'master' into developErik Johnston2014-09-031-2/+2
|\
| * Update default endpoint port to match the default ports in the configErik Johnston2014-09-021-2/+2
| |
* | Set status message for ratelimit error responsesMark Haines2014-09-031-5/+9
|/
* given everything's apparently gone https:// by default for c-s, change this ↵Matthew Hodgson2014-09-011-1/+5
| | | | hardcoding...
* Fix SSL for federation http clientMark Haines2014-09-012-2/+2
|
* Enable SSL for s2s http clientMark Haines2014-09-011-2/+6
|
* missed a s#/matrix#/_matrix/gMatthew Hodgson2014-08-311-1/+1
|
* For the content repo, don't just use homeserver.hostname as that might not ↵Erik Johnston2014-08-241-1/+3
| | | | include the port due to SRV.
* Make the content repo work with in daemon mode. Return the full url on ↵Erik Johnston2014-08-221-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 Dougal2014-08-191-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 Dougal2014-08-181-4/+8
|
* Implemented GETs for the ContentRepoResource. It all actually appears to be ↵Kegan Dougal2014-08-181-11/+60
| | | | working.
* hs: Make the uploads directory if it doesn't exist. Namespace uploads by the ↵Kegan Dougal2014-08-181-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 Dougal2014-08-181-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 Dougal2014-08-181-0/+28
| | | | FileUploadResource. Added stub methods.
* If the web client is enabled, automatically redirect root '/' to the web ↵Kegan Dougal2014-08-141-0/+17
| | | | client path.
* Removed http_server from HomeServer. Updated unit tests to use either ↵Kegan Dougal2014-08-141-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 Dougal2014-08-141-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 Hodgson2014-08-141-2/+2
| | | | have ever worked!?
* Update get_json()'s documentation to match the actual observed behaviourPaul "LeoNerd" Evans2014-08-131-4/+3
|
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-134-0/+4
|
* Just say yes to OPTIONS requests, since we want to turn on CORS headers for ↵Erik Johnston2014-08-121-0/+5
| | | | all paths
* Reference Matrix Home Servermatrix.org2014-08-124-0/+612