rodrigo/genieacs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add linting rules

Browse Source
This commit is contained in:
Zaid Abdulla committed 2018-12-27 01:21:16 -08:00
1 parent 75a5a42296
commit c702003c32
43 files changed
+705 -576
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/api-functions.js
+51 -41
View File
@@ -6,7 +6,6 @@ const url = require("url");
const config = require("./config");
const db = require("./db");
const expression = require("../common/expression");
const mongodbFunctions = require("./mongodb-functions");
function filterToMongoQuery(filter, negate = false, res = {}) {
@@ -25,7 +24,7 @@ function filterToMongoQuery(filter, negate = false, res = {}) {
filterToMongoQuery(filter[1], !negate, res);
} else if (op === "=") {
const param = filter[1][1];
let p = (res[param] = res[param] || {});
const p = (res[param] = res[param] || {});
if (negate) p["$ne"] = filter[2];
else p["$eq"] = filter[2];
} else if (op === "<>") {
@@ -69,15 +68,15 @@ function filterToMongoQuery(filter, negate = false, res = {}) {
function deleteResource(resource, id) {
return new Promise((resolve, reject) => {
let resourceUrl =
const resourceUrl =
resource === "virtualParameters" ? "virtual_parameters" : resource;
let options = url.parse(
const options = url.parse(
`${config.server.nbi}${resourceUrl}/${encodeURIComponent(id)}`
);
options.method = "DELETE";
let _http = options.protocol === "https:" ? https : http;
const _http = options.protocol === "https:" ? https : http;
_http
.request(options, res => {
@@ -91,13 +90,13 @@ function deleteResource(resource, id) {
}
function postTask(task, connectionRequest, callback) {
let options = url.parse(
const options = url.parse(
`${config.server.nbi}devices/${encodeURIComponent(task.device)}/tasks${
connectionRequest ? "?connection_request" : ""
}`
);
options.method = "POST";
let _http = options.protocol === "https:" ? https : http;
const _http = options.protocol === "https:" ? https : http;
_http
.request(options, res => {
@@ -114,14 +113,14 @@ function postTask(task, connectionRequest, callback) {
});
res.on("end", () => {
let buf = new Buffer(bytes);
const buf = Buffer.allocUnsafe(bytes);
let o = 0;
for (let c of chunks) {
for (const c of chunks) {
c.copy(buf, o, 0, c.length);
o += c.length;
}
try {
let t = JSON.parse(buf);
const t = JSON.parse(buf);
let connectionRequestStatus;
if (connectionRequest) {
connectionRequestStatus = "OK";
@@ -144,16 +143,16 @@ function postTask(task, connectionRequest, callback) {
function postTasks(deviceId, tasks) {
return new Promise((resolve, reject) => {
let connectionRequestStatus;
let promises = [];
for (let [idx, task] of tasks.entries()) {
const promises = [];
for (const [idx, task] of tasks.entries()) {
task.device = deviceId;
promises.push(
new Promise((res, rej) => {
let conReq = idx === tasks.length - 1;
const conReq = idx === tasks.length - 1;
delete task._id;
task.expiry = 5;
postTask(task, conReq, (err, t, crs) => {
if (err) return rej(err);
if (err) return void rej(err);
if (conReq) connectionRequestStatus = crs;
res({ _id: t._id, status: "pending" });
});
@@ -163,14 +162,15 @@ function postTasks(deviceId, tasks) {
Promise.all(promises)
.then(statuses => {
if (connectionRequestStatus !== "OK")
return resolve({
if (connectionRequestStatus !== "OK") {
return void resolve({
connectionRequest: connectionRequestStatus,
tasks: statuses
});
}
let promises2 = [];
for (let s of statuses) {
const promises2 = [];
for (const s of statuses) {
promises2.push(db.query("tasks", ["=", ["PARAM", "_id"], s._id]));
promises2.push(
db.query("faults", [
@@ -183,7 +183,7 @@ function postTasks(deviceId, tasks) {
Promise.all(promises2)
.then(res => {
for (let [i, r] of statuses.entries()) {
for (const [i, r] of statuses.entries()) {
if (res[i * 2].length === 0) {
r.status = "done";
} else if (res[i * 2 + 1].length === 1) {
@@ -216,7 +216,7 @@ function updateTags(deviceId, tags) {
);
if (onOff) options.method = "POST";
else options.method = "DELETE";
let _http = options.protocol === "https:" ? https : http;
const _http = options.protocol === "https:" ? https : http;
_http
.request(options, res => {
@@ -237,17 +237,19 @@ function ping(host) {
`${config.server.nbi}ping/${encodeURIComponent(host)}`
);
let _http = options.protocol === "https:" ? https : http;
const _http = options.protocol === "https:" ? https : http;
_http
.request(options, res => {
if (res.statusCode === 404) {
res.resume();
return resolve({});
return void resolve({});
}
if (res.statusCode !== 200) {
res.resume();
return reject(new Error(`Unexpected status code ${res.statusCode}`));
return void reject(
new Error(`Unexpected status code ${res.statusCode}`)
);
}
const chunks = [];
@@ -258,18 +260,19 @@ function ping(host) {
});
res.on("end", () => {
let buf = new Buffer(bytes);
const buf = Buffer.allocUnsafe(bytes);
let o = 0;
for (let c of chunks) {
for (const c of chunks) {
c.copy(buf, o, 0, c.length);
o += c.length;
}
let m = buf
const m = buf
.toString()
.match(
/(\d) packets transmitted, (\d) received, ([\d.%]+) packet loss[^]*([\d.]+)\/([\d.]+)\/([\d.]+)\/([\d.]+)/
);
if (!m) return reject(new Error("Could not parse ping response"));
if (!m)
return void reject(new Error("Could not parse ping response"));
resolve({
packetsTransmitted: +m[1],
@@ -288,15 +291,15 @@ function ping(host) {
function putResource(resource, id, data) {
return new Promise((resolve, reject) => {
let resourceUrl =
const resourceUrl =
resource === "virtualParameters" ? "virtual_parameters" : resource;
let options = url.parse(
const options = url.parse(
`${config.server.nbi}${resourceUrl}/${encodeURIComponent(id)}`
);
options.method = "PUT";
let _http = options.protocol === "https:" ? https : http;
const _http = options.protocol === "https:" ? https : http;
if (resource === "presets") data = mongodbFunctions.preProcessPreset(data);
@@ -306,7 +309,7 @@ function putResource(resource, id, data) {
if (resource === "virtualParameters")
data = mongodbFunctions.preProcessVirtualParameters(data);
let body = typeof data !== "string" ? JSON.stringify(data) : data;
const body = typeof data !== "string" ? JSON.stringify(data) : data;
_http
.request(options, res => {
const chunks = [];
@@ -317,14 +320,16 @@ function putResource(resource, id, data) {
});
res.on("end", () => {
if (res.statusCode === 200) return resolve();
else if (res.statusCode !== 400)
return reject(
if (res.statusCode === 200) {
return void resolve();
} else if (res.statusCode !== 400) {
return void reject(
new Error(`Unexpected status code ${res.statusCode}`)
);
let buf = new Buffer(bytes);
}
const buf = Buffer.allocUnsafe(bytes);
let o = 0;
for (let c of chunks) {
for (const c of chunks) {
c.copy(buf, o, 0, c.length);
o += c.length;
}
@@ -337,17 +342,22 @@ function putResource(resource, id, data) {
function putFile(id, metadata, fileStream) {
return new Promise((resolve, reject) => {
let options = url.parse(
const options = url.parse(
`${config.server.nbi}files/${encodeURIComponent(id)}`
);
options.method = "PUT";
options.headers = Object.assign({}, metadata);
let _http = options.protocol === "https:" ? https : http;
let req = _http.request(options, res => {
const _http = options.protocol === "https:" ? https : http;
const req = _http.request(options, res => {
res.resume();
if (res.statusCode === 201) return resolve();
else return reject(new Error(`Unexpected status code ${res.statusCode}`));
if (res.statusCode === 201) {
return void resolve();
} else {
return void reject(
new Error(`Unexpected status code ${res.statusCode}`)
);
}
});
fileStream.pipe(req);
});
server/api.js
+66 -62
View File
@@ -2,7 +2,6 @@
const zlib = require("zlib");
const Router = require("koa-router");
const config = require("./config");
const db = require("./db");
const apiFunctions = require("./api-functions");
const expression = require("../common/expression");
@@ -38,7 +37,7 @@ const resources = {
tasks: 0
};
for (let [resource, flags] of Object.entries(resources)) {
for (const [resource, flags] of Object.entries(resources)) {
router.head(`/${resource}`, async (ctx, next) => {
let filter = true;
if (ctx.request.query.filter)
@@ -52,17 +51,18 @@ for (let [resource, flags] of Object.entries(resources)) {
if (!ctx.state.authorizer.hasAccess(resource, 1)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
// Exclude temporary tasks and faults
if (resource === "tasks" || resource === "faults")
if (resource === "tasks" || resource === "faults") {
filter = expression.and(filter, [
"NOT",
["<", ["PARAM", "expiry"], Date.now() + 60000]
]);
}
let count = await db.count(resource, filter);
const count = await db.count(resource, filter);
ctx.set("X-Total-Count", count);
ctx.body = "";
@@ -72,7 +72,7 @@ for (let [resource, flags] of Object.entries(resources)) {
});
router.get(`/${resource}`, async (ctx, next) => {
let options = {};
const options = {};
let filter = true;
if (ctx.request.query.filter)
filter = expression.parse(ctx.request.query.filter);
@@ -80,10 +80,11 @@ for (let [resource, flags] of Object.entries(resources)) {
if (ctx.request.query.skip) options.skip = +ctx.request.query.skip;
if (ctx.request.query.sort)
options.sort = JSON.parse(ctx.request.query.sort);
if (ctx.request.query.projection)
if (ctx.request.query.projection) {
options.projection = ctx.request.query.projection
.split(",")
.reduce((obj, k) => Object.assign(obj, { [k]: 1 }), {});
}
const log = {
message: `Query ${resource}`,
@@ -97,15 +98,16 @@ for (let [resource, flags] of Object.entries(resources)) {
if (!ctx.state.authorizer.hasAccess(resource, 2)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
// Exclude temporary tasks and faults
if (resource === "tasks" || resource === "faults")
if (resource === "tasks" || resource === "faults") {
filter = expression.and(filter, [
"NOT",
["<", ["PARAM", "expiry"], Date.now() + 60000]
]);
}
let stream;
switch (ctx.acceptsEncodings("gzip", "deflate", "identity")) {
@@ -139,7 +141,7 @@ for (let [resource, flags] of Object.entries(resources)) {
// CSV download
router.get(`/${resource}.csv`, async (ctx, next) => {
let options = { projection: {} };
const options = { projection: {} };
let filter = true;
if (ctx.request.query.filter)
filter = expression.parse(ctx.request.query.filter);
@@ -159,28 +161,25 @@ for (let [resource, flags] of Object.entries(resources)) {
if (!ctx.state.authorizer.hasAccess(resource, 2)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
const columns = JSON.parse(ctx.request.query.columns);
const now = Date.now();
for (let [k, v] of Object.entries(columns)) {
const e = expression.evaluate(
expression.parse(v),
null,
now
);
for (const [k, v] of Object.entries(columns)) {
const e = expression.evaluate(expression.parse(v), null, now);
columns[k] = e;
for (let p of expression.extractParams(e)) options.projection[p] = 1;
for (const p of expression.extractParams(e)) options.projection[p] = 1;
}
// Exclude temporary tasks and faults
if (resource === "tasks" || resource === "faults")
if (resource === "tasks" || resource === "faults") {
filter = expression.and(filter, [
"NOT",
["<", ["PARAM", "expiry"], Date.now() + 60000]
]);
}
let stream;
switch (ctx.acceptsEncodings("gzip", "deflate", "identity")) {
@@ -209,24 +208,26 @@ for (let [resource, flags] of Object.entries(resources)) {
Object.keys(columns).map(k => `"${k.replace(/"/, '""')}"`) + "\n"
);
await db.query(resource, filter, options, obj => {
let arr = Object.values(columns).map(exp => {
let v = expression.evaluate(exp, obj, null, e => {
if (Array.isArray(e))
const arr = Object.values(columns).map(exp => {
const v = expression.evaluate(exp, obj, null, e => {
if (Array.isArray(e)) {
if (e[0] === "PARAM") {
if (resource === "devices") {
if (e[1] === "Tags") {
let tags = [];
for (let p in obj)
const tags = [];
for (const p in obj)
if (p.startsWith("Tags.")) tags.push(p.slice(5));
return tags.join(", ");
}
}
} else if (e[0] === "FUNC") {
if (e[1] === "DATE_STRING")
if (e[1] === "DATE_STRING") {
if (e[2] && !Array.isArray(e[2]))
return new Date(e[2]).toISOString();
}
}
}
return e;
});
@@ -249,15 +250,15 @@ for (let [resource, flags] of Object.entries(resources)) {
filter: `${RESOURCE_IDS[resource]} = "${ctx.params.id}"`
};
let filter = ["=", ["PARAM", RESOURCE_IDS[resource]], ctx.params.id];
const filter = ["=", ["PARAM", RESOURCE_IDS[resource]], ctx.params.id];
if (!ctx.state.authorizer.hasAccess(resource, 2)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
let res = await db.query(resource, filter);
const res = await db.query(resource, filter);
if (!res.length) return next();
if (!res.length) return void next();
logger.accessInfo(log);
ctx.body = "";
@@ -270,22 +271,22 @@ for (let [resource, flags] of Object.entries(resources)) {
filter: `${RESOURCE_IDS[resource]} = "${ctx.params.id}"`
};
let filter = ["=", ["PARAM", RESOURCE_IDS[resource]], ctx.params.id];
const filter = ["=", ["PARAM", RESOURCE_IDS[resource]], ctx.params.id];
if (!ctx.state.authorizer.hasAccess(resource, 2)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
let res = await db.query(resource, filter);
const res = await db.query(resource, filter);
if (!res.length) return next();
if (!res.length) return void next();
logger.accessInfo(log);
ctx.body = res[0];
});
// TODO add PUT, PATCH routes
if (flags & RESOURCE_DELETE)
if (flags & RESOURCE_DELETE) {
router.delete(`/${resource}/:id`, async (ctx, next) => {
const log = {
message: `Delete ${resource}`,
@@ -294,18 +295,18 @@ for (let [resource, flags] of Object.entries(resources)) {
};
const authorizer = ctx.state.authorizer;
let filter = ["=", ["PARAM", RESOURCE_IDS[resource]], ctx.params.id];
const filter = ["=", ["PARAM", RESOURCE_IDS[resource]], ctx.params.id];
if (!authorizer.hasAccess(resource, 2)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
let res = await db.query(resource, filter);
if (!res.length) return next();
const res = await db.query(resource, filter);
if (!res.length) return void next();
const validate = authorizer.getValidator(resource, res[0]);
if (!validate("delete")) {
logUnauthorizedWarning(log);
return (ctx.status = 403);
return void (ctx.status = 403);
}
await apiFunctions.deleteResource(resource, ctx.params.id);
@@ -314,8 +315,9 @@ for (let [resource, flags] of Object.entries(resources)) {
ctx.body = "";
});
}
if (flags & RESOURCE_PUT)
if (flags & RESOURCE_PUT) {
router.put(`/${resource}/:id`, async (ctx, next) => {
const id = ctx.params.id;
@@ -328,30 +330,31 @@ for (let [resource, flags] of Object.entries(resources)) {
const authorizer = ctx.state.authorizer;
if (!authorizer.hasAccess(resource, 3)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
let obj = ctx.request.body;
const obj = ctx.request.body;
const validate = authorizer.getValidator(resource, obj);
if (!validate("put")) {
logUnauthorizedWarning(log);
return (ctx.status = 403);
return void (ctx.status = 403);
}
let err = await apiFunctions.putResource(resource, id, obj);
const err = await apiFunctions.putResource(resource, id, obj);
if (err) {
log.message += " failed";
logger.accessWarn(log);
ctx.body = err;
return (ctx.status = 400);
return void (ctx.status = 400);
}
logger.accessInfo(log);
ctx.body = "";
});
}
}
router.put("/files/:id", async (ctx, next) => {
@@ -367,10 +370,10 @@ router.put("/files/:id", async (ctx, next) => {
const authorizer = ctx.state.authorizer;
if (!authorizer.hasAccess(resource, 3)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
let metadata = {
const metadata = {
fileType: ctx.request.headers["metadata.filetype"] || "",
oui: ctx.request.headers["metadata.oui"] || "",
productClass: ctx.request.headers["metadata.productclass"] || "",
@@ -380,16 +383,16 @@ router.put("/files/:id", async (ctx, next) => {
const validate = authorizer.getValidator(resource, metadata);
if (!validate("put")) {
logUnauthorizedWarning(log);
return (ctx.status = 403);
return void (ctx.status = 403);
}
let err = await apiFunctions.putFile(id, metadata, ctx.req);
const err = await apiFunctions.putFile(id, metadata, ctx.req);
if (err) {
log.message += " failed";
logger.accessWarn(log);
ctx.body = err;
return (ctx.status = 400);
return void (ctx.status = 400);
}
log.metadata = metadata;
@@ -406,22 +409,23 @@ router.post("/devices/:id/tasks", async (ctx, next) => {
};
const authorizer = ctx.state.authorizer;
let filter = ["=", ["PARAM", "DeviceID.ID"], ctx.params.id];
const filter = ["=", ["PARAM", "DeviceID.ID"], ctx.params.id];
if (!authorizer.hasAccess("devices", 2)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
let devices = await db.query("devices", filter);
if (!devices.length) return next();
const devices = await db.query("devices", filter);
if (!devices.length) return void next();
const validate = authorizer.getValidator("devices", devices[0]);
for (let t of ctx.request.body)
for (const t of ctx.request.body) {
if (!validate("task", t)) {
logUnauthorizedWarning(log);
return (ctx.status = 403);
return void (ctx.status = 403);
}
}
let res = await apiFunctions.postTasks(ctx.params.id, ctx.request.body);
const res = await apiFunctions.postTasks(ctx.params.id, ctx.request.body);
log.tasks = res.tasks.map(t => t._id).join(",");
@@ -440,18 +444,18 @@ router.post("/devices/:id/tags", async (ctx, next) => {
};
const authorizer = ctx.state.authorizer;
let filter = ["=", ["PARAM", "DeviceID.ID"], ctx.params.id];
const filter = ["=", ["PARAM", "DeviceID.ID"], ctx.params.id];
if (!authorizer.hasAccess("devices", 2)) {
logUnauthorizedWarning(log);
return next();
return void next();
}
let res = await db.query("devices", filter);
if (!res.length) return next();
const res = await db.query("devices", filter);
if (!res.length) return void next();
const validate = authorizer.getValidator("devices", res[0]);
if (!validate("tags", ctx.request.body)) {
logUnauthorizedWarning(log);
return (ctx.status = 403);
return void (ctx.status = 403);
}
await apiFunctions.updateTags(ctx.params.id, ctx.request.body);
server/config.js
+1 -3
View File
@@ -3,7 +3,7 @@
const fs = require("fs");
const configFile = JSON.parse(fs.readFileSync("./config.json"));
let config;
const config = loadConfig(configFile);
function getClientConfig() {
return Object.assign({}, config, {
@@ -33,6 +33,4 @@ function loadConfig(conf, root = {}) {
return root;
}
config = loadConfig(configFile);
module.exports = Object.assign({}, config, { getClientConfig });
server/db.js
+10 -6
View File
@@ -22,18 +22,19 @@ const RESOURCE_COLLECTION = {
};
function getClient() {
if (!_clientPromise)
if (!_clientPromise) {
_clientPromise = new Promise((resolve, reject) => {
const CONNECTION_URL = config.server.mongodbConnectionUrl;
mongodb.MongoClient.connect(
CONNECTION_URL,
{ useNewUrlParser: true },
(err, client) => {
if (err) return reject(err);
if (err) return void reject(err);
resolve(client);
}
);
});
}
return _clientPromise;
}
@@ -61,12 +62,13 @@ function query(resource, filter, options, callback) {
.db(RESOURCE_DB[resource])
.collection(RESOURCE_COLLECTION[resource] || resource);
const cursor = collection.find(q);
if (options.projection)
if (options.projection) {
cursor.project(
resource === "devices"
? mongodbFunctions.processDeviceProjection(options.projection)
: options.projection
);
}
if (options.skip) cursor.skip(options.skip);
if (options.limit) cursor.limit(options.limit);
@@ -83,7 +85,7 @@ function query(resource, filter, options, callback) {
cursor.sort(s);
}
if (!callback)
if (!callback) {
cursor.toArray((err, docs) => {
if (err) return reject(err);
if (resource === "devices")
@@ -98,7 +100,7 @@ function query(resource, filter, options, callback) {
docs = docs.map(d => mongodbFunctions.flattenFile(d));
return resolve(docs);
});
else
} else {
cursor.forEach(
doc => {
if (resource === "devices")
@@ -118,6 +120,7 @@ function query(resource, filter, options, callback) {
else resolve();
}
);
}
});
});
}
@@ -152,10 +155,11 @@ function count(resource, filter) {
}
function disconnect() {
if (_clientPromise)
if (_clientPromise) {
_clientPromise.then(client => {
client.close();
});
}
}
exports.query = query;
server/logger.js
+4 -3
View File
@@ -153,9 +153,10 @@ function formatSimple(details, systemd) {
flatten(details);
let remote = "";
if (details.remoteAddress)
if (details.remoteAddress) {
if (details.user) remote = `${details.user}@${details.remoteAddress}: `;
else remote = `${details.remoteAddress}: `;
}
const keys = Object.keys(details);
const skip = {
@@ -168,8 +169,8 @@ function formatSimple(details, systemd) {
let meta = "";
let kv = [];
for (let k of keys)
const kv = [];
for (const k of keys)
if (!skip[k]) kv.push(`${k}=${JSON.stringify(details[k])}`);
if (kv.length) meta = `; ${kv.join(" ")}`;
server/mongodb-functions.js
+37 -28
View File
@@ -44,7 +44,7 @@ function processDeviceFilter(filter) {
});
if (typeof e[2] === "number") {
let alt = e.slice();
const alt = e.slice();
alt[2] = new Date(e[2]);
e = ["OR", e, alt];
}
@@ -58,7 +58,7 @@ function processTasksFilter(filter) {
return expressionParser.map(filter, exp => {
if (!Array.isArray(exp)) return exp;
if (["=", "<>", ">", ">=", "<", "<="].includes(exp[0])) {
let e = exp.slice();
const e = exp.slice();
if (e[1][0] === "PARAM" && e[1][1] === "_id")
e[2] = new mongodb.ObjectID(e[2]);
else if (e[1][0] === "PARAM" && e[1][1] === "timestamp")
@@ -75,7 +75,7 @@ function processFaultsFilter(filter) {
return expressionParser.map(filter, exp => {
if (!Array.isArray(exp)) return exp;
if (["=", "<>", ">", ">=", "<", "<="].includes(exp[0])) {
let e = exp.slice();
const e = exp.slice();
if (e[1][0] === "PARAM" && e[1][1] === "timestamp") e[2] = new Date(e[2]);
else if (e[1][0] === "PARAM" && e[1][1] === "expiry")
e[2] = new Date(e[2]);
@@ -101,7 +101,7 @@ function filterToMongoQuery(filter, negate = false, res = {}) {
filterToMongoQuery(filter[1], !negate, res);
} else if (op === "=") {
const param = filter[1][1];
let p = (res[param] = res[param] || {});
const p = (res[param] = res[param] || {});
if (negate) p["$ne"] = filter[2];
else p["$eq"] = filter[2];
} else if (op === "<>") {
@@ -141,17 +141,19 @@ function filterToMongoQuery(filter, negate = false, res = {}) {
let param;
let flags;
if (filter[1][0] === "FUNC" && filter[1][1] === "UPPER") {
if (filter[2] !== filter[2].toUpperCase())
if (filter[2] !== filter[2].toUpperCase()) {
throw new Error(
"Cannot compare UPPER() against non upper case pattern"
);
}
param = filter[1][2][1];
flags = "i";
} else if (filter[1][0] === "FUNC" && filter[1][1] === "LOWER") {
if (filter[2] !== filter[2].toLowerCase())
if (filter[2] !== filter[2].toLowerCase()) {
throw new Error(
"Cannot compare LOWER() against non lower case pattern"
);
}
param = filter[1][2][1];
flags = "i";
} else {
@@ -171,7 +173,7 @@ function filterToMongoQuery(filter, negate = false, res = {}) {
function processDeviceProjection(projection) {
if (!projection) return projection;
const p = {};
for (const [k, v] of Object.entries(projection))
for (const [k, v] of Object.entries(projection)) {
if (k === "DeviceID.ID") {
p["_id"] = 1;
} else if (k.startsWith("DeviceID")) {
@@ -189,6 +191,7 @@ function processDeviceProjection(projection) {
} else {
p[k] = v;
}
}
return p;
}
@@ -196,18 +199,19 @@ function processDeviceProjection(projection) {
function processDeviceSort(sort) {
if (!sort) return sort;
const s = {};
for (const [k, v] of Object.entries(sort))
for (const [k, v] of Object.entries(sort)) {
if (k === "DeviceID.ID") s["_id"] = v;
else if (k === "Events.Inform") s["_lastInform"] = v;
else s[k] = v;
}
return s;
}
function flattenDevice(device) {
function recursive(input, root, output, timestamp) {
for (let [name, tree] of Object.entries(input)) {
if (!root)
for (const [name, tree] of Object.entries(input)) {
if (!root) {
if (name === "_lastInform") {
output["Events.Inform"] = {
value: [Date.parse(tree), "xsd:dateTime"],
@@ -294,7 +298,7 @@ function flattenDevice(device) {
objectTimestamp: timestamp
};
for (let t of tree)
for (const t of tree) {
output[`Tags.${t}`] = {
value: [true, "xsd:boolean"],
valueTimestamp: timestamp,
@@ -303,7 +307,9 @@ function flattenDevice(device) {
object: false,
objectTimestamp: timestamp
};
}
}
}
if (name.startsWith("_")) continue;
@@ -329,7 +335,7 @@ function flattenDevice(device) {
attrs["writableTimestamp"] = childrenTimestamp;
}
let r = root ? `${root}.${name}` : name;
const r = root ? `${root}.${name}` : name;
output[r] = attrs;
if (attrs["object"] || tree["object"] == null)
@@ -348,14 +354,14 @@ function flattenFault(fault) {
if (f.timestamp) f.timestamp = +f.timestamp;
if (f.expiry) f.expiry = +f.expiry;
if (f.detail) {
for (let [k, v] of Object.entries(f.detail)) fault[`detail.${k}`] = v;
for (const [k, v] of Object.entries(f.detail)) fault[`detail.${k}`] = v;
delete f.detail;
}
return f;
}
function flattenTask(task) {
let t = Object.assign({}, task);
const t = Object.assign({}, task);
t._id = "" + t._id;
if (t.timestamp) t.timestamp = +t.timestamp;
if (t.expiry) t.expiry = +t.expiry;
@@ -363,20 +369,21 @@ function flattenTask(task) {
}
function mongoQueryToFilter(query) {
let expressions = [];
const expressions = [];
function recursive(_query) {
for (let [k, v] of Object.entries(_query))
for (const [k, v] of Object.entries(_query)) {
if (k[0] == "$") {
if (k == "$and") for (let vv of Object.values(v)) recursive(vv);
if (k == "$and") for (const vv of Object.values(v)) recursive(vv);
else throw new Error(`Operator ${k} not supported`);
} else if (k == "_tags") {
if (typeof v === "object") {
if (Array.isArray(v)) throw new Error(`Invalid type`);
for (let [kk, vv] of Object.entries(v))
for (const [kk, vv] of Object.entries(v)) {
if (kk == "$ne")
expressions.push(["IS NULL", ["PARAM", `Tags.${vv}`]]);
else throw new Error(`Operator ${kk} not supported`);
}
} else {
expressions.push(["IS NOT NULL", ["PARAM", `Tags.${v}`]]);
}
@@ -388,7 +395,7 @@ function mongoQueryToFilter(query) {
} else if (typeof v === "object") {
if (Array.isArray(v)) throw new Error(`Invalid type`);
for (let [kk, vv] of Object.entries(v)) {
for (const [kk, vv] of Object.entries(v)) {
let op;
switch (kk) {
case "$eq":
@@ -417,6 +424,7 @@ function mongoQueryToFilter(query) {
} else {
expressions.push(["=", ["PARAM", k], v]);
}
}
}
recursive(query);
@@ -428,7 +436,7 @@ function mongoQueryToFilter(query) {
}
function flattenPreset(preset) {
let p = Object.assign({}, preset);
const p = Object.assign({}, preset);
if (p.precondition) {
p.precondition = mongoQueryToFilter(JSON.parse(p.precondition));
p.precondition = p.precondition.length
@@ -437,12 +445,12 @@ function flattenPreset(preset) {
}
if (p.events) {
let e = [];
for (let [k, v] of Object.entries(p.events)) e.push(v ? k : `-${k}`);
const e = [];
for (const [k, v] of Object.entries(p.events)) e.push(v ? k : `-${k}`);
p.events = e.join(", ");
}
let provision = p.configurations[0];
const provision = p.configurations[0];
if (
p.configurations.length != 1 ||
provision.type != "provision" ||
@@ -459,7 +467,7 @@ function flattenPreset(preset) {
}
function flattenFile(file) {
let f = {};
const f = {};
f["_id"] = file["_id"];
if (file.metadata) {
f["metadata.fileType"] = file.metadata.fileType || "";
@@ -471,14 +479,14 @@ function flattenFile(file) {
}
function preProcessPreset(data) {
let preset = Object.assign({}, data);
const preset = Object.assign({}, data);
preset.precondition = preset.precondition
? filterToMongoQuery(expression.parse(preset.precondition))
: {};
preset.precondition = JSON.stringify(preset.precondition);
let events = {};
if (preset.events)
const events = {};
if (preset.events) {
for (let e of preset.events.split(",")) {
let v = true;
e = e.trim();
@@ -488,12 +496,13 @@ function preProcessPreset(data) {
}
if (e) events[e] = v;
}
}
preset.events = events;
if (!preset.provision) throw new Error("Invalid preset provision");
let configuration = {
const configuration = {
type: "provision",
name: preset.provision
};
server/server.js
+11 -11
View File
@@ -42,11 +42,10 @@ function getPermissionSets(roles) {
"virtualParameters",
"files"
].includes(k)
)
) {
if (v.filter == null || v.filter === "") v.filter = true;
else {
v.filter = expression.parse(v.filter);
}
else v.filter = expression.parse(v.filter);
}
}
return p;
});
@@ -76,11 +75,13 @@ koa.use(
);
koa.use(async (ctx, next) => {
if (ctx.state.user && ctx.state.user.roles)
if (ctx.state.user && ctx.state.user.roles) {
ctx.state.authorizer = new Authorizer(
getPermissionSets(ctx.state.user.roles)
);
else ctx.state.authorizer = new Authorizer([]);
} else {
ctx.state.authorizer = new Authorizer([]);
}
return next();
});
@@ -89,7 +90,7 @@ router.post("/login", async ctx => {
const username = ctx.request.body.username;
const password = ctx.request.body.password;
let log = {
const log = {
message: "Log in",
context: ctx,
username: username
@@ -110,10 +111,9 @@ router.post("/login", async ctx => {
logger.accessWarn(log);
}
let roles;
roles = await authSimple(username, password);
const roles = await authSimple(username, password);
if (roles) return success(roles, "simple");
if (roles) return void success(roles, "simple");
failure();
});
@@ -172,7 +172,7 @@ koa.use(
koa.use(router.routes());
koa.use(koaStatic("./public"));
let server = http
const server = http
.createServer(koa.callback())
.listen(config.server.port, config.server.interface);