github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sanitize inputs

Browse Source 
Try regexp, escape if invalid
This commit is contained in:
David Kaltschmidt
2016-05-04 17:59:21 +02:00
parent 6ca729a6c2
commit d5eea2549d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/app/scripts/utils/search-utils.js
View File

@@ -18,6 +18,14 @@ const COMPARISONS_REGEX = new RegExp(`[${COMPARISONS.keySeq().toJS().join('')}]`
const PREFIX_DELIMITER = ':';
function makeRegExp(expression, options = 'i') {
try {
return new RegExp(expression, options);
} catch (e) {
return new RegExp(_.escapeRegExp(expression), options);
}
}
function parseValue(value) {
let parsed = parseFloat(value);
if (_.endsWith(value, 'KB')) {
@@ -34,14 +42,14 @@ function parseValue(value) {
function matchPrefix(label, prefix) {
if (label && prefix) {
return (new RegExp(prefix, 'i')).test(slugify(label));
return (makeRegExp(prefix)).test(slugify(label));
}
return false;
}
function findNodeMatch(nodeMatches, keyPath, text, query, prefix, label) {
if (!prefix || matchPrefix(label, prefix)) {
const queryRe = new RegExp(query, 'i');
const queryRe = makeRegExp(query);
const matches = text.match(queryRe);
if (matches) {
const firstMatch = matches[0];