jsrrdgraph: Fix parsing of rrdfiles containing escapes

This fixes parsing of URLs such as 'rrd.php?path=some%3Ffile.rrd', and
if people really insist, paths such as 'C:\bar.rrd' (must be written as
'C\:\\bar.rrd', add additional escapes for Javascript strings if needed).

1 files changed, 7 insertions, 5 deletions

diff --git a/js/RrdCmdLine.js b/js/RrdCmdLine.js
index a2be92e..c222498 100644
--- a/js/RrdCmdLine.js
+++ b/js/RrdCmdLine.js
@@ -389,11 +389,13 @@ RrdCmdLine.prototype = {
         // DEF:<vname>=<rrdfile>:<ds-name>:<CF>[:step=<step>][:start=<time>][:end=<time>][:reduce=<CF>]
         parse_def: function (line)
         {
-                var args = line.split(/:/);
-                var n=1;
-                var vnames = args[n++].split('=');
-                var vname = vnames[0];
-                var rrdfile = vnames[1];
+                // Every character (except ':' and '\') are allowed within a value. The
+                // two exceptions must be escaped with a slash.
+                var args = line.match(/(\\.|[^:\\])+/g);
+                var n = 1;
+                var vnames = args[n++];
+                var vname = vnames.substr(0, vnames.indexOf("="));
+                var rrdfile = vnames.substr(vname.length + 1).replace(/\\(.)/g, "$1");
                 var name = args[n++];
                 var cf = args[n++];
                 var step, reduce, start, end;