Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: configs.js: prevent frontend from converting numeric strings to numbers #301

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

BUG: configs.js: prevent frontend from converting numeric strings to numbers #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 41 additions & 28 deletions intelmq_manager/static/js/configs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function load_bots(config) {
$bot_group.find("ul li").first().remove(); // get rid of the HTML template
}

$('#side-menu').metisMenu({restart: true});
$('#side-menu').metisMenu({ restart: true });
$EDIT_DEFAULT_BUTTON.click(e => {
create_form('Edit Defaults', $(e.target).attr("id"), undefined);
fill_editDefault(app.defaults);
Expand Down Expand Up @@ -192,7 +192,7 @@ function handleDrop(event) {
}
// ---

let domPointer = app.network.interactionHandler.getPointer({x: event.clientX, y: event.clientY});
let domPointer = app.network.interactionHandler.getPointer({ x: event.clientX, y: event.clientY });
let canvasPointer = app.network.manipulation.canvas.DOMtoCanvas(domPointer);

let clickData = {
Expand Down Expand Up @@ -240,16 +240,16 @@ function save_data_on_files() {
}

// can't parallelize these due to a race condition from them both touching runtime.yaml; TODO lock file in backend?
authenticatedAjax({type: "POST", url: `${RUNTIME_FILE}`, contentType: "application/json", data: generate_runtime_conf(app.nodes, app.defaults)})
.done(saveSucceeded)
.fail(() => alert_error('runtime', ...arguments))
.then(() =>
authenticatedAjax({type: "POST", url: `${POSITIONS_FILE}`, contentType: "application/json", data: generate_positions_conf()})
.done(saveSucceeded)
.fail(() => alert_error('positions', ...arguments) )
)
// all files were correctly saved
.then(unset_pending_change);
authenticatedAjax({ type: "POST", url: `${RUNTIME_FILE}`, contentType: "application/json", data: generate_runtime_conf(app.nodes, app.defaults) })
.done(saveSucceeded)
.fail(() => alert_error('runtime', ...arguments))
.then(() =>
authenticatedAjax({ type: "POST", url: `${POSITIONS_FILE}`, contentType: "application/json", data: generate_positions_conf() })
.done(saveSucceeded)
.fail(() => alert_error('positions', ...arguments))
)
// all files were correctly saved
.then(unset_pending_change);
}


Expand Down Expand Up @@ -278,7 +278,7 @@ function convert_edges(nodes) {
roundness[hash] = 0;
}
if (roundness[hash]) {
new_edge.smooth = {type: "curvedCCW", roundness: roundness[hash]};
new_edge.smooth = { type: "curvedCCW", roundness: roundness[hash] };
}

new_edges.push(new_edge);
Expand All @@ -300,7 +300,7 @@ function convert_nodes(nodes, includePositions) {

if (includePositions === true) {
try {
let {x, y} = app.positions[node.bot_id];
let { x, y } = app.positions[node.bot_id];
new_node.x = x;
new_node.y = y;
} catch (err) {
Expand Down Expand Up @@ -383,6 +383,15 @@ function insertBorder(border_type) {
}
}

// https://stackoverflow.com/questions/175739/how-can-i-check-if-a-string-is-a-valid-number
function isNumeric(str) {
if (typeof str != "string") {
return false; // we only process strings!
}
return !isNaN(str) && // use type coercion to parse the _entirety_ of the string (`parseFloat` alone does not do this)...
!isNaN(parseFloat(str)); // ...and ensure strings of whitespace fail
}

function insertKeyValue(key, value, section, allowXButtons, insertAt) {
let new_row = table.insertRow(insertAt === undefined ? -1 : insertAt);

Expand Down Expand Up @@ -422,6 +431,10 @@ function insertKeyValue(key, value, section, allowXButtons, insertAt) {
value = JSON.stringify(value);
}
if (value !== null) {
// prevent numeric strings from being converted into numbers when modifying other values
if (isNumeric(value)) {
value = `"${value}"`;
}
valueInput.setAttribute('value', value);
}
}
Expand Down Expand Up @@ -540,7 +553,7 @@ function saveFormData() {
}

function saveData(data, callback) {
node = {parameters: {}, defaults: {}};
node = { parameters: {}, defaults: {} };

saveFormData();

Expand Down Expand Up @@ -590,8 +603,8 @@ function saveData(data, callback) {
path = undefined;
}

app.network_data.edges.remove({id: edge_id});
app.network_data.edges.add({id: new_edge_id, from, to: current_id, label: path});
app.network_data.edges.remove({ id: edge_id });
app.network_data.edges.add({ id: new_edge_id, from, to: current_id, label: path });
}

// recreate forward edges
Expand Down Expand Up @@ -665,7 +678,7 @@ function popupModal(title, body, callback) {
let $el = $("#templates > .modal").clone().appendTo("body");
$(".modal-title", $el).text(title);
$(".modal-body", $el).html(body);
$el.modal({keyboard: false}).on('shown.bs.modal', e => {
$el.modal({ keyboard: false }).on('shown.bs.modal', e => {
let $ee;
if (($ee = $('input,textarea,button', $(".modal-body", e.target)).first())) {
$ee.focus();
Expand Down Expand Up @@ -753,7 +766,7 @@ function draw() {
}

function fitNode(nodeId) {
app.network.fit({nodes: [nodeId]});
app.network.fit({ nodes: [nodeId] });
app.network.selectNodes([nodeId], true);
app.network.manipulation.showManipulatorToolbar();
}
Expand All @@ -776,7 +789,7 @@ function initNetwork(includePositions = true) {
// 'Live' button (by default on when botnet is not too big) and 'Physics' button
// initially stopped
let reload_queues = (new Interval(load_live_info, RELOAD_QUEUES_EVERY * 1000, true)).stop();
app.network.setOptions({physics: false});
app.network.setOptions({ physics: false });

//
// add custom button to the side menu
Expand All @@ -791,14 +804,14 @@ function initNetwork(includePositions = true) {
let physics_running = true;
$(".vis-physics-toggle", $nc).click(e => {
$(e.target).toggleClass("running");
app.network.setOptions({physics: (physics_running = !physics_running)});
app.network.setOptions({ physics: (physics_running = !physics_running) });
});

// 'Save Configuration' button blinks and lists all the bots that should be reloaded after successful save.
$saveButton = $("#vis-save", $nc);
$saveButton.children().on('click', save_data_on_files);
$saveButton.data("reloadables", []);
$saveButton.blinkOnce = function() {
$saveButton.blinkOnce = function () {
$($saveButton).addClass('blinking-once');
setTimeout(() => $($saveButton).removeClass('blinking-once'), 2000);
}
Expand Down Expand Up @@ -828,7 +841,7 @@ function initNetwork(includePositions = true) {
// list of button callbacks in form ["button/settings name"] => function called when clicked receives true/false according to the clicked state
let callbacks = [
["live", val => reload_queues[val ? "start" : "stop"]()],
["physics", val => app.network.setOptions({physics: val})],
["physics", val => app.network.setOptions({ physics: val })],
];
for (let [name, fn] of callbacks) {
let $el = $(`.vis-${name}-toggle`, $nc).click(e => {
Expand Down Expand Up @@ -965,16 +978,16 @@ function refresh_color(bot) {

// change bot color if needed
if (app.network_data.nodes.get([bot])[0].color !== col) {
app.network_data.nodes.update({id: bot, color: col});
app.network_data.nodes.update({ id: bot, color: col });
}

// we dash the border if the status has to be changed (not running or stopping) or is faulty (error, incomplete)
if ([BOT_STATUS_DEFINITION.running, BOT_STATUS_DEFINITION.stopped].indexOf(bot_status[bot]) === -1) {
app.network_data.nodes.update({id: bot, shapeProperties: {borderDashes: [5, 5]}})
app.network_data.nodes.update({ id: bot, shapeProperties: { borderDashes: [5, 5] } })
} else if ([BOT_STATUS_DEFINITION.running, BOT_STATUS_DEFINITION.stopped, undefined].indexOf(bot_status_previous[bot]) === -1) {
// we remove dash border since bot has been in a dash-border state and is no more
// (that means that bot wasn't either in a running, stopped or initially undefined state)
app.network_data.nodes.update({id: bot, shapeProperties: {borderDashes: false}});
app.network_data.nodes.update({ id: bot, shapeProperties: { borderDashes: false } });
}

bot_status_previous[bot] = bot_status[bot];
Expand All @@ -999,11 +1012,11 @@ function load_live_info() {
show_error(`Non-existent bot ${bot} in pipelines.`);
} else if (label !== appbot.label) {
// update queue count on bot label
app.network_data.nodes.update({id: bot, label});
app.network_data.nodes.update({ id: bot, label });
}
} else {
// https://github.com/certtools/intelmq-manager/issues/158
app.network_data.nodes.update({id: bot, label: bot});
app.network_data.nodes.update({ id: bot, label: bot });
}
}
for (let bot in bot_status) {
Expand Down
Loading