RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14130 from liewegas/wip-json-slash

Browse Source 
common/escape: do not escape / in json

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
This commit is contained in:
Sage Weil 2017-04-08 13:21:44 -05:00 committed by GitHub
commit 175e33bd5b
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/workunits/cephtool/test.sh
View File

@ -1061,11 +1061,9 @@ function test_mon_osd()
# osd blacklist
#
bl=192.168.0.1:0/1000
# Escaped form which may appear in JSON output
bl_json=192.168.0.1:0\\\\/1000
ceph osd blacklist add $bl
ceph osd blacklist ls | grep $bl
ceph osd blacklist ls --format=json-pretty | grep $bl_json
ceph osd blacklist ls --format=json-pretty | sed 's/\\\//\//' | grep $bl
ceph osd dump --format=json-pretty | grep $bl
ceph osd dump | grep "^blacklist $bl"
ceph osd blacklist rm $bl

9
src/common/escape.c
View File

@ -119,7 +119,6 @@ void escape_xml_attr(const char *buf, char *out)
#define DBL_QUOTE_JESCAPE "\\\""
#define BACKSLASH_JESCAPE "\\\\"
#define SLASH_JESCAPE "\\/"
#define TAB_JESCAPE "\\t"
#define NEWLINE_JESCAPE "\\n"
@ -137,9 +136,6 @@ int escape_json_attr_len(const char *buf, int src_len)
case '\\':
ret += SSTRL(BACKSLASH_JESCAPE);
break;
case '/':
ret += SSTRL(SLASH_JESCAPE);
break;
case '\t':
ret += SSTRL(TAB_JESCAPE);
break;
@ -179,11 +175,6 @@ void escape_json_attr(const char *buf, int src_len, char *out)
memcpy(o, BACKSLASH_JESCAPE, SSTRL(BACKSLASH_JESCAPE));
o += SSTRL(BACKSLASH_JESCAPE);
break;
case '/':
// cppcheck-suppress sizeofDivisionMemfunc
memcpy(o, SLASH_JESCAPE, SSTRL(SLASH_JESCAPE));
o += SSTRL(SLASH_JESCAPE);
break;
case '\t':
// cppcheck-suppress sizeofDivisionMemfunc
memcpy(o, TAB_JESCAPE, SSTRL(TAB_JESCAPE));

3
src/test/escape.cc
View File

@ -73,9 +73,6 @@ TEST(EscapeJson, Escapes1) {
ASSERT_EQ(escape_json_attrs("The \"scare quotes\""),
"The \\\"scare quotes\\\"");
ASSERT_EQ(escape_json_attrs("I <3 JSON"), "I <3 JSON");
ASSERT_EQ(escape_json_attrs(
"JSON calls a slash / backslash a solidus / reverse solidus"),
"JSON calls a slash \\/ backslash a solidus \\/ reverse solidus");
ASSERT_EQ(escape_json_attrs("Some 'single' \"quotes\" here"),
"Some 'single' \\\"quotes\\\" here");
ASSERT_EQ(escape_json_attrs("tabs\tand\tnewlines\n, oh my"),