Whole refactor

This commit is contained in:
Jesús Ángel González 2018-03-22 17:10:33 +01:00
parent 0bd24c19c3
commit facffb3821
3 changed files with 179 additions and 177 deletions

View File

@ -117,23 +117,23 @@ module.exports = (server, options) => {
const validateData = payload => {
// Validate user
if(!userRegEx.test(req.payload.user)){
if(!userRegEx.test(payload.user)){
return reply({ statusCode: 400, error: 10001, message: 'Invalid user field' }).code(400);
}
// Validate password
if(!passRegEx.test(req.payload.password)){
if(!passRegEx.test(payload.password)){
return reply({ statusCode: 400, error: 10002, message: 'Invalid password field' }).code(400);
}
// Validate url
if(!urlRegEx.test(req.payload.url) && !urlRegExIP.test(req.payload.url)){
if(!urlRegEx.test(payload.url) && !urlRegExIP.test(payload.url)){
return reply({ statusCode: 400, error: 10003, message: 'Invalid url field' }).code(400);
}
// Validate port
const validatePort = parseInt(req.payload.port);
if(!portRegEx.test(req.payload.port) || validatePort <= 0 || validatePort >= 99999) {
const validatePort = parseInt(payload.port);
if(!portRegEx.test(payload.port) || validatePort <= 0 || validatePort >= 99999) {
return reply({ statusCode: 400, error: 10004, message: 'Invalid port field' }).code(400);
}

View File

@ -30,49 +30,44 @@ module.exports = (server, options) => {
const checkStoredAPI = (req, reply) => {
const checkStoredAPI = async (req, reply) => {
try{
if(!protectedRoute(req)) return reply(genericErrorBuilder(401,7,'Session expired.')).code(401);
// Get config from elasticsearch
getConfig(req.payload, (wapi_config) => {
const wapi_config = await getConfig(req.payload)
if (wapi_config.error_code > 1) {
// Can not connect to elasticsearch
reply({
'statusCode': 200,
'error': '1',
'data': 'no_elasticsearch'
});
return;
return reply({ statusCode: 200, error: '1', data: 'no_elasticsearch' });
} else if (wapi_config.error_code > 0) {
// Credentials not found
reply({
'statusCode': 400,
'error': '2',
'data': 'no_credentials'
});
return;
return reply({ statusCode: 400, error: '2', data: 'no_credentials' });
}
needle('get', `${wapi_config.url}:${wapi_config.port}/version`, {}, {
let response = await needle('get', `${wapi_config.url}:${wapi_config.port}/version`, {}, {
username : wapi_config.user,
password : wapi_config.password,
rejectUnauthorized: !wapi_config.insecure
})
.then((response) => {
if (parseInt(response.body.error) === 0 && response.body.data) {
needle('get', `${wapi_config.url}:${wapi_config.port}/cluster/status`, {}, { // Checking the cluster status
// Checking the cluster status
response = await needle('get', `${wapi_config.url}:${wapi_config.port}/cluster/status`, {}, {
username : wapi_config.user,
password : wapi_config.password,
rejectUnauthorized: !wapi_config.insecure
})
.then((response) => {
if (!response.body.error) {
if (response.body.data.enabled === 'yes') { // If cluster mode is active
needle('get', `${wapi_config.url}:${wapi_config.port}/cluster/node`, {}, {
// If cluster mode is active
if (response.body.data.enabled === 'yes') {
response = await needle('get', `${wapi_config.url}:${wapi_config.port}/cluster/node`, {}, {
username : wapi_config.user,
password : wapi_config.password,
rejectUnauthorized: !wapi_config.insecure
})
.then((response) => {
if (!response.body.error) {
let managerName = wapi_config.cluster_info.manager;
delete wapi_config.cluster_info;
@ -81,60 +76,57 @@ module.exports = (server, options) => {
wapi_config.cluster_info.manager = managerName;
wapi_config.cluster_info.node = response.body.data.node;
wapi_config.cluster_info.cluster = response.body.data.cluster;
reply({
'statusCode': 200,
'data': wapi_config
});
return reply({ statusCode: 200, data: wapi_config });
} else if (response.body.error){
reply({
'statusCode': 500,
'error': 7,
'message': response.body.message
return reply({
statusCode: 500,
error : 7,
message : response.body.message
}).code(500);
}
});
}
else { // Cluster mode is not active
} else { // Cluster mode is not active
let managerName = wapi_config.cluster_info.manager;
delete wapi_config.cluster_info;
wapi_config.cluster_info = {};
wapi_config.cluster_info.status = 'disabled';
wapi_config.cluster_info.cluster = 'Disabled';
wapi_config.cluster_info.manager = managerName;
reply({
'statusCode': 200,
'data': wapi_config
});
return reply({ statusCode: 200, data: wapi_config });
}
} else {
reply({
'statusCode': 500,
'error': 5,
'message': 'Error occurred'
return reply({
statusCode: 500,
error : 5,
message : 'Error occurred'
}).code(500);
}
});
} else {
reply({
'statusCode': 500,
'error': 7,
'message': response.body
return reply({
statusCode: 500,
error : 7,
message : response.body
});
}
})
.catch(error => {
} catch(error){
if(error.code === 'ECONNREFUSED'){
wapi_config.password = "You shall not pass";
wapi_config.apiIsDown = true;
reply({
'statusCode': 200,
'data': wapi_config
});
return reply({ statusCode: 200, data: wapi_config });
} else {
server.log([blueWazuh, 'wazuh-api', 'error'], error);
return reply({
statusCode: 500,
error : 8,
message : error.message || error
});
server.log([blueWazuh, 'wazuh-api', 'error'], error.message || error);
}
}
});
});
};
const validateCheckApiParams = payload => {
@ -244,7 +236,7 @@ module.exports = (server, options) => {
}
};
const getPciRequirement = (req, reply) => {
const getPciRequirement = async (req, reply) => {
try {
if(!protectedRoute(req)) return reply(genericErrorBuilder(401,7,'Session expired.')).code(401);
@ -255,7 +247,8 @@ module.exports = (server, options) => {
if(!req.headers.id) {
return reply(pciRequirements);
}
getConfig(req.headers.id, wapi_config => {
let wapi_config = await getConfig(req.headers.id);
if (wapi_config.error_code > 1) {
// Can not connect to elasticsearch
return reply({ statusCode: 200, error: '1', data: 'no_elasticsearch' });
@ -264,12 +257,12 @@ module.exports = (server, options) => {
return reply({ statusCode: 400, error: '2', data: 'no_credentials' });
}
needle('get', `${wapi_config.url}:${wapi_config.port}/rules/pci`, {}, {
const response = await needle('get', `${wapi_config.url}:${wapi_config.port}/rules/pci`, {}, {
username : wapi_config.user,
password : wapi_config.password,
rejectUnauthorized: !wapi_config.insecure
})
.then(response => {
if(response.body.data && response.body.data.items){
let PCIobject = {};
for(let item of response.body.data.items){
@ -280,11 +273,6 @@ module.exports = (server, options) => {
return reply({ statusCode: 400, error: '9998', data: 'An error occurred trying to parse PCI DSS requirements' });
}
})
.catch(error => {
reply({ statusCode: 400, error: '9997', data: 'An error occurred trying to obtain PCI DSS requirements from Wazuh API' })
});
});
} else {
if (typeof pciRequirements[req.params.requirement] !== 'undefined'){
pci_description = pciRequirements[req.params.requirement];
@ -298,6 +286,7 @@ module.exports = (server, options) => {
});
}
} catch (error) {
return reply({
statusCode: 400,
error : '9999',
@ -309,7 +298,7 @@ module.exports = (server, options) => {
const errorControl = (error, response) => {
if (error) {
return ({
return {
isError: true,
body: {
statusCode : 500,
@ -317,9 +306,9 @@ module.exports = (server, options) => {
message : 'Request error',
errorMessage: error.message || error
}
});
};
} else if (!error && response.body.error) {
return ({
return {
isError: true,
body: {
statusCode: 500,
@ -327,14 +316,16 @@ module.exports = (server, options) => {
message : 'Wazuh api error',
errorData : response.body
}
});
};
}
return ({ isError: false });
};
const makeRequest = (method, path, data, id, reply) => {
getConfig(id, wapi_config => {
const makeRequest = async (method, path, data, id, reply) => {
try {
const wapi_config = await getConfig(id);
if (wapi_config.error_code > 1) {
//Can not connect to elasticsearch
return reply({
@ -350,7 +341,6 @@ module.exports = (server, options) => {
error : 1,
message : 'Credentials does not exists'
}).code(404);
}
if (!data) {
@ -366,59 +356,67 @@ module.exports = (server, options) => {
rejectUnauthorized: !wapi_config.insecure
};
let fullUrl = getPath(wapi_config) + path;
const fullUrl = getPath(wapi_config) + path;
const response = await needle(method, fullUrl, data, options);
const errorData = errorControl(false, response);
needle.request(method, fullUrl, data, options, (error, response) => {
let errorData = errorControl(error, response);
if (errorData.isError) {
reply(errorData.body).code(500);
} else {
reply(response.body);
return reply(errorData.body).code(500);
}
return reply(response.body);
} catch (error) {
return reply({
statusCode: 500,
data : error.message || error
}).code(500);
}
});
});
};
const requestApi = (req, reply) => {
if(!protectedRoute(req)) return reply(genericErrorBuilder(401,7,'Session expired.')).code(401);
if (!req.payload.method) {
reply({
'statusCode': 400,
'error': 3,
'message': 'Missing param: Method'
return reply({
statusCode: 400,
error : 3,
message : 'Missing param: Method'
}).code(400);
} else if (!req.payload.path) {
reply({
'statusCode': 400,
'error': 4,
'message': 'Missing param: Path'
return reply({
statusCode: 400,
error : 4,
message : 'Missing param: Path'
}).code(400);
} else {
makeRequest(req.payload.method, req.payload.path, req.payload.body, req.payload.id, reply);
return makeRequest(req.payload.method, req.payload.path, req.payload.body, req.payload.id, reply);
}
};
const getApiSettings = (req, reply) => {
const getApiSettings = async (req, reply) => {
try{
if(!protectedRoute(req)) return reply(genericErrorBuilder(401,7,'Session expired.')).code(401);
getConfig(req.payload.id, (wapi_config) => {
const wapi_config = await getConfig(req.payload.id);
if (wapi_config.error_code > 1) {
//Can not connect to elasticsearch
throw new Error('no_elasticsearch');
} else if (wapi_config.error_code > 0) {
throw new Error('no_credentials');
}
return reply({
'statusCode': 200,
'error': '1',
'data': 'no_elasticsearch'
statusCode: 200,
data : ''
});
} else if (wapi_config.error_code > 0) {
//Credentials not found
} catch(error){
return reply({
'statusCode': 200,
'error': '1',
'data': 'no_credentials'
statusCode: 200,
error : '1',
data : error.message || error
});
}
});
};
// Fetch agent status and insert it directly on demand

View File

@ -52,7 +52,7 @@ module.exports = (server, options) => {
}
};
const getConfig = async (id, callback) => {
const getConfig = async id => {
try {
const data = await elasticRequest.callWithInternalUser('get', {
index: '.wazuh',
@ -60,7 +60,7 @@ module.exports = (server, options) => {
id
});
return callback({
return {
user : data._source.api_user,
password : Buffer.from(data._source.api_password, 'base64').toString("ascii"),
url : data._source.url,
@ -68,7 +68,7 @@ module.exports = (server, options) => {
insecure : data._source.insecure,
cluster_info: data._source.cluster_info,
extensions : data._source.extensions
});
};
} catch (error){
return callback({ error: 'no elasticsearch', error_code: 2 });
@ -281,13 +281,17 @@ module.exports = (server, options) => {
let allowedIndices = [];
for(const rol of roles){
console.log('-----------------------------')
console.log(`rol ${rol}`);
const myIndices = xpacksec.hits.hits.filter(item => item._id === `role-${rol}` && item._source && item._source.indices);
console.log(myIndices)
for(const set of myIndices){
const filteredIndices = set._source.indices.filter(item => item.privileges.includes('read'));
const filteredIndices = set._source.indices.filter(item => item.privileges.includes('all') || item.privileges.includes('read'));
for(const index of filteredIndices){
allowedIndices.push(...index.names);
}
}
console.log('-----------------------------')
}
return allowedIndices;
@ -313,7 +317,7 @@ module.exports = (server, options) => {
const isXpackEnabled = typeof xpack === 'string' && xpack.includes('x-pack');
const isSuperUser = isXpackEnabled && req.auth.credentials.roles.includes('superuser');
const allowedIndices = isXpackEnabled && !isSuperUser ? await getAllowedIndices(req.auth.credentials.roles) : false;
console.log(req.auth.credentials,allowedIndices)
const data = await elasticRequest
.callWithInternalUser('search', {
index: '.kibana',