Add xFrameOptions to apps and routes

This commit is contained in:
Johannes Zellner
2016-07-14 15:16:05 +02:00
parent 37563ee8cb
commit 0d5d54d2d8
3 changed files with 14 additions and 2 deletions

View File

@@ -262,6 +262,7 @@ function getAppConfig(app) {
accessRestriction: app.accessRestriction,
portBindings: app.portBindings,
memoryLimit: app.memoryLimit,
xFrameOptions: app.xFrameOptions,
altDomain: app.altDomain
};
}
@@ -541,6 +542,12 @@ function configure(appId, data, auditSource, callback) {
values.memoryLimit = values.memoryLimit || app.memoryLimit || app.manifest.memoryLimit || constants.DEFAULT_MEMORY_LIMIT;
}
if ('xFrameOptions' in data) {
values.xFrameOptions = data.xFrameOptions;
error = validateXFrameOptions(values.xFrameOptions);
if (error) return callback(error);
}
// save cert to data/box/certs. TODO: move this to apptask when we have a real task queue
if ('cert' in data && 'key' in data) {
if (data.cert && data.key) {
@@ -782,6 +789,7 @@ function clone(appId, data, auditSource, callback) {
installationState: appdb.ISTATE_PENDING_CLONE,
memoryLimit: app.memoryLimit,
accessRestriction: app.accessRestriction,
xFrameOptions: app.xFrameOptions,
lastBackupId: backupId
};