export_import: post bundle (#89035)

chrono/apps/export_import/api_views.py

@@ -14,7 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import io
 import json
 import tarfile
 
@@ -237,10 +236,10 @@ def component_redirect(request, component_type, slug):
 class BundleCheck(GenericAPIView):
     permission_classes = (permissions.IsAdminUser,)
 
-    def put(self, request, *args, **kwargs):
-        tar_io = io.BytesIO(request.read())
+    def post(self, request, *args, **kwargs):
+        bundle = request.FILES['bundle']
         try:
-            with tarfile.open(fileobj=tar_io) as tar:
+            with tarfile.open(fileobj=bundle) as tar:
                 try:
                     manifest = json.loads(tar.extractfile('manifest.json').read().decode())
                 except KeyError:
@@ -355,11 +354,11 @@ class BundleImport(GenericAPIView):
     permission_classes = (permissions.IsAdminUser,)
     install = True
 
-    def put(self, request, *args, **kwargs):
-        tar_io = io.BytesIO(request.read())
+    def post(self, request, *args, **kwargs):
+        bundle = request.FILES['bundle']
         components = {}
         try:
-            with tarfile.open(fileobj=tar_io) as tar:
+            with tarfile.open(fileobj=bundle) as tar:
                 try:
                     manifest = json.loads(tar.extractfile('manifest.json').read().decode())
                 except KeyError:

tests/api/test_applification_api.py

@@ -540,7 +540,7 @@ def test_bundle_import(app, admin_user):
     EventsType.objects.all().delete()
     UnavailabilityCalendar.objects.all().delete()
 
-    resp = app.put('/api/export-import/bundle-import/', bundles[0])
+    resp = app.post('/api/export-import/bundle-import/', upload_files=[('bundle', 'bundle.tar', bundles[0])])
     assert Agenda.objects.all().count() == 4
     assert resp.json['err'] == 0
     assert Application.objects.count() == 1
@@ -575,7 +575,7 @@ def test_bundle_import(app, admin_user):
     )
 
     # check update
-    resp = app.put('/api/export-import/bundle-import/', bundles[1])
+    resp = app.post('/api/export-import/bundle-import/', upload_files=[('bundle', 'bundle.tar', bundles[1])])
     assert Agenda.objects.all().count() == 4
     assert resp.json['err'] == 0
     assert Application.objects.count() == 1
@@ -598,7 +598,9 @@ def test_bundle_import(app, admin_user):
             assert last_snapshot.application_version == '42.1'
 
     # bad file format
-    resp = app.put('/api/export-import/bundle-import/', b'garbage', status=400)
+    resp = app.post(
+        '/api/export-import/bundle-import/', upload_files=[('bundle', 'bundle.tar', b'garbage')], status=400
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file'
 
@@ -609,7 +611,11 @@ def test_bundle_import(app, admin_user):
         tarinfo = tarfile.TarInfo('foo.json')
         tarinfo.size = len(foo_fd.getvalue())
         tar.addfile(tarinfo, fileobj=foo_fd)
-    resp = app.put('/api/export-import/bundle-import/', tar_io.getvalue(), status=400)
+    resp = app.post(
+        '/api/export-import/bundle-import/',
+        upload_files=[('bundle', 'bundle.tar', tar_io.getvalue())],
+        status=400,
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file, missing manifest'
 
@@ -625,7 +631,11 @@ def test_bundle_import(app, admin_user):
         tarinfo = tarfile.TarInfo('manifest.json')
         tarinfo.size = len(manifest_fd.getvalue())
         tar.addfile(tarinfo, fileobj=manifest_fd)
-    resp = app.put('/api/export-import/bundle-import/', tar_io.getvalue(), status=400)
+    resp = app.post(
+        '/api/export-import/bundle-import/',
+        upload_files=[('bundle', 'bundle.tar', tar_io.getvalue())],
+        status=400,
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file, missing component agendas/foo'
 
@@ -634,7 +644,7 @@ def test_bundle_declare(app, admin_user):
     app.authorization = ('Basic', ('admin', 'admin'))
 
     bundle = create_bundle(app, admin_user, visible=False)
-    resp = app.put('/api/export-import/bundle-declare/', bundle)
+    resp = app.post('/api/export-import/bundle-declare/', upload_files=[('bundle', 'bundle.tar', bundle)])
     assert Agenda.objects.all().count() == 4
     assert resp.json['err'] == 0
     assert Application.objects.count() == 1
@@ -661,14 +671,16 @@ def test_bundle_declare(app, admin_user):
     # and remove agendas to have unknown references in manifest
     Agenda.objects.all().delete()
 
-    resp = app.put('/api/export-import/bundle-declare/', bundle)
+    resp = app.post('/api/export-import/bundle-declare/', upload_files=[('bundle', 'bundle.tar', bundle)])
     assert Application.objects.count() == 1
     application = Application.objects.latest('pk')
     assert application.visible is True
     assert ApplicationElement.objects.count() == 4  # category, events_type, unavailability_calendar, resource
 
     # bad file format
-    resp = app.put('/api/export-import/bundle-declare/', b'garbage', status=400)
+    resp = app.post(
+        '/api/export-import/bundle-declare/', upload_files=[('bundle', 'bundle.tar', b'garbage')], status=400
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file'
 
@@ -679,7 +691,11 @@ def test_bundle_declare(app, admin_user):
         tarinfo = tarfile.TarInfo('foo.json')
         tarinfo.size = len(foo_fd.getvalue())
         tar.addfile(tarinfo, fileobj=foo_fd)
-    resp = app.put('/api/export-import/bundle-declare/', tar_io.getvalue(), status=400)
+    resp = app.post(
+        '/api/export-import/bundle-declare/',
+        upload_files=[('bundle', 'bundle.tar', tar_io.getvalue())],
+        status=400,
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file, missing manifest'
 
@@ -695,7 +711,11 @@ def test_bundle_declare(app, admin_user):
         tarinfo = tarfile.TarInfo('manifest.json')
         tarinfo.size = len(manifest_fd.getvalue())
         tar.addfile(tarinfo, fileobj=manifest_fd)
-    resp = app.put('/api/export-import/bundle-declare/', tar_io.getvalue(), status=400)
+    resp = app.post(
+        '/api/export-import/bundle-declare/',
+        upload_files=[('bundle', 'bundle.tar', tar_io.getvalue())],
+        status=400,
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file, missing component agendas/foo'
 
@@ -778,13 +798,17 @@ def test_bundle_check(app, admin_user):
         incomplete_bundles.append(tar_io.getvalue())
 
     # incorrect bundles, missing information
-    resp = app.put('/api/export-import/bundle-check/', incomplete_bundles[0])
+    resp = app.post(
+        '/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', incomplete_bundles[0])]
+    )
     assert resp.json == {'data': {}}
-    resp = app.put('/api/export-import/bundle-check/', incomplete_bundles[1])
+    resp = app.post(
+        '/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', incomplete_bundles[1])]
+    )
     assert resp.json == {'data': {}}
 
     # not yet imported
-    resp = app.put('/api/export-import/bundle-check/', bundles[0])
+    resp = app.post('/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', bundles[0])])
     assert resp.json == {
         'data': {
             'differences': [],
@@ -804,13 +828,13 @@ def test_bundle_check(app, admin_user):
     }
 
     # import bundle
-    resp = app.put('/api/export-import/bundle-import/', bundles[0])
+    resp = app.post('/api/export-import/bundle-import/', upload_files=[('bundle', 'bundle.tar', bundles[0])])
     assert Application.objects.count() == 1
     assert ApplicationElement.objects.count() == 8
 
     # remove application links
     Application.objects.all().delete()
-    resp = app.put('/api/export-import/bundle-check/', bundles[0])
+    resp = app.post('/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', bundles[0])])
     assert resp.json == {
         'data': {
             'differences': [],
@@ -870,12 +894,12 @@ def test_bundle_check(app, admin_user):
     }
 
     # import bundle again, recreate links
-    resp = app.put('/api/export-import/bundle-import/', bundles[0])
+    resp = app.post('/api/export-import/bundle-import/', upload_files=[('bundle', 'bundle.tar', bundles[0])])
     assert Application.objects.count() == 1
     assert ApplicationElement.objects.count() == 8
 
     # no changes since last import
-    resp = app.put('/api/export-import/bundle-check/', bundles[0])
+    resp = app.post('/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', bundles[0])])
     assert resp.json == {
         'data': {
             'differences': [],
@@ -900,7 +924,7 @@ def test_bundle_check(app, admin_user):
             )
 
     # and check
-    resp = app.put('/api/export-import/bundle-check/', bundles[0])
+    resp = app.post('/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', bundles[0])])
     assert resp.json == {
         'data': {
             'differences': [
@@ -992,10 +1016,10 @@ def test_bundle_check(app, admin_user):
     }
 
     # update bundle
-    resp = app.put('/api/export-import/bundle-import/', bundles[1])
+    resp = app.post('/api/export-import/bundle-import/', upload_files=[('bundle', 'bundle.tar', bundles[1])])
 
     # and check
-    resp = app.put('/api/export-import/bundle-check/', bundles[1])
+    resp = app.post('/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', bundles[1])])
     assert resp.json == {
         'data': {
             'differences': [],
@@ -1007,7 +1031,7 @@ def test_bundle_check(app, admin_user):
 
     # snapshots without application info
     AgendaSnapshot.objects.update(application_slug=None, application_version=None)
-    resp = app.put('/api/export-import/bundle-check/', bundles[1])
+    resp = app.post('/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', bundles[1])])
     assert resp.json == {
         'data': {
             'differences': [],
@@ -1023,7 +1047,9 @@ def test_bundle_check(app, admin_user):
     }
 
     # bad file format
-    resp = app.put('/api/export-import/bundle-check/', b'garbage', status=400)
+    resp = app.post(
+        '/api/export-import/bundle-check/', upload_files=[('bundle', 'bundle.tar', b'garbage')], status=400
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file'
 
@@ -1034,6 +1060,10 @@ def test_bundle_check(app, admin_user):
         tarinfo = tarfile.TarInfo('foo.json')
         tarinfo.size = len(foo_fd.getvalue())
         tar.addfile(tarinfo, fileobj=foo_fd)
-    resp = app.put('/api/export-import/bundle-check/', tar_io.getvalue(), status=400)
+    resp = app.post(
+        '/api/export-import/bundle-check/',
+        upload_files=[('bundle', 'bundle.tar', tar_io.getvalue())],
+        status=400,
+    )
     assert resp.json['err']
     assert resp.json['err_desc'] == 'Invalid tar file, missing manifest'