{{ 'backups.deleteArchiveDialog.description' | tr }}
@@ -761,12 +761,12 @@
-
+
-
+
@@ -779,21 +779,21 @@
-
+
![]()
|
-
+ |
{{ archive.appConfig.fqdn }}
|
-
+ |
{{ archive.appConfig.manifest.title }}
|
-
+ |
{{ archive.creationTime | prettyDate }}
|
-
+
|
diff --git a/dashboard/public/views/backups.js b/dashboard/public/views/backups.js
index e9a4988a9..dcabf0f10 100644
--- a/dashboard/public/views/backups.js
+++ b/dashboard/public/views/backups.js
@@ -268,18 +268,18 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
}
};
- $scope.listArchives = {
+ $scope.archiveList = {
ready: false,
archives: [],
fetch: function () {
Client.listArchives(function (error, archives) {
if (error) Client.error(error);
- $scope.listArchives.archives = archives;
- $scope.listArchives.ready = true;
+ $scope.archiveList.archives = archives;
+ $scope.archiveList.ready = true;
// ensure we use the full api oprigin
- $scope.listArchives.archives.forEach(a => {
+ $scope.archiveList.archives.forEach(a => {
a.iconUrl = window.cloudronApiOrigin + a.iconUrl;
});
});
@@ -290,11 +290,13 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
busy: false,
error: {},
archive: null,
+ app: null, // just for simpler access . it's a fake app object!
ask: function (archive) {
$scope.archiveDelete.busy = false;
$scope.archiveDelete.error = {};
$scope.archiveDelete.archive = archive;
+ $scope.archiveDelete.app = archive.appConfig;
$('#archiveDeleteModal').modal('show');
},
@@ -305,18 +307,20 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
Client.deleteArchive($scope.archiveDelete.archive.id, function (error) {
$scope.archiveDelete.busy = false;
if (error) return console.error('Unable to delete archive.', error.statusCode, error.message);
- $scope.listArchives.fetch();
+ $scope.archiveList.fetch();
$('#archiveDeleteModal').modal('hide');
});
}
};
// keep in sync with app.js
- $scope.clone = {
+ $scope.archiveRestore = {
busy: false,
error: {},
archive: null,
+ app: null, // just for simpler access . it's a fake app object!
+
subdomain: '',
domain: null,
secondaryDomains: {},
@@ -325,6 +329,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
ports: {},
portsEnabled: {},
portInfo: {},
+ accessRestriction: { users: [], groups: [] },
init: function () {
Client.getDomains(function (error, domains) {
@@ -334,61 +339,69 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
},
show: function (archive) {
- $scope.clone.error = {};
- $scope.clone.archive = archive;
- const app = archive.appConfig;
+ $scope.archiveRestore.error = {};
+ $scope.archiveRestore.archive = archive;
const manifest = archive.appConfig.manifest;
- $scope.clone.domain = $scope.domains.find(function (d) { return app.domain === d.domain; }); // pre-select the app's domain
- $scope.clone.needsOverwrite = false;
- $scope.clone.overwriteDns = false;
+ $scope.archiveRestore.app = archive.appConfig;
+ $scope.archiveRestore.subdomain = $scope.archiveRestore.app.subdomain;
+ $scope.archiveRestore.domain = $scope.domains.find(function (d) { return $scope.archiveRestore.app.domain === d.domain; }); // try to pre-select the app's domain
- $scope.clone.secondaryDomains = {};
+ $scope.archiveRestore.needsOverwrite = false;
+ $scope.archiveRestore.overwriteDns = false;
+
+ $scope.archiveRestore.secondaryDomains = {};
var httpPorts = manifest.httpPorts || {};
for (var env2 in httpPorts) {
- $scope.clone.secondaryDomains[env2] = {
+ $scope.archiveRestore.secondaryDomains[env2] = {
subdomain: httpPorts[env2].defaultValue || '',
- domain: $scope.clone.domain
+ domain: $scope.archiveRestore.domain
};
}
- $scope.clone.portInfo = angular.extend({}, manifest.tcpPorts, manifest.udpPorts); // Portbinding map only for information
+ $scope.archiveRestore.portInfo = angular.extend({}, manifest.tcpPorts, manifest.udpPorts); // Portbinding map only for information
// set default ports
- for (var env in $scope.clone.portInfo) {
- $scope.clone.ports[env] = $scope.clone.portInfo[env].defaultValue || 0;
- $scope.clone.portsEnabled[env] = true;
+ for (var env in $scope.archiveRestore.portInfo) {
+ if ($scope.archiveRestore.app.portBindings[env]) { // was enabled in the app
+ $scope.archiveRestore.ports[env] = $scope.archiveRestore.app.portBindings[env].hostPort;
+ $scope.archiveRestore.portsEnabled[env] = true;
+ } else {
+ $scope.archiveRestore.ports[env] = $scope.archiveRestore.portInfo[env].defaultValue || 0;
+ $scope.archiveRestore.portsEnabled[env] = false;
+ }
}
- $('#appCloneModal').modal('show');
+ $('#restoreArchiveModal').modal('show');
},
submit: function () {
- $scope.clone.busy = true;
+ $scope.archiveRestore.busy = true;
+
+ const app = $scope.archiveRestore.archive.appConfig;
var secondaryDomains = {};
- for (var env2 in $scope.clone.secondaryDomains) {
+ for (var env2 in $scope.archiveRestore.secondaryDomains) {
secondaryDomains[env2] = {
- subdomain: $scope.clone.secondaryDomains[env2].subdomain,
- domain: $scope.clone.secondaryDomains[env2].domain.domain
+ subdomain: $scope.archiveRestore.secondaryDomains[env2].subdomain,
+ domain: $scope.archiveRestore.secondaryDomains[env2].domain.domain
};
}
// only use enabled ports
var finalPorts = {};
- for (var env in $scope.clone.ports) {
- if ($scope.clone.portsEnabled[env]) {
- finalPorts[env] = $scope.clone.ports[env];
+ for (var env in $scope.archiveRestore.ports) {
+ if ($scope.archiveRestore.portsEnabled[env]) {
+ finalPorts[env] = $scope.archiveRestore.ports[env];
}
}
var data = {
- subdomain: $scope.clone.subdomain,
- domain: $scope.clone.domain.domain,
+ subdomain: $scope.archiveRestore.subdomain,
+ domain: $scope.archiveRestore.domain.domain,
secondaryDomains: secondaryDomains,
ports: finalPorts,
- backupId: $scope.clone.archive.backupId,
- overwriteDns: $scope.clone.overwriteDns
+ overwriteDns: $scope.archiveRestore.overwriteDns,
};
var allDomains = [{ domain: data.domain, subdomain: data.subdomain }].concat(Object.keys(secondaryDomains).map(function (k) {
@@ -398,7 +411,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
};
}));
async.eachSeries(allDomains, function (domain, callback) {
- if ($scope.clone.overwriteDns) return callback();
+ if ($scope.archiveRestore.overwriteDns) return callback();
Client.checkDNSRecords(domain.domain, domain.subdomain, function (error, result) {
if (error) return callback(error);
@@ -410,8 +423,8 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
return callback({ type: 'provider', fqdn: fqdn, message: result.error.message });
}
if (result.needsOverwrite) {
- $scope.clone.needsOverwrite = true;
- $scope.clone.overwriteDns = true;
+ $scope.archiveRestore.needsOverwrite = true;
+ $scope.archiveRestore.overwriteDns = true;
return callback({ type: 'externally_exists', fqdn: fqdn, message: 'DNS Record already exists. Confirm that the domain is not in use for services external to Cloudron' });
}
@@ -420,29 +433,27 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
}, function (error) {
if (error) {
if (error.type) {
- $scope.clone.error.location = error;
- $scope.clone.busy = false;
+ $scope.archiveRestore.error.location = error;
+ $scope.archiveRestore.busy = false;
} else {
Client.error(error);
}
- $scope.clone.error.location = error;
- $scope.clone.busy = false;
+ $scope.archiveRestore.error.location = error;
+ $scope.archiveRestore.busy = false;
return;
}
- const app = $scope.clone.archive.appConfig;
-
- Client.installApp(app.manifest.id, app.manifest, data, function (error/*, clonedApp */) {
- $scope.clone.busy = false;
+ Client.unarchiveApp($scope.archiveRestore.archive.id, data, function (error/*, newApp */) {
+ $scope.archiveRestore.busy = false;
if (error) {
var errorMessage = error.message.toLowerCase();
if (errorMessage.indexOf('port') !== -1) {
- $scope.clone.error.port = error.message;
+ $scope.archiveRestore.error.port = error.message;
} else if (error.message.indexOf('location') !== -1 || error.message.indexOf('subdomain') !== -1) {
// TODO extract fqdn from error message, currently we just set it always to the main location
- $scope.clone.error.location = { type: 'internally_exists', fqdn: data.subdomain + '.' + data.domain, message: error.message };
+ $scope.archiveRestore.error.location = { type: 'internally_exists', fqdn: data.subdomain + '.' + data.domain, message: error.message };
$('#cloneLocationInput').focus();
} else {
Client.error(error);
@@ -450,7 +461,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
return;
}
- $('#appCloneModal').modal('hide');
+ $('#restoreArchiveModal').modal('hide');
$location.path('/apps');
});
@@ -1049,7 +1060,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
fetchBackups();
getBackupConfig();
- $scope.listArchives.fetch();
+ $scope.archiveList.fetch();
$scope.manualBackupApps = Client.getInstalledApps().filter(function (app) { return app.type !== APP_TYPES.LINK && !app.enableBackup; });
@@ -1057,7 +1068,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
$scope.createBackup.init();
$scope.cleanupBackups.init();
$scope.backupPolicy.init();
- $scope.clone.init();
+ $scope.archiveRestore.init();
getBackupTasks();
getCleanupTasks();
diff --git a/src/archives.js b/src/archives.js
index 6ea87e295..1d6b4eda0 100644
--- a/src/archives.js
+++ b/src/archives.js
@@ -6,15 +6,18 @@ exports = module.exports = {
add,
list,
listBackupIds,
- del
+ del,
+ unarchive
};
-const assert = require('assert'),
+const apps = require('./apps.js'),
+ assert = require('assert'),
BoxError = require('./boxerror.js'),
database = require('./database.js'),
eventlog = require('./eventlog.js'),
safe = require('safetydance'),
- uuid = require('uuid');
+ uuid = require('uuid'),
+ _ = require('underscore');
const ARCHIVE_FIELDS = [ 'id', 'backupId', 'creationTime', 'appConfigJson', '(icon IS NOT NULL) AS hasIcon', '(appStoreIcon IS NOT NULL) AS hasAppStoreIcon' ];
@@ -104,3 +107,32 @@ async function del(archive, auditSource) {
await eventlog.add(eventlog.ACTION_ARCHIVES_DEL, auditSource, { id: archive.id, backupId: archive.backupId });
}
+
+async function unarchive(archive, data, auditSource) {
+ assert.strictEqual(typeof archive, 'object');
+ assert.strictEqual(typeof data, 'object');
+ assert(auditSource && typeof auditSource === 'object');
+
+ const appConfig = archive.appConfig;
+
+ const dolly = _.pick(appConfig, 'appStoreId', 'manifest', 'memoryLimit', 'cpuQuota', 'crontab', 'reverseProxyConfig', 'env', 'servicesConfig',
+ 'tags', 'label', 'enableMailbox', 'mailboxDisplayName', 'mailboxName', 'mailboxDomain', 'enableInbox', 'inboxName', 'inboxDomain', 'devices',
+ 'enableTurn', 'enableRedis', 'mounts', 'enableBackup', 'enableAutomaticUpdate', 'accessRestriction', 'operators', 'sso');
+
+ // intentionally not filled up: redirectDomain, aliasDomains, mailboxDomain
+ const newAppData = Object.assign(dolly, {
+ // from request
+ subdomain: data.subdomain,
+ domain: data.domain,
+ secondaryDomains: data.secondaryDomains || {},
+ ports: data.ports || null,
+ overwriteDns: 'overwriteDns' in data ? data.overwriteDns : false,
+ mailboxDomain: data.domain, // archive's mailboxDomain may not exist
+
+ // from the archive
+ icon: archive.icon,
+ backupId: archive.backupId,
+ });
+
+ return await apps.install(newAppData, auditSource);
+}
diff --git a/src/routes/apps.js b/src/routes/apps.js
index b13cb3300..6365489cc 100644
--- a/src/routes/apps.js
+++ b/src/routes/apps.js
@@ -185,8 +185,6 @@ async function install(req, res, next) {
if ('enableTurn' in data && typeof data.enableTurn !== 'boolean') return next(new HttpError(400, 'enableTurn must be boolean'));
- if ('backupId' in data && typeof data.backupId !== 'string') return next(new HttpError(400, 'backupId must be non-empty string'));
-
let [error, result] = await safe(appstore.downloadManifest(data.appStoreId, data.manifest));
if (error) return next(BoxError.toHttpError(error));
diff --git a/src/routes/archives.js b/src/routes/archives.js
index 74322aa4c..83be05ef3 100644
--- a/src/routes/archives.js
+++ b/src/routes/archives.js
@@ -7,6 +7,7 @@ exports = module.exports = {
get,
getIcon,
del,
+ unarchive
};
const assert = require('assert'),
@@ -67,3 +68,28 @@ async function del(req, res, next) {
next(new HttpSuccess(204));
}
+
+async function unarchive(req, res, next) {
+ assert.strictEqual(typeof req.params.id, 'string');
+ assert.strictEqual(typeof req.resource, 'object');
+ assert.strictEqual(typeof req.body, 'object');
+
+ const data = req.body;
+
+ // required
+ if (typeof data.subdomain !== 'string') return next(new HttpError(400, 'subdomain is required'));
+ if (typeof data.domain !== 'string') return next(new HttpError(400, 'domain is required'));
+
+ // optional
+ if (('ports' in data) && typeof data.ports !== 'object') return next(new HttpError(400, 'ports must be an object'));
+
+ if ('secondaryDomains' in data) {
+ if (!data.secondaryDomains || typeof data.secondaryDomains !== 'object') return next(new HttpError(400, 'secondaryDomains must be an object'));
+ if (Object.keys(data.secondaryDomains).some(function (key) { return typeof data.secondaryDomains[key].domain !== 'string' || typeof data.secondaryDomains[key].subdomain !== 'string'; })) return next(new HttpError(400, 'secondaryDomain object must contain domain and subdomain strings'));
+ }
+
+ const [error, result] = await safe(archives.unarchive(req.resource, req.body, AuditSource.fromRequest(req)));
+ if (error) return next(BoxError.toHttpError(error));
+
+ next(new HttpSuccess(202, { id: result.id, taskId: result.taskId }));
+}
diff --git a/src/server.js b/src/server.js
index 3ffac2474..32c7fe346 100644
--- a/src/server.js
+++ b/src/server.js
@@ -162,10 +162,11 @@ async function initializeExpressSync() {
router.post('/api/v1/backups/:backupId', json, token, authorizeAdmin, routes.backups.update);
// app archive routes
- router.get ('/api/v1/archives', token, authorizeAdmin, routes.archives.list);
- router.get ('/api/v1/archives/:id', token, authorizeAdmin, routes.archives.load, routes.archives.get);
- router.del ('/api/v1/archives/:id', token, authorizeAdmin, routes.archives.load, routes.archives.del);
- router.get ('/api/v1/archives/:id/icon', routes.archives.load, routes.archives.getIcon);
+ router.get ('/api/v1/archives', token, authorizeAdmin, routes.archives.list);
+ router.get ('/api/v1/archives/:id', token, authorizeAdmin, routes.archives.load, routes.archives.get);
+ router.del ('/api/v1/archives/:id', token, authorizeAdmin, routes.archives.load, routes.archives.del);
+ router.post('/api/v1/archives/:id/unarchive', json, token, authorizeAdmin, routes.archives.load, routes.archives.unarchive);
+ router.get ('/api/v1/archives/:id/icon', routes.archives.load, routes.archives.getIcon);
// working off the user behind the provided token
router.get ('/api/v1/profile', token, authorizeUser, routes.profile.get);