Merge pull request #1171 from FZJ-INM1-BDA/hotfix_vipRoutes

added vip routes

deploy/app.js

@@ -7,20 +7,12 @@ const crypto = require('crypto')
 const cookieParser = require('cookie-parser')
 const bkwdMdl = require('./bkwdCompat')()
 
-const deprecated = (_req, res) => res.status(410).end()
-
 const LOCAL_CDN_FLAG = !!process.env.PRECOMPUTED_SERVER
 
 if (process.env.NODE_ENV !== 'production') {
   app.use(require('cors')())
 }
 
-
-const DOC_PUBLIC_PATH = process.env.NODE_ENV === 'production'
-  ? path.join(__dirname, 'docs')
-  : path.join(__dirname, '..', 'site')
-
-app.use('/docs', express.static(DOC_PUBLIC_PATH))
 app.use('/quickstart', require('./quickstart'))
 
 const hash = string => crypto.createHash('sha256').update(string).digest('hex')
@@ -28,7 +20,7 @@ const hash = string => crypto.createHash('sha256').update(string).digest('hex')
 app.use((req, _, next) => {
   if (/main\.bundle\.js$/.test(req.originalUrl)){
     const xForwardedFor = req.headers['x-forwarded-for']
-    const ip = req.connection.remoteAddress
+    const ip = req.socket.remoteAddress
     console.log({
       type: 'visitorLog',
       method: 'main.bundle.js',
@@ -107,8 +99,15 @@ const _ = (async () => {
   /**
    * saneUrl end points
    */
-  const { router: saneUrlRouter } = require('./saneUrl')
+  const { router: saneUrlRouter, vipRoutes } = require('./saneUrl')
   app.use('/saneUrl', saneUrlRouter)
+  app.use('/go', saneUrlRouter)
+
+  const HOST_PATHNAME = process.env.HOST_PATHNAME || ''
+  
+  for (const route of vipRoutes) {
+    app.get(route, (req, res) => res.redirect(`${HOST_PATHNAME}/go/${route}`))
+  }
 })()
 
 const PUBLIC_PATH = process.env.NODE_ENV === 'production'
@@ -230,13 +229,7 @@ const jsonMiddleware = (req, res, next) => {
  */
 const pluginRouter = require('./plugins')
 
-app.use('/atlases', deprecated)
-app.use('/templates', deprecated)
-app.use('/nehubaConfig', deprecated)
-app.use('/datasets', deprecated)
-app.use('/regionalFeatures', deprecated)
 app.use('/plugins', jsonMiddleware, pluginRouter)
-app.use('/preview', deprecated)
 
 const catchError = require('./catchError')
 app.use(catchError)

deploy/package.json

@@ -30,7 +30,7 @@
     "rate-limit-redis": "^2.1.0",
     "redis": "^3.1.2",
     "request": "^2.88.2",
-    "showdown": "^1.9.1",
+    "showdown": "^2.0.0",
     "soswrap": "^0.0.2",
     "through2": "^3.0.1"
   },
@@ -40,7 +40,7 @@
     "cookie": "^0.4.0",
     "cors": "^2.8.5",
     "dotenv": "^6.2.0",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.1",
     "nock": "^12.0.3",
     "sinon": "^8.0.2"
   }

deploy/saneUrl/index.js

@@ -118,7 +118,10 @@ const ready = async () => {
   return await store.healthCheck()
 }
 
+const vipRoutes = ["human", "monkey", "rat", "mouse"]
+
 module.exports = {
   router,
   ready,
+  vipRoutes,
 }

docs/releases/v2.6.5.md

@@ -4,7 +4,9 @@
 
 - Re-enabled autoradiographs for receptor datasets
 - Added how-to-cite as a part of quick tour (#1085)
+- Added VIP routes
 
 ## Bugfix
 
 - saneUrl store now properly uses redis
+- updated several packages to fix potential security vulnerabilities

package.json

@@ -30,7 +30,7 @@
     "eslint": "^7.32.0",
     "jasmine-core": "~3.8.0",
     "jasmine-marbles": "^0.8.3",
-    "karma": "~6.3.0",
+    "karma": "^6.3.16",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
@@ -58,7 +58,7 @@
     "postcss": "^8.3.6",
     "raw-loader": "^4.0.2",
     "rxjs": "~6.6.0",
-    "showdown": "^1.9.1",
+    "showdown": "^2.0.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.11.4"
   }