Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
3fbeda80
Commit
3fbeda80
authored
Dec 17, 2014
by
arianna-aondio
Committed by
Lasse Karstensen
Jan 13, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Varnishncsa escapes non-printable chars.
Fixes: #1378
parent
d381e245
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
53 additions
and
7 deletions
+53
-7
varnishncsa.c
bin/varnishncsa/varnishncsa.c
+53
-7
No files found.
bin/varnishncsa/varnishncsa.c
View file @
3fbeda80
...
...
@@ -182,16 +182,61 @@ flushout(void)
return
(
0
);
}
static
int
vsb_esc_cat
(
struct
vsb
*
sb
,
const
char
*
b
,
const
char
*
e
)
{
AN
(
b
);
for
(;
b
<
e
;
b
++
)
{
if
(
isspace
(
*
b
))
{
switch
(
*
b
)
{
case
'\n'
:
VSB_cat
(
sb
,
"
\\
n"
);
break
;
case
'\t'
:
VSB_cat
(
sb
,
"
\\
t"
);
break
;
case
'\f'
:
VSB_cat
(
sb
,
"
\\
f"
);
break
;
case
'\r'
:
VSB_cat
(
sb
,
"
\\
r"
);
break
;
case
'\v'
:
VSB_cat
(
sb
,
"
\\
v"
);
break
;
default:
VSB_putc
(
sb
,
*
b
);
break
;
}
}
else
if
(
isprint
(
*
b
))
{
switch
(
*
b
)
{
case
'"'
:
VSB_cat
(
sb
,
"
\\\"
"
);
break
;
case
'\\'
:
VSB_cat
(
sb
,
"
\\\\
"
);
break
;
default:
VSB_putc
(
sb
,
*
b
);
break
;
}
}
else
VSB_printf
(
sb
,
"
\\
x%02x"
,
*
b
);
}
return
(
VSB_error
(
sb
));
}
static
inline
int
vsb_fcat
(
struct
vsb
*
vsb
,
const
struct
fragment
*
f
,
const
char
*
dflt
)
{
if
(
f
->
gen
==
CTX
.
gen
)
{
assert
(
f
->
b
<=
f
->
e
);
return
(
VSB_bcat
(
vsb
,
f
->
b
,
f
->
e
-
f
->
b
));
return
(
vsb_esc_cat
(
vsb
,
f
->
b
,
f
->
e
));
}
if
(
dflt
)
return
(
VSB_cat
(
vsb
,
dflt
));
return
(
vsb_esc_cat
(
vsb
,
dflt
,
dflt
+
strlen
(
dflt
)
));
return
(
-
1
);
}
...
...
@@ -226,10 +271,10 @@ format_fragment(const struct format *format)
if
(
format
->
frag
->
gen
!=
CTX
.
gen
)
{
if
(
format
->
string
==
NULL
)
return
(
-
1
);
AZ
(
VSB_cat
(
CTX
.
vsb
,
format
->
string
));
AZ
(
vsb_esc_cat
(
CTX
.
vsb
,
format
->
string
,
format
->
string
+
strlen
(
format
->
string
)));
return
(
0
);
}
AZ
(
vsb_fcat
(
CTX
.
vsb
,
format
->
frag
,
NULL
));
return
(
1
);
}
...
...
@@ -318,13 +363,14 @@ format_auth(const struct format *format)
CTX
.
frag
[
F_auth
].
e
))
{
if
(
format
->
string
==
NULL
)
return
(
-
1
);
AZ
(
VSB_cat
(
CTX
.
vsb
,
format
->
string
));
AZ
(
vsb_esc_cat
(
CTX
.
vsb
,
format
->
string
,
format
->
string
+
strlen
(
format
->
string
)));
return
(
0
);
}
q
=
strchr
(
buf
,
':'
);
if
(
q
!=
NULL
)
*
q
=
'\0'
;
AZ
(
VSB_cat
(
CTX
.
vsb
,
buf
));
AZ
(
vsb_esc_cat
(
CTX
.
vsb
,
buf
,
buf
+
strlen
(
buf
)
));
return
(
1
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment