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

docker.js and services.js: async'ify

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-08-25 19:41:46 -07:00
parent 1cc11fece8
commit 42774eac8c
24 changed files with 1618 additions and 2130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ldap.js
View File

@@ -18,7 +18,7 @@ const addonConfigs = require('./addonconfigs.js'),
ldap = require('ldapjs'),
mail = require('./mail.js'),
safe = require('safetydance'),
services = require('./services.js'),
settings = require('./settings.js'),
users = require('./users.js');
var gServer = null;
@@ -550,14 +550,13 @@ async function authenticateSftp(req, res, next) {
res.end();
}
function loadSftpConfig(req, res, next) {
services.getServiceConfig('sftp', function (error, serviceConfig) {
if (error) return next(new ldap.OperationsError(error.toString()));
async function loadSftpConfig(req, res, next) {
const [error, servicesConfig] = await settings.getServicesConfig();
if (error) return next(new ldap.OperationsError(error.toString()));
req.requireAdmin = serviceConfig.requireAdmin;
next();
});
const sftpConfig = servicesConfig['sftp'] || {};
req.requireAdmin = sftpConfig.requireAdmin;
next();
}
async function userSearchSftp(req, res, next) {