summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-18 15:50:55 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-18 17:18:54 +0100
commit35da1bf4a3ee6eeafec5965af05cefbb4bd3c0b5 (patch)
tree020fcae7d4ec3dd57022138c39a8af780839b247 /synapse/app
parentAdded /matrix/content path, HS resource_for_content_repo attribute and FileUp... (diff)
downloadsynapse-35da1bf4a3ee6eeafec5965af05cefbb4bd3c0b5.tar.xz
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.
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index e5bd13a6eb..f7c1da9201 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -56,7 +56,7 @@ class SynapseHomeServer(HomeServer):
         return File("webclient")  # TODO configurable?
 
     def build_resource_for_content_repo(self):
-        return FileUploadResource("uploads")
+        return FileUploadResource("uploads", self.auth)
 
     def build_db_pool(self):
         """ Set up all the dbs. Since all the *.sql have IF NOT EXISTS, so we