Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed unrestricted queries in cluster dashboard

This commit is contained in:
Jan Steemann 2014-05-13 18:15:34 +02:00
parent 5aba18ebdc
commit 299e05c0b2
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/actions/api-cluster.js
View File

@ -645,24 +645,22 @@ actions.defineHttp({
var DBserver = req.parameters.DBserver; var DBserver = req.parameters.DBserver;
//build query //build query
var startDate = body.startDate;
var endDate = body.endDate;
var figures = body.figures; var figures = body.figures;
var filterString = ""; var filterString = " filter u.time > @startDate";
if (startDate) { var bind = {
filterString += " filter u.time > " + startDate; startDate: (new Date().getTime() / 1000) - 20 * 60
} else { };
endDate = startDate;
}
if (endDate) {
filterString += " filter u.time < " + endDate;
}
if (cluster.isCoordinator() && !req.parameters.hasOwnProperty("DBserver")) { if (cluster.isCoordinator() && !req.parameters.hasOwnProperty("DBserver")) {
filterString += " filter u.clusterId == '" + cluster.coordinatorId() +"'"; filterString += " filter u.clusterId == @serverId";
bind["serverId"] = cluster.coordinatorId();
} }
var returnValue = " return u"; var returnValue = " return u";
if (figures) { if (figures) {
returnValue = " return {time : u.time, server : {uptime : u.server.uptime} "; returnValue = " return {name: @name, time : u.time, server : {uptime : u.server.uptime} ";
bind["name"] = DBserver || "";
var groups = {}; var groups = {};
figures.forEach(function(f) { figures.forEach(function(f) {
var g = f.split(".")[0]; var g = f.split(".")[0];
@ -676,13 +674,11 @@ actions.defineHttp({
}); });
returnValue += "}"; returnValue += "}";
} }
var myQueryVal = "FOR u in _statistics "+ filterString + " sort u.time" + returnValue; // allow at most ((60 / 10) * 20) * 2 documents to prevent total chaos
var myQueryVal = "FOR u in _statistics " + filterString + " LIMIT 240 SORT u.time" + returnValue;
if (!req.parameters.hasOwnProperty("DBserver")) { if (!req.parameters.hasOwnProperty("DBserver")) {
var cursor = internal.AQL_QUERY(myQueryVal, var cursor = internal.AQL_QUERY(myQueryVal, bind);
{},
{batchSize: 100000}
);
res.contentType = "application/json; charset=utf-8"; res.contentType = "application/json; charset=utf-8";
if (cursor instanceof Error) { if (cursor instanceof Error) {
res.responseCode = actions.HTTP_BAD; res.responseCode = actions.HTTP_BAD;
@ -695,7 +691,7 @@ actions.defineHttp({
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() }; var coord = { coordTransactionID: ArangoClusterInfo.uniqid() };
var options = { coordTransactionID: coord.coordTransactionID, timeout:10 }; var options = { coordTransactionID: coord.coordTransactionID, timeout:10 };
var op = ArangoClusterComm.asyncRequest("POST","server:"+DBserver,"_system", var op = ArangoClusterComm.asyncRequest("POST","server:"+DBserver,"_system",
"/_api/cursor",JSON.stringify({query: myQueryVal, batchSize: 100000}),{},options); "/_api/cursor",JSON.stringify({query: myQueryVal, bindVars: bind}),{},options);
var r = ArangoClusterComm.wait(op); var r = ArangoClusterComm.wait(op);
res.contentType = "application/json; charset=utf-8"; res.contentType = "application/json; charset=utf-8";
if (r.status === "RECEIVED") { if (r.status === "RECEIVED") {

4
js/apps/system/aardvark/frontend/js/collections/arangoDocuments.js
View File

@ -121,9 +121,7 @@
getStatisticsHistory: function(params) { getStatisticsHistory: function(params) {
var self = this, var self = this,
body = { body = {
startDate : params.startDate, figures: params.figures
endDate : params.endDate,
figures : params.figures
}, },
server = params.server, server = params.server,
addAuth = function(){}, addAuth = function(){},

2
js/server/version-check.js
View File

@ -661,7 +661,7 @@
var collection = getCollection(name); var collection = getCollection(name);
collection.ensureSkiplist("time"); collection.ensureSkiplist("time");
collection.ensureCapConstraint(6 * 60 * 24 * 365); // 1 year (every 10 secs); collection.ensureCapConstraint(6 * 60 * 24 * 30); // approx. 30 days of data
} }
return result; return result;