diff --git a/src/apps.js b/src/apps.js index 71f843486..3bb57bc32 100644 --- a/src/apps.js +++ b/src/apps.js @@ -450,18 +450,20 @@ function install(data, auditSource, callback) { }); } -function configure(appId, location, portBindings, accessRestriction, cert, key, memoryLimit, altDomain, auditSource, callback) { +function configure(appId, data, auditSource, callback) { assert.strictEqual(typeof appId, 'string'); - assert.strictEqual(typeof location, 'string'); - assert.strictEqual(typeof portBindings, 'object'); - assert.strictEqual(typeof accessRestriction, 'object'); - assert(cert === null || typeof cert === 'string'); - assert(key === null || typeof key === 'string'); - assert.strictEqual(typeof memoryLimit, 'number'); - assert(altDomain === null || typeof altDomain === 'string'); + assert(data && typeof data === 'object'); assert.strictEqual(typeof auditSource, 'object'); assert.strictEqual(typeof callback, 'function'); + var location = data.location.toLowerCase(), + portBindings = data.portBindings || null, + accessRestriction = data.accessRestriction || null, + cert = data.cert || null, + key = data.key || null, + memoryLimit = data.memoryLimit || 0, + altDomain = data.altDomain || null; + var error = validateHostname(location, config.fqdn()); if (error) return callback(error); diff --git a/src/routes/apps.js b/src/routes/apps.js index e6856c386..ad6e9eba6 100644 --- a/src/routes/apps.js +++ b/src/routes/apps.js @@ -149,7 +149,7 @@ function configureApp(req, res, next) { debug('Configuring app id:%s location:%s bindings:%j accessRestriction:%j memoryLimit:%s', req.params.id, data.location, data.portBindings, data.accessRestriction, data.memoryLimit); - apps.configure(req.params.id, data.location, data.portBindings || null, data.accessRestriction || null, data.cert || null, data.key || null, data.memoryLimit || 0, data.altDomain || null, auditSource(req), function (error) { + apps.configure(req.params.id, data, auditSource(req), function (error) { if (error && error.reason === AppsError.ALREADY_EXISTS) return next(new HttpError(409, error.message)); if (error && error.reason === AppsError.PORT_RESERVED) return next(new HttpError(409, 'Port ' + error.message + ' is reserved.')); if (error && error.reason === AppsError.PORT_CONFLICT) return next(new HttpError(409, 'Port ' + error.message + ' is already in use.'));