jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

settings: async'ify

Browse Source 
* directory config
* unstable app config
This commit is contained in:
Girish Ramakrishnan
2021-08-18 15:40:28 -07:00
parent 2d1f4ff281
commit 200018a022
6 changed files with 64 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/appstore.js
View File

@@ -464,27 +464,26 @@ function createTicket(info, auditSource, callback) {
function getApps(callback) { function getApps(callback) {
assert.strictEqual(typeof callback, 'function'); assert.strictEqual(typeof callback, 'function');
getCloudronToken(function (error, token) { getCloudronToken(async function (error, token) {
if (error) return callback(error); if (error) return callback(error);
settings.getUnstableAppsConfig(function (error, unstable) { const [settingsError, unstable] = await settings.getUnstableAppsConfig();
if (error) return callback(error); if (settingsError) return callback(settingsError);
const url = `${settings.apiServerOrigin()}/api/v1/apps`; const url = `${settings.apiServerOrigin()}/api/v1/apps`;
superagent.get(url).query({ accessToken: token, boxVersion: constants.VERSION, unstable: unstable }).timeout(30 * 1000).end(function (error, result) { superagent.get(url).query({ accessToken: token, boxVersion: constants.VERSION, unstable: unstable }).timeout(30 * 1000).end(function (error, result) {
if (error && !error.response) return callback(new BoxError(BoxError.NETWORK_ERROR, error.message)); if (error && !error.response) return callback(new BoxError(BoxError.NETWORK_ERROR, error.message));
if (result.statusCode === 403 || result.statusCode === 401) return callback(new BoxError(BoxError.INVALID_CREDENTIALS)); if (result.statusCode === 403 || result.statusCode === 401) return callback(new BoxError(BoxError.INVALID_CREDENTIALS));
if (result.statusCode === 422) return callback(new BoxError(BoxError.LICENSE_ERROR, result.body.message)); if (result.statusCode === 422) return callback(new BoxError(BoxError.LICENSE_ERROR, result.body.message));
if (result.statusCode !== 200) return callback(new BoxError(BoxError.EXTERNAL_ERROR, util.format('App listing failed. %s %j', result.status, result.body))); if (result.statusCode !== 200) return callback(new BoxError(BoxError.EXTERNAL_ERROR, util.format('App listing failed. %s %j', result.status, result.body)));
if (!result.body.apps) return callback(new BoxError(BoxError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text))); if (!result.body.apps) return callback(new BoxError(BoxError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
settings.getAppstoreListingConfig(function (error, listingConfig) { settings.getAppstoreListingConfig(function (error, listingConfig) {
if (error) return callback(error); if (error) return callback(error);
const filteredApps = result.body.apps.filter(app => isAppAllowed(app.id, listingConfig)); const filteredApps = result.body.apps.filter(app => isAppAllowed(app.id, listingConfig));
callback(null, filteredApps); callback(null, filteredApps);
});
}); });
}); });
}); });

11
src/routes/profile.js
View File

@@ -23,16 +23,15 @@ const assert = require('assert'),
users = require('../users.js'), users = require('../users.js'),
_ = require('underscore'); _ = require('underscore');
function authorize(req, res, next) { async function authorize(req, res, next) {
assert.strictEqual(typeof req.user, 'object'); assert.strictEqual(typeof req.user, 'object');
settings.getDirectoryConfig(function (error, directoryConfig) { const [error, directoryConfig] = await settings.getDirectoryConfig();
if (error) return next(BoxError.toHttpError(error)); if (error) return next(BoxError.toHttpError(error));
if (directoryConfig.lockUserProfiles) return next(new HttpError(403, 'admin has disallowed users from editing profiles')); if (directoryConfig.lockUserProfiles) return next(new HttpError(403, 'admin has disallowed users from editing profiles'));
next(); next();
});
} }
async function get(req, res, next) { async function get(req, res, next) {

37
src/routes/settings.js
View File

@@ -15,6 +15,7 @@ const assert = require('assert'),
externalLdap = require('../externalldap.js'), externalLdap = require('../externalldap.js'),
HttpError = require('connect-lastmile').HttpError, HttpError = require('connect-lastmile').HttpError,
HttpSuccess = require('connect-lastmile').HttpSuccess, HttpSuccess = require('connect-lastmile').HttpSuccess,
safe = require('safetydance'),
settings = require('../settings.js'); settings = require('../settings.js');
function getAutoupdatePattern(req, res, next) { function getAutoupdatePattern(req, res, next) {
@@ -165,24 +166,22 @@ function setDynamicDnsConfig(req, res, next) {
}); });
} }
function getUnstableAppsConfig(req, res, next) { async function getUnstableAppsConfig(req, res, next) {
settings.getUnstableAppsConfig(function (error, enabled) { const [error, enabled] = await safe(settings.getUnstableAppsConfig());
if (error) return next(BoxError.toHttpError(error)); if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, { enabled: enabled })); next(new HttpSuccess(200, { enabled }));
});
} }
function setUnstableAppsConfig(req, res, next) { async function setUnstableAppsConfig(req, res, next) {
assert.strictEqual(typeof req.body, 'object'); assert.strictEqual(typeof req.body, 'object');
if (typeof req.body.enabled !== 'boolean') return next(new HttpError(400, 'enabled boolean is required')); if (typeof req.body.enabled !== 'boolean') return next(new HttpError(400, 'enabled boolean is required'));
settings.setUnstableAppsConfig(req.body.enabled, function (error) { const [error] = await safe(settings.setUnstableAppsConfig(req.body.enabled));
if (error) return next(BoxError.toHttpError(error)); if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, {})); next(new HttpSuccess(200, {}));
});
} }
function getRegistryConfig(req, res, next) { function getRegistryConfig(req, res, next) {
@@ -211,25 +210,23 @@ function setRegistryConfig(req, res, next) {
}); });
} }
function getDirectoryConfig(req, res, next) { async function getDirectoryConfig(req, res, next) {
settings.getDirectoryConfig(function (error, directoryConfig) { const [error, directoryConfig] = await settings.getDirectoryConfig();
if (error) return next(BoxError.toHttpError(error)); if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, directoryConfig)); next(new HttpSuccess(200, directoryConfig));
});
} }
function setDirectoryConfig(req, res, next) { async function setDirectoryConfig(req, res, next) {
assert.strictEqual(typeof req.body, 'object'); assert.strictEqual(typeof req.body, 'object');
if (typeof req.body.lockUserProfiles !== 'boolean') return next(new HttpError(400, 'lockUserProfiles is required')); if (typeof req.body.lockUserProfiles !== 'boolean') return next(new HttpError(400, 'lockUserProfiles is required'));
if (typeof req.body.mandatory2FA !== 'boolean') return next(new HttpError(400, 'mandatory2FA is required')); if (typeof req.body.mandatory2FA !== 'boolean') return next(new HttpError(400, 'mandatory2FA is required'));
settings.setDirectoryConfig(req.body, function (error) { const [error] = await safe(settings.setDirectoryConfig(req.body));
if (error) return next(BoxError.toHttpError(error)); if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, {})); next(new HttpSuccess(200, {}));
});
} }
function getSysinfoConfig(req, res, next) { function getSysinfoConfig(req, res, next) {

58
src/settings.js
View File

@@ -118,7 +118,8 @@ exports = module.exports = {
CLOUDRON_AVATAR_KEY: 'cloudron_avatar', CLOUDRON_AVATAR_KEY: 'cloudron_avatar',
// testing // testing
_setApiServerOrigin: setApiServerOrigin _setApiServerOrigin: setApiServerOrigin,
_clear: clear
}; };
const assert = require('assert'), const assert = require('assert'),
@@ -222,7 +223,7 @@ async function get(key) {
assert.strictEqual(typeof key, 'string'); assert.strictEqual(typeof key, 'string');
const result = await database.query(`SELECT ${SETTINGS_FIELDS} FROM settings WHERE name = ?`, [ key ]); const result = await database.query(`SELECT ${SETTINGS_FIELDS} FROM settings WHERE name = ?`, [ key ]);
if (result.length === 0) return gDefaults[key]; if (result.length === 0) return null; // can't return the default value here because we might need to massage/json parse the result
return result[0].value; return result[0].value;
} }
@@ -381,29 +382,17 @@ function setDynamicDnsConfig(enabled, callback) {
}); });
} }
function getUnstableAppsConfig(callback) { async function getUnstableAppsConfig() {
assert.strictEqual(typeof callback, 'function'); const result = await get(exports.UNSTABLE_APPS_KEY);
if (result === null) gDefaults[exports.UNSTABLE_APPS_KEY];
settingsdb.get(exports.UNSTABLE_APPS_KEY, function (error, enabled) { return !!result; // db holds string values only
if (error && error.reason === BoxError.NOT_FOUND) return callback(null, gDefaults[exports.UNSTABLE_APPS_KEY]);
if (error) return callback(error);
callback(null, !!enabled); // settingsdb holds string values only
});
} }
function setUnstableAppsConfig(enabled, callback) { async function setUnstableAppsConfig(enabled) {
assert.strictEqual(typeof enabled, 'boolean'); assert.strictEqual(typeof enabled, 'boolean');
assert.strictEqual(typeof callback, 'function');
// settingsdb takes string values only await set(exports.UNSTABLE_APPS_KEY, enabled ? 'enabled' : ''); // db holds string values only
settingsdb.set(exports.UNSTABLE_APPS_KEY, enabled ? 'enabled' : '', function (error) { notifyChange(exports.UNSTABLE_APPS_KEY, enabled);
if (error) return callback(error);
notifyChange(exports.UNSTABLE_APPS_KEY, enabled);
return callback(null);
});
} }
function getBackupConfig(callback) { function getBackupConfig(callback) {
@@ -646,30 +635,19 @@ function setSysinfoConfig(sysinfoConfig, callback) {
}); });
} }
function getDirectoryConfig(callback) { async function getDirectoryConfig() {
assert.strictEqual(typeof callback, 'function'); const value = await get(exports.DIRECTORY_CONFIG_KEY);
if (value === null) return gDefaults[exports.DIRECTORY_CONFIG_KEY];
settingsdb.get(exports.DIRECTORY_CONFIG_KEY, function (error, value) { return JSON.parse(value);
if (error && error.reason === BoxError.NOT_FOUND) return callback(null, gDefaults[exports.DIRECTORY_CONFIG_KEY]);
if (error) return callback(error);
callback(null, JSON.parse(value));
});
} }
function setDirectoryConfig(directoryConfig, callback) { async function setDirectoryConfig(directoryConfig) {
assert.strictEqual(typeof directoryConfig, 'object'); assert.strictEqual(typeof directoryConfig, 'object');
assert.strictEqual(typeof callback, 'function');
if (isDemo()) return callback(new BoxError(BoxError.BAD_FIELD, 'Not allowed in demo mode')); if (isDemo()) throw new BoxError(BoxError.BAD_FIELD, 'Not allowed in demo mode');
settingsdb.set(exports.DIRECTORY_CONFIG_KEY, JSON.stringify(directoryConfig), function (error) { await set(exports.DIRECTORY_CONFIG_KEY, JSON.stringify(directoryConfig));
if (error) return callback(error); notifyChange(exports.DIRECTORY_CONFIG_KEY, directoryConfig);
notifyChange(exports.DIRECTORY_CONFIG_KEY, directoryConfig);
callback(null);
});
} }
function getAppstoreListingConfig(callback) { function getAppstoreListingConfig(callback) {

22
src/test/settings-test.js
View File

@@ -84,24 +84,16 @@ describe('Settings', function () {
}); });
}); });
it('can get default unstable apps setting', function (done) { it('can get default unstable apps setting', async function () {
settings.getUnstableAppsConfig(function (error, enabled) { const enabled = await settings.getUnstableAppsConfig();
expect(error).to.be(null); expect(enabled).to.be(true);
expect(enabled).to.be(true);
done();
});
}); });
it('can set unstable apps setting', function (done) { it('can set unstable apps setting', async function () {
settings.setUnstableAppsConfig(false, function (error) { await settings.setUnstableAppsConfig(false);
expect(error).to.be(null);
settings.getUnstableAppsConfig(function (error, enabled) { const enabled = await settings.getUnstableAppsConfig();
expect(error).to.be(null); expect(enabled).to.be(false);
expect(enabled).to.be(false);
done();
});
});
}); });
it('can get all values', async function () { it('can get all values', async function () {

7
src/users.js
View File

@@ -92,7 +92,6 @@ const CRYPTO_DIGEST = 'sha1'; // used to be the default in node 4.1.1 cannot cha
const pbkdf2Async = util.promisify(crypto.pbkdf2); const pbkdf2Async = util.promisify(crypto.pbkdf2);
const randomBytesAsync = util.promisify(crypto.randomBytes); const randomBytesAsync = util.promisify(crypto.randomBytes);
const getDirectoryConfigAsync = util.promisify(settings.getDirectoryConfig);
function postProcess(result) { function postProcess(result) {
assert.strictEqual(typeof result, 'object'); assert.strictEqual(typeof result, 'object');
@@ -660,7 +659,7 @@ async function createInvite(user, auditSource) {
const resetToken = hat(256), resetTokenCreationTime = new Date(); const resetToken = hat(256), resetTokenCreationTime = new Date();
const directoryConfig = await getDirectoryConfigAsync(); const directoryConfig = await settings.getDirectoryConfig();
await update(user, { resetToken, resetTokenCreationTime }, auditSource); await update(user, { resetToken, resetTokenCreationTime }, auditSource);
@@ -676,7 +675,7 @@ async function sendInvite(user, options) {
if (user.source) throw new BoxError(BoxError.CONFLICT, 'User is from an external directory'); if (user.source) throw new BoxError(BoxError.CONFLICT, 'User is from an external directory');
if (!user.resetToken) throw new BoxError(BoxError.CONFLICT, 'Must generate resetToken to send invitation'); if (!user.resetToken) throw new BoxError(BoxError.CONFLICT, 'Must generate resetToken to send invitation');
const directoryConfig = await getDirectoryConfigAsync(); const directoryConfig = await settings.getDirectoryConfig();
mailer.sendInvite(user, options.invitor || null, inviteLink(user, directoryConfig)); mailer.sendInvite(user, options.invitor || null, inviteLink(user, directoryConfig));
} }
@@ -686,7 +685,7 @@ async function setupAccount(user, data, auditSource) {
assert.strictEqual(typeof data, 'object'); assert.strictEqual(typeof data, 'object');
assert(auditSource && typeof auditSource === 'object'); assert(auditSource && typeof auditSource === 'object');
const directoryConfig = await getDirectoryConfigAsync(); const directoryConfig = await settings.getDirectoryConfig();
if (directoryConfig.lockUserProfiles) return; if (directoryConfig.lockUserProfiles) return;
await update(user, _.pick(data, 'username', 'displayName'), auditSource); await update(user, _.pick(data, 'username', 'displayName'), auditSource);