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
eb34f7dd
Commit
eb34f7dd
authored
Sep 04, 2017
by
Federico G. Schwindt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn {be}req.hash into a BLOB
Fixes #2402.
parent
09aa86a6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
21 deletions
+22
-21
cache_vrt_var.c
bin/varnishd/cache/cache_vrt_var.c
+13
-15
b00051.vtc
bin/varnishtest/tests/b00051.vtc
+3
-2
v00020.vtc
bin/varnishtest/tests/v00020.vtc
+4
-2
generate.py
lib/libvcc/generate.py
+2
-2
No files found.
bin/varnishd/cache/cache_vrt_var.c
View file @
eb34f7dd
...
@@ -768,34 +768,32 @@ VRT_BODY_L(resp)
...
@@ -768,34 +768,32 @@ VRT_BODY_L(resp)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
static
const
char
*
static
struct
vmod_priv
*
vrt_hash
(
VRT_CTX
,
uint8_t
*
digest
)
vrt_do_blob
(
VRT_CTX
,
uint8_t
*
digest
)
{
{
char
*
p
;
struct
vmod_priv
*
p
;
int
i
;
p
=
(
void
*
)
WS_Alloc
(
ctx
->
ws
,
sizeof
*
p
);
AN
(
p
);
p
=
WS_Alloc
(
ctx
->
ws
,
SHA256_LEN
*
2
+
1
);
memset
(
p
,
0
,
sizeof
*
p
);
if
(
p
==
NULL
)
p
->
len
=
DIGEST_LEN
;
return
(
NULL
);
p
->
priv
=
WS_Copy
(
ctx
->
ws
,
digest
,
DIGEST_LEN
);
for
(
i
=
0
;
i
<
SHA256_LEN
;
i
++
)
sprintf
(
&
p
[
i
*
2
],
"%02x"
,
digest
[
i
]);
return
(
p
);
return
(
p
);
}
}
const
char
*
VCL_BLOB
VRT_r_req_hash
(
VRT_CTX
)
VRT_r_req_hash
(
VRT_CTX
)
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
req
,
REQ_MAGIC
);
return
(
vrt_
hash
(
ctx
,
ctx
->
req
->
digest
));
return
(
vrt_
do_blob
(
ctx
,
ctx
->
req
->
digest
));
}
}
const
char
*
VCL_BLOB
VRT_r_bereq_hash
(
VRT_CTX
)
VRT_r_bereq_hash
(
VRT_CTX
)
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
bo
,
BUSYOBJ_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
bo
,
BUSYOBJ_MAGIC
);
return
(
vrt_
hash
(
ctx
,
ctx
->
bo
->
digest
));
return
(
vrt_
do_blob
(
ctx
,
ctx
->
bo
->
digest
));
}
}
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
...
...
bin/varnishtest/tests/b00051.vtc
View file @
eb34f7dd
...
@@ -6,11 +6,12 @@ server s1 {
...
@@ -6,11 +6,12 @@ server s1 {
} -start
} -start
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import vtc;
sub vcl_backend_response {
sub vcl_backend_response {
set beresp.http.bereq_hash =
bereq.hash
;
set beresp.http.bereq_hash =
vtc.blob2hex(bereq.hash)
;
}
}
sub vcl_deliver {
sub vcl_deliver {
set resp.http.req_hash =
req.hash
;
set resp.http.req_hash =
vtc.blob2hex(req.hash)
;
}
}
} -start
} -start
...
...
bin/varnishtest/tests/v00020.vtc
View file @
eb34f7dd
...
@@ -220,15 +220,17 @@ varnish v1 -errvcl {Function returns VOID} {
...
@@ -220,15 +220,17 @@ varnish v1 -errvcl {Function returns VOID} {
varnish v1 -errvcl {'req.hash': Not available in method 'vcl_recv'.} {
varnish v1 -errvcl {'req.hash': Not available in method 'vcl_recv'.} {
backend b { .host = "127.0.0.1"; }
backend b { .host = "127.0.0.1"; }
import vtc;
sub vcl_recv {
sub vcl_recv {
set req.http.foo =
req.hash
;
set req.http.foo =
vtc.blob2hex(req.hash)
;
}
}
}
}
varnish v1 -errvcl {'req.hash': Not available in method 'vcl_hash'.} {
varnish v1 -errvcl {'req.hash': Not available in method 'vcl_hash'.} {
backend b { .host = "127.0.0.1"; }
backend b { .host = "127.0.0.1"; }
import vtc;
sub vcl_hash {
sub vcl_hash {
set req.http.foo =
req.hash
;
set req.http.foo =
vtc.blob2hex(req.hash)
;
}
}
}
}
...
...
lib/libvcc/generate.py
View file @
eb34f7dd
...
@@ -234,7 +234,7 @@ sp_variables = [
...
@@ -234,7 +234,7 @@ sp_variables = [
"""
"""
),
),
(
'req.hash'
,
(
'req.hash'
,
'
STRING
'
,
'
BLOB
'
,
(
'hit'
,
'miss'
,
'pass'
,
'purge'
,
'deliver'
,
),
(
'hit'
,
'miss'
,
'pass'
,
'purge'
,
'deliver'
,
),
(),
"""
(),
"""
The hash key of this request.
The hash key of this request.
...
@@ -428,7 +428,7 @@ sp_variables = [
...
@@ -428,7 +428,7 @@ sp_variables = [
"""
"""
),
),
(
'bereq.hash'
,
(
'bereq.hash'
,
'
STRING
'
,
'
BLOB
'
,
(
'pipe'
,
'backend'
,
),
(
'pipe'
,
'backend'
,
),
(),
"""
(),
"""
The hash key of this request.
The hash key of this request.
...
...
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