Merge pull request #2912 from OpenNeuroOrg/worker-guard-missing-datasets

fix(worker): Return 404 for missing datasets on draft or snapshot API calls
OpenNeuroOrg · Sep 25, 2023 · e753e99 · e753e99
2 parents 4edbb03 + 4d39eff
commit e753e99
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/services/datalad/datalad_service/handlers/draft.py b/services/datalad/datalad_service/handlers/draft.py
@@ -1,3 +1,5 @@
+import os
+
 import falcon
 import pygit2
 
@@ -13,9 +15,8 @@ def on_get(self, req, resp, dataset):
         """
         Return draft state (other than files).
         """
-        if dataset:
-            # Maybe turn this into status?
-            dataset_path = self.store.get_dataset_path(dataset)
+        dataset_path = self.store.get_dataset_path(dataset)
+        if dataset and os.path.exists(dataset_path):
             repo = pygit2.Repository(dataset_path)
             commit = repo.revparse_single('HEAD')
             resp.media = {'hexsha': commit.hex,

diff --git a/services/datalad/datalad_service/handlers/snapshots.py b/services/datalad/datalad_service/handlers/snapshots.py
@@ -1,3 +1,4 @@
+import os
 import logging
 
 import gevent
@@ -19,7 +20,9 @@ def __init__(self, store):
 
     def on_get(self, req, resp, dataset, snapshot=None):
         """Get the tree of files for a snapshot."""
-        if snapshot:
+        if not os.path.exists(self.store.get_dataset_path(dataset)):
+            resp.status = falcon.HTTP_NOT_FOUND
+        elif snapshot:
             files = get_tree(self.store, dataset, snapshot)
             response = get_snapshot(self.store, dataset, snapshot)
             response['files'] = files

diff --git a/services/datalad/datalad_service/tasks/validator.py b/services/datalad/datalad_service/tasks/validator.py
@@ -11,7 +11,7 @@
 
 
 LEGACY_VALIDATOR_VERSION = json.load(
-    open('/srv/package.json'))['dependencies']['bids-validator']
+    open('package.json'))['dependencies']['bids-validator']
 DENO_VALIDATOR_VERSION = 'v1.13.0'
 
 LEGACY_METADATA = {