Simplify configuration file

(URL- and file-based images are handled depending on http-prefix)

app.js

@@ -1,6 +1,5 @@
 'use strict'
 
 var server = require('./server')
-const config = require('config')
 
-server.start(config)
+server.start()

config/bodgeit.yml

@@ -1,8 +1,8 @@
 application:
   domain: thebodgeitstore.com
   name: "The BodgeIt Store"
-  logoReplacementUrl: "http://www.userlogos.org/files/logos/inductiveload/Google%20Code.png"
-  faviconReplacementUrl: "https://www.shareicon.net/download/2016/08/13/808555_media.ico"
+  logo: "http://www.userlogos.org/files/logos/inductiveload/Google%20Code.png"
+  favicon: "https://www.shareicon.net/download/2016/08/13/808555_media.ico"
   showChallengeSolvedNotifications: true
   theme: "paper"
 products:

config/ctf.yml

@@ -1,5 +1,5 @@
 application:
-  logoReplacementUrl: "https://raw.githubusercontent.com/bkimminich/juice-shop-ctf/develop/images/JuiceShopCTF_Logo.png"
-  faviconReplacementUrl: "https://raw.githubusercontent.com/bkimminich/juice-shop-ctf/develop/images/favicon_ctf.ico"
+  logo: "JuiceShopCTF_Logo.png"
+  favicon: "favicon_ctf.ico"
   showCtfFlagsInNotifications: true
 

config/default.yml

@@ -3,8 +3,8 @@ server:
 application:
   domain: juice-sh.op
   name: "OWASP Juice Shop"
-  logoReplacementUrl: ~
-  faviconReplacementUrl: ~
+  logo: "JuiceShop_Logo.png"
+  favicon: "favicon_v2.ico"
   numberOfRandomFakeUsers: 0
   showChallengeSolvedNotifications: true
   showCtfFlagsInNotifications: false

config/sickshop.yml

@@ -1,7 +1,7 @@
 application:
   domain: sick-sh.op
   name: "Sick-Shop"
-  logoReplacementUrl: "https://openclipart.org/image/300px/svg_to_png/250927/1465228117.png"
+  logo: "https://openclipart.org/image/300px/svg_to_png/250927/1465228117.png"
   numberOfRandomFakeUsers: 50
   showChallengeSolvedNotifications: false
   theme: "cosmo"

data/datacreator.js

@@ -434,9 +434,8 @@ module.exports = function () {
       var image = product.image || 'undefined.png'
       if (utils.startsWith(image, 'http')) {
         var imageUrl = image
-        image = image.substring(image.lastIndexOf('/') + 1)
-        var imageFilePath = 'app/public/images/products/' + image
-        utils.downloadToFile(imageUrl, imageFilePath)
+        image = decodeURIComponent(image.substring(image.lastIndexOf('/') + 1))
+        utils.downloadToFile(imageUrl, 'app/public/images/products/' + image)
       }
       models.Product.create({
         name: name,

server.js

@@ -47,6 +47,7 @@ var server = require('http').Server(app)
 var io = require('socket.io')(server)
 var replace = require('replace')
 var appConfiguration = require('./routes/appConfiguration')
+const config = require('config')
 
 global.io = io
 errorhandler.title = 'Juice Shop (Express ' + utils.version('express') + ')'
@@ -78,7 +79,16 @@ app.use(function (req, res, next) {
 })
 
 /* Favicon */
-app.use(favicon(path.join(__dirname, 'app/public/favicon_v2.ico')))
+var icon = 'favicon_v2.ico'
+if (config.get('application.favicon')) {
+  icon = config.get('application.favicon')
+  if (utils.startsWith(icon, 'http')) {
+    var iconPath = icon
+    icon = decodeURIComponent(icon.substring(icon.lastIndexOf('/') + 1))
+    utils.downloadToFile(iconPath, 'app/public/' + icon)
+  }
+}
+app.use(favicon(path.join(__dirname, 'app/public/' + icon)))
 
 /* Checks for solved challenges */
 app.use('/public/images/tracking', verify.accessControlChallenges())
@@ -179,7 +189,7 @@ io.on('connection', function (socket) {
   })
 })
 
-exports.start = function (config, readyCallback) {
+exports.start = function (readyCallback) {
   if (!this.server) {
     models.sequelize.drop()
     models.sequelize.sync().success(function () {
@@ -191,15 +201,19 @@ exports.start = function (config, readyCallback) {
         }
       })
     })
-    if (config.get('application.logoReplacementUrl')) {
-      utils.downloadToFile(config.get('application.logoReplacementUrl'), 'app/public/images/JuiceShop_Logo.png')
-    }
-    if (config.get('application.faviconReplacementUrl')) {
-      utils.downloadToFile(config.get('application.faviconReplacementUrl'), 'app/public/favicon_v2.ico')
+    if (config.get('application.logo')) {
+      var logo = config.get('application.logo')
+      if (utils.startsWith(logo, 'http')) {
+        var logoPath = logo
+        logo = decodeURIComponent(logo.substring(logo.lastIndexOf('/') + 1))
+        utils.downloadToFile(logoPath, 'app/public/images/' + logo)
+      }
+      var logoImageTag = '<img class="navbar-brand navbar-logo" src="/public/images/' + logo + '">'
+      replace({ regex: /<img class="navbar-brand navbar-logo"(.*?)>/, replacement: logoImageTag, paths: ['app/index.html'], recursive: false, silent: true })
     }
     if (config.get('application.theme')) {
       var themeCss = 'bower_components/bootswatch/' + config.get('application.theme') + '/bootstrap.min.css'
-      replace({ regex: 'bower_components/bootswatch/.*/bootstrap.min.css', replacement: themeCss, paths: ['app/index.html'], recursive: false, silent: true })
+      replace({ regex: /bower_components\/bootswatch\/.*\/bootstrap\.min\.css/, replacement: themeCss, paths: ['app/index.html'], recursive: false, silent: true })
     }
   }
 }

test/e2eTests.js

@@ -3,9 +3,8 @@
 var spawn = require('cross-spawn')
 var colors = require('colors/safe')
 var server = require('./../server.js')
-var config = require('config')
 
-server.start(config, function () {
+server.start(function () {
   var protractor = spawn('protractor', [ 'protractor.conf.js' ])
   function logToConsole (data) {
     console.log(String(data))

test/serverTests.js

@@ -3,9 +3,8 @@
 var spawn = require('cross-spawn')
 var colors = require('colors/safe')
 var server = require('./../server.js')
-var config = require('config')
 
-server.start(config, function () {
+server.start(function () {
   var jasmineNode = spawn('jasmine-node', [ 'test/server', '--junitreport', '--output', 'build/reports/server_results' ])
   function logToConsole (data) {
     console.log(String(data))