IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

based on encodeURIComponent() using strict RFC 3986 sub-delims

Browse Source
This commit is contained in:
Benjamin Schweizer
2019-01-22 15:09:58 +01:00
parent 8a09d84707
commit bde4b76c16
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/reference/templating.md
View File

@@ -52,7 +52,7 @@ Filter Option | Example | Raw | Interpolated | Description
`csv`| ${servers:csv} | `'test1', 'test2'` | `test1,test2` | Formats multi-value variable as a comma-separated string
`distributed`| ${servers:distributed} | `'test1', 'test2'` | `test1,servers=test2` | Formats multi-value variable in custom format for OpenTSDB.
`lucene`| ${servers:lucene} | `'test', 'test2'` | `("test" OR "test2")` | Formats multi-value variable as a lucene expression.
`percentencode` | ${servers:percentencode} | `'foo()bar BAZ', 'test2'` | `{foo%28%29bar%20BAZ%2Ctest2}` | Formats multi-value variable into a glob, percent-escaped
`percentencode` | ${servers:percentencode} | `'foo()bar BAZ', 'test2'` | `{foo%28%29bar%20BAZ%2Ctest2}` | Formats multi-value variable into a glob, percent-encoded.
Test the formatting options on the [Grafana Play site](http://play.grafana.org/d/cJtIfcWiz/template-variable-formatting-options?orgId=1).

2
public/app/features/templating/specs/template_srv.test.ts
View File

@@ -277,7 +277,7 @@ describe('templateSrv', () => {
it('multi value and percentencode format should render percent-encoded string', () => {
const result = _templateSrv.formatValue(['foo()bar BAZ', 'test2'], 'percentencode');
expect(result).toBe('%7bfoo%28%29bar%20BAZ%2ctest2%7d');
expect(result).toBe('%7Bfoo%28%29bar%20BAZ%2Ctest2%7D');
});
it('slash should be properly escaped in regex format', () => {

14
public/app/features/templating/template_srv.ts
View File

@@ -77,10 +77,12 @@ export class TemplateSrv {
return '(' + quotedValues.join(' OR ') + ')';
}
// like encodeURIComponent() but for all characters except alpha-numerics
encodeURIQueryValue(str) {
return str.replace(/[^a-z0-9]/gi, function(c) {
return '%' + c.charCodeAt(0).toString(16);
// encode string according to RFC 3986; in contrast to encodeURIComponent()
// also the sub-delims "!", "'", "(", ")" and "*" are encoded;
// unicode handling uses UTF-8 as in ECMA-262.
encodeURIComponentStrict(str) {
return encodeURIComponent(str).replace(/[!'()*]/g, (c) => {
return '%' + c.charCodeAt(0).toString(16).toUpperCase();
});
}
@@ -128,9 +130,9 @@ export class TemplateSrv {
case 'percentencode': {
// like glob, but url escaped
if (_.isArray(value)) {
return this.encodeURIQueryValue('{' + value.join(',') + '}');
return this.encodeURIComponentStrict('{' + value.join(',') + '}');
}
return this.encodeURIQueryValue(value);
return this.encodeURIComponentStrict(value);
}
default: {
if (_.isArray(value)) {