@openneuro/server 4.44.4 → 4.44.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.44.4",
+  "version": "4.44.6",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,9 +21,9 @@
     "@elastic/elasticsearch": "8.13.1",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^4.5.0",
-    "@openneuro/search": "^4.44.4",
-    "@sentry/node": "^8.25.0",
-    "@sentry/profiling-node": "^8.25.0",
+    "@openneuro/search": "^4.44.6",
+    "@sentry/node": "^10.37.0",
+    "@sentry/profiling-node": "^10.37.0",
     "base64url": "^3.0.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1f19e9260ba364a821864f48233e281507c0640a"
+  "gitHead": "1c266a5a49f11d604ea83725661c7896df40eca1"
 }

package/src/datalad/dataset.ts

@@ -14,7 +14,7 @@ import * as subscriptions from "../handlers/subscriptions"
 import { generateDataladCookie } from "../libs/authentication/jwt"
 import { redis } from "../libs/redis"
 import CacheItem, { CacheType } from "../cache/item"
-import { updateDatasetRevision } from "./draft"
+import { getDraftRevision, updateDatasetRevision } from "./draft"
 import { encodeFilePath, filesUrl, fileUrl, getFileName } from "./files"
 import { getAccessionNumber } from "../libs/dataset"
 import Dataset from "../models/dataset"
@@ -80,28 +80,6 @@ export const createDataset = async (
   }
 }
 
-interface WorkerDraftFields {
-  // Commit id hash
-  ref: string
-  // Commit tree ref
-  tree: string
-  // Commit message
-  message: string
-  // Commit author time
-  modified: string
-}
-
-/**
- * Return the latest commit
- * @param {string} id Dataset accession number
- */
-export const getDraftHead = async (id): Promise<WorkerDraftFields> => {
-  const draftRes = await request
-    .get(`${getDatasetWorker(id)}/datasets/${id}/draft`)
-    .set("Accept", "application/json")
-  return draftRes.body
-}
-
 /**
  * Fetch dataset document and related fields
  */
@@ -109,7 +87,7 @@ export const getDataset = async (id) => {
   const dataset = await Dataset.findOne({ id }).lean()
   return {
     ...dataset,
-    revision: (await getDraftHead(id)).ref,
+    revision: getDraftRevision(id),
   }
 }
 

package/src/graphql/resolvers/dataset.ts

@@ -24,6 +24,7 @@ import { derivatives } from "./derivatives"
 import { promiseTimeout } from "../../utils/promiseTimeout"
 import { datasetEvents } from "./datasetEvents"
 import semver from "semver"
+import { getDraftInfo } from "../../datalad/draft"
 
 export const dataset = async (obj, { id }, { user, userInfo }) => {
   await checkDatasetRead(id, user, userInfo)
@@ -280,7 +281,7 @@ const worker = (obj) => getDatasetWorker(obj.id)
 const Dataset = {
   uploader: (ds, _, context) => user(ds, { id: ds.uploader }, context),
   draft: async (obj) => {
-    const draftHead = await datalad.getDraftHead(obj.id)
+    const draftHead = await getDraftInfo(obj.id)
     return {
       id: obj.id,
       revision: draftHead.ref,

package/src/graphql/resolvers/snapshots.ts

@@ -14,11 +14,11 @@ import DeprecatedSnapshot from "../../models/deprecatedSnapshot"
 import { redis } from "../../libs/redis"
 import CacheItem, { CacheType } from "../../cache/item"
 import { normalizeDOI } from "../../libs/doi/normalize"
-import { getDraftHead } from "../../datalad/dataset"
 import { downloadFiles } from "../../datalad/snapshots"
 import { snapshotValidation } from "./validation"
 import { advancedDatasetSearchConnection } from "./dataset-search"
 import { contributors } from "../../datalad/contributors"
+import { getDraftInfo } from "../../datalad/draft"
 
 export const snapshots = (obj) => {
   return datalad.getSnapshots(obj.id)
@@ -279,7 +279,7 @@ export const latestSnapshot = async (obj, _, context) => {
     // In the case where there are no real snapshots, return most recent commit as snapshot
     return await snapshot(
       obj,
-      { datasetId: obj.id, tag: (await getDraftHead(obj.id)).ref },
+      { datasetId: obj.id, tag: (await getDraftInfo(obj.id)).ref },
       context,
     )
   }

package/src/libs/authentication/jwt.ts

@@ -2,6 +2,7 @@ import passport from "passport"
 import refresh from "passport-oauth2-refresh"
 import jwt from "jsonwebtoken"
 import * as Sentry from "@sentry/node"
+import type { Request } from "express"
 import { decrypt } from "./crypto"
 import User from "../../models/user"
 import config from "../../config"
@@ -175,6 +176,19 @@ const refreshToken = async (jwt) => {
 // Shared options for Express response.cookie()
 const cookieOptions = { sameSite: "Lax" }
 
+// Obtain client IP address from request, considering possible proxies
+function getClientIp(req: Request): string | undefined {
+  const forwardedForHeader = req.headers["x-forwarded-for"]
+  if (forwardedForHeader) {
+    const ips = Array.isArray(forwardedForHeader)
+      ? forwardedForHeader
+      : forwardedForHeader.split(",")
+    const clientIp = ips[0].trim()
+    return clientIp
+  }
+  return req.socket.remoteAddress || undefined
+}
+
 // attach user obj to request based on jwt
 // if user does not exist, continue
 export const authenticate = (req, res, next) => {
@@ -192,7 +206,7 @@ export const authenticate = (req, res, next) => {
         if (user) {
           Sentry.setUser({
             id: user.id,
-            ip_address: req.headers["x-forwarded-for"] as string,
+            ip_address: getClientIp(req),
           })
         }
         Sentry.setContext("request_headers", {

package/src/sentry.ts

@@ -4,7 +4,8 @@ import config from "./config"
 import { version } from "./lerna.json"
 
 Sentry.init({
-  dsn: config.sentry.DSN,
+  dsn:
+    "https://baebfdeb279ddb0c39c876feefd464c8@o4507748938350592.ingest.us.sentry.io/4507750879461376",
   environment: config.sentry.ENVIRONMENT,
   integrations: [
     nodeProfilingIntegration(),