Make base path configurable and notify upon startup when used

SaeedCode · Mar 27, 2020 · 7d16b33 · 7d16b33
1 parent 0da0bd9
commit 7d16b33
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/config.schema.yml b/config.schema.yml
@@ -1,6 +1,8 @@
 server:
   port:
     type: number
+  basePath:
+    type: string
 application:
   domain:
     type: string

diff --git a/config/default.yml b/config/default.yml
@@ -1,5 +1,6 @@
 server:
   port: 3000
+  basePath: ''
 application:
   domain: juice-sh.op
   name: 'OWASP Juice Shop'

diff --git a/routes/profileImageFileUpload.js b/routes/profileImageFileUpload.js
@@ -30,8 +30,8 @@ module.exports = function fileUpload () {
         }).catch(error => {
           next(error)
         })
-        res.location((process.env.BASE_PATH || '') + '/profile')
-        res.redirect((process.env.BASE_PATH || '') + '/profile')
+        res.location(process.env.BASE_PATH + '/profile')
+        res.redirect(process.env.BASE_PATH + '/profile')
       } else {
         next(new Error('Blocked illegal activity by ' + req.connection.remoteAddress))
       }

diff --git a/routes/profileImageUrlUpload.js b/routes/profileImageUrlUpload.js
@@ -33,7 +33,7 @@ module.exports = function profileImageUrlUpload () {
         next(new Error('Blocked illegal activity by ' + req.connection.remoteAddress))
       }
     }
-    res.location((process.env.BASE_PATH || '') + '/profile')
-    res.redirect((process.env.BASE_PATH || '') + '/profile')
+    res.location(process.env.BASE_PATH + '/profile')
+    res.redirect(process.env.BASE_PATH + '/profile')
   }
 }
diff --git a/routes/updateUserProfile.js b/routes/updateUserProfile.js
@@ -23,7 +23,7 @@ module.exports = function updateUserProfile () {
     } else {
       next(new Error('Blocked illegal activity by ' + req.connection.remoteAddress))
     }
-    res.location((process.env.BASE_PATH || '') + '/profile')
-    res.redirect((process.env.BASE_PATH || '') + '/profile')
+    res.location(process.env.BASE_PATH + '/profile')
+    res.redirect(process.env.BASE_PATH + '/profile')
   }
 }
diff --git a/server.js b/server.js
@@ -549,9 +549,13 @@ exports.start = async function (readyCallback) {
   await models.sequelize.sync({ force: true })
   await datacreator()
   const port = process.env.PORT || config.get('server.port')
+  process.env.BASE_PATH = process.env.BASE_PATH || config.get('server.basePath')
 
   server.listen(port, () => {
-    logger.info(colors.cyan(`Server listening on port ${port}`))
+    logger.info(colors.cyan(`Server listening on port ${colors.bold(port)}`))
+    if (process.env.BASE_PATH !== '') {
+      logger.info(colors.cyan(`Server using proxy base path ${colors.bold(process.env.BASE_PATH)} for redirects`))
+    }
     require('./lib/startup/registerWebsocketEvents')(server)
     if (readyCallback) {
       readyCallback()