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

Fix LDAP not accessible via scheduler containers

Browse Source 
Check the IP address against scheduler containers as well
This commit is contained in:
Girish Ramakrishnan
2019-06-27 16:11:17 -07:00
parent e3d288ef7d
commit 22d731f06d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps.js
+9 -1
View File
@@ -486,6 +486,7 @@ function getByContainerId(containerId, callback) {
});
}
// returns the app associated with this IP (app or scheduler)
function getByIpAddress(ip, callback) {
assert.strictEqual(typeof ip, 'string');
assert.strictEqual(typeof callback, 'function');
@@ -493,7 +494,14 @@ function getByIpAddress(ip, callback) {
docker.getContainerIdByIp(ip, function (error, containerId) {
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
getByContainerId(containerId, callback);
docker.inspect(containerId, function (error, result) {
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
const appId = safe.query(result, 'Config.Labels.appId', null);
if (!appId) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
get(appId, callback);
});
});
}