Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion packages/openneuro-server/src/handlers/datalad.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import mime from "mime-types"
import { getFiles } from "../datalad/files"
import { getDatasetEndpoint, getDatasetWorker } from "../libs/datalad-service"
import { getDraftRevision } from "../datalad/draft"
import { checkDatasetRead, DeletedDatasetError } from "../graphql/permissions"

/**
* Handlers for datalad dataset manipulation
Expand All @@ -14,11 +15,32 @@ import { getDraftRevision } from "../datalad/draft"
* Unlike the other handlers, these use superagent for performance reasons
*/

/**
* Verify read access to the requested dataset and respond with an error if denied
*
* @returns {Promise<boolean>} True if the request may continue
*/
const requestDatasetRead = async (req, res, datasetId): Promise<boolean> => {
try {
await checkDatasetRead(datasetId, req.user?.id, req.user)
return true
} catch (err) {
if (err instanceof DeletedDatasetError) {
res.status(404).send({ error: err.message })
} else {
// Read denied or the dataset does not exist
res.status(403).send({ error: err.message })
}
return false
}
}

/**
* Get a file from a dataset
*/
export const getFile = async (req, res) => {
const { datasetId, snapshotId, filename } = req.params
if (!await requestDatasetRead(req, res, datasetId)) return
const worker = getDatasetWorker(datasetId)
// Find the right tree
const pathComponents = filename.split(":")
Expand Down Expand Up @@ -84,8 +106,9 @@ export const getFile = async (req, res) => {
/**
* Request a git object from a dataset
*/
export const getObject = (req, res) => {
export const getObject = async (req, res) => {
const { datasetId, key } = req.params
if (!await requestDatasetRead(req, res, datasetId)) return
const { filename } = req.query
const worker = getDatasetWorker(datasetId)
if (req.query?.filename) {
Expand Down
3 changes: 3 additions & 0 deletions packages/openneuro-server/src/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,19 @@ const routes = [
{
method: "get",
url: "/datasets/:datasetId/files/:filename",
middleware: [jwt.authenticate],
handler: datalad.getFile,
},
{
method: "get",
url: "/datasets/:datasetId/snapshots/:snapshotId/files/:filename",
middleware: [jwt.authenticate],
handler: datalad.getFile,
},
{
method: "get",
url: "/datasets/:datasetId/objects/:key",
middleware: [jwt.authenticate],
handler: datalad.getObject,
},

Expand Down