summaryrefslogtreecommitdiff
path: root/src/leap/soledad/server
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-05-18 03:28:32 -0300
committerVictor Shyba <victor1984@riseup.net>2017-07-02 01:32:39 -0300
commit154cfabeca53258e547adfb5ce815a59f8eff59c (patch)
tree90e352ae785ea5b2d8566408cbb7a6f45ef033b7 /src/leap/soledad/server
parent0dbdb7e6a2ce73a28d5965d41db03cd02bf4abf3 (diff)
[feature] direct /incoming requests to IncomingResource
Adds the routing code for exposing /incoming from SoledadResource. - Related: #8827
Diffstat (limited to 'src/leap/soledad/server')
-rw-r--r--src/leap/soledad/server/_resource.py4
-rw-r--r--src/leap/soledad/server/url_mapper.py4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/leap/soledad/server/_resource.py b/src/leap/soledad/server/_resource.py
index 49c4b742..28344b38 100644
--- a/src/leap/soledad/server/_resource.py
+++ b/src/leap/soledad/server/_resource.py
@@ -20,6 +20,7 @@ A twisted resource that serves the Soledad Server.
from twisted.web.resource import Resource
from ._server_info import ServerInfo
+from ._incoming import IncomingResource
from ._wsgi import get_sync_resource
@@ -75,6 +76,9 @@ class SoledadResource(Resource):
if blobs_resource:
self.putChild('blobs', blobs_resource)
+ # requests to /incoming goes into IncomingResource
+ self.putChild('incoming', IncomingResource())
+
# other requests are routed to legacy sync resource
self._sync_resource = get_sync_resource(sync_pool)
diff --git a/src/leap/soledad/server/url_mapper.py b/src/leap/soledad/server/url_mapper.py
index b50a81cd..137a5469 100644
--- a/src/leap/soledad/server/url_mapper.py
+++ b/src/leap/soledad/server/url_mapper.py
@@ -59,6 +59,7 @@ class URLMapper(object):
/user-{uuid}/sync-from/{source} | GET, PUT, POST
/blobs/{uuid}/{blob_id} | GET, PUT, POST
/blobs/{uuid} | GET
+ /incoming/ | PUT
"""
# auth info for global resource
self._connect('/', ['GET'])
@@ -75,3 +76,6 @@ class URLMapper(object):
# auth info for blobs resource
self._connect('/blobs/{uuid}/{blob_id}', ['GET', 'PUT'])
self._connect('/blobs/{uuid}', ['GET'])
+
+ # incoming resource
+ self._connect('/incoming/{uuid}/{incoming_id}', ['PUT'])