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
0e1c5d10
Commit
0e1c5d10
authored
Nov 11, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow the /mask to be inside the "....." in ACLs.
parent
6e7b2b22
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
8 deletions
+57
-8
v00017.vtc
bin/varnishtest/tests/v00017.vtc
+16
-0
vcc_acl.c
lib/libvcc/vcc_acl.c
+41
-8
No files found.
bin/varnishtest/tests/v00017.vtc
View file @
0e1c5d10
...
@@ -90,3 +90,19 @@ varnish v1 -vcl {
...
@@ -90,3 +90,19 @@ varnish v1 -vcl {
}
}
sub vcl_recv { if (client.ip ~ a) { return(pass); } }
sub vcl_recv { if (client.ip ~ a) { return(pass); } }
}
}
varnish v1 -errvcl {.../mask is not numeric.} {
backend b { .host = "127.0.0.1"; }
acl a {
"10.0.1.0/1bc";
}
sub vcl_recv { if (client.ip ~ a) { return(pass); } }
}
varnish v1 -errvcl {/mask only allowed once} {
backend b { .host = "127.0.0.1"; }
acl a {
"10.0.1.0/22" / 22;
}
sub vcl_recv { if (client.ip ~ a) { return(pass); } }
}
lib/libvcc/vcc_acl.c
View file @
0e1c5d10
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
#include <netdb.h>
#include <netdb.h>
#include <stddef.h>
#include <stddef.h>
#include <stdio.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <string.h>
#include "vcc_compile.h"
#include "vcc_compile.h"
...
@@ -49,6 +50,7 @@ struct acl_e {
...
@@ -49,6 +50,7 @@ struct acl_e {
unsigned
mask
;
unsigned
mask
;
unsigned
not
;
unsigned
not
;
unsigned
para
;
unsigned
para
;
char
*
addr
;
struct
token
*
t_addr
;
struct
token
*
t_addr
;
struct
token
*
t_mask
;
struct
token
*
t_mask
;
};
};
...
@@ -171,12 +173,12 @@ vcc_acl_try_getaddrinfo(struct vcc *tl, struct acl_e *ae)
...
@@ -171,12 +173,12 @@ vcc_acl_try_getaddrinfo(struct vcc *tl, struct acl_e *ae)
memset
(
&
hint
,
0
,
sizeof
hint
);
memset
(
&
hint
,
0
,
sizeof
hint
);
hint
.
ai_family
=
PF_UNSPEC
;
hint
.
ai_family
=
PF_UNSPEC
;
hint
.
ai_socktype
=
SOCK_STREAM
;
hint
.
ai_socktype
=
SOCK_STREAM
;
error
=
getaddrinfo
(
ae
->
t_addr
->
dec
,
"0"
,
&
hint
,
&
res0
);
error
=
getaddrinfo
(
ae
->
addr
,
"0"
,
&
hint
,
&
res0
);
if
(
error
)
{
if
(
error
)
{
if
(
ae
->
para
)
{
if
(
ae
->
para
)
{
VSB_printf
(
tl
->
sb
,
VSB_printf
(
tl
->
sb
,
"Warning: %s ignored
\n
-- %s
\n
"
,
"Warning: %s ignored
\n
-- %s
\n
"
,
ae
->
t_addr
->
dec
,
gai_strerror
(
error
));
ae
->
addr
,
gai_strerror
(
error
));
Fh
(
tl
,
1
,
"/* Ignored ACL entry: %s%s"
,
Fh
(
tl
,
1
,
"/* Ignored ACL entry: %s%s"
,
ae
->
para
?
"
\"
(
\"
"
:
""
,
ae
->
not
?
"
\"
!
\"
"
:
""
);
ae
->
para
?
"
\"
(
\"
"
:
""
,
ae
->
not
?
"
\"
!
\"
"
:
""
);
EncToken
(
tl
->
fh
,
ae
->
t_addr
);
EncToken
(
tl
->
fh
,
ae
->
t_addr
);
...
@@ -188,7 +190,7 @@ vcc_acl_try_getaddrinfo(struct vcc *tl, struct acl_e *ae)
...
@@ -188,7 +190,7 @@ vcc_acl_try_getaddrinfo(struct vcc *tl, struct acl_e *ae)
}
else
{
}
else
{
VSB_printf
(
tl
->
sb
,
VSB_printf
(
tl
->
sb
,
"DNS lookup(%s): %s
\n
"
,
"DNS lookup(%s): %s
\n
"
,
ae
->
t_addr
->
dec
,
gai_strerror
(
error
));
ae
->
addr
,
gai_strerror
(
error
));
vcc_ErrWhere
(
tl
,
ae
->
t_addr
);
vcc_ErrWhere
(
tl
,
ae
->
t_addr
);
}
}
return
;
return
;
...
@@ -252,7 +254,7 @@ vcc_acl_try_netnotation(struct vcc *tl, struct acl_e *ae)
...
@@ -252,7 +254,7 @@ vcc_acl_try_netnotation(struct vcc *tl, struct acl_e *ae)
const
char
*
p
;
const
char
*
p
;
memset
(
b
,
0
,
sizeof
b
);
memset
(
b
,
0
,
sizeof
b
);
p
=
ae
->
t_addr
->
dec
;
p
=
ae
->
addr
;
for
(
i
=
0
;
i
<
4
;
i
++
)
{
for
(
i
=
0
;
i
<
4
;
i
++
)
{
j
=
sscanf
(
p
,
"%u%n"
,
&
u
,
&
k
);
j
=
sscanf
(
p
,
"%u%n"
,
&
u
,
&
k
);
if
(
j
!=
1
)
if
(
j
!=
1
)
...
@@ -276,6 +278,7 @@ static void
...
@@ -276,6 +278,7 @@ static void
vcc_acl_entry
(
struct
vcc
*
tl
)
vcc_acl_entry
(
struct
vcc
*
tl
)
{
{
struct
acl_e
*
ae
;
struct
acl_e
*
ae
;
char
*
sl
,
*
e
;
ae
=
TlAlloc
(
tl
,
sizeof
*
ae
);
ae
=
TlAlloc
(
tl
,
sizeof
*
ae
);
AN
(
ae
);
AN
(
ae
);
...
@@ -297,9 +300,28 @@ vcc_acl_entry(struct vcc *tl)
...
@@ -297,9 +300,28 @@ vcc_acl_entry(struct vcc *tl)
ExpectErr
(
tl
,
CSTR
);
ExpectErr
(
tl
,
CSTR
);
ae
->
t_addr
=
tl
->
t
;
ae
->
t_addr
=
tl
->
t
;
ae
->
addr
=
strdup
(
ae
->
t_addr
->
dec
);
AN
(
ae
->
addr
);
vcc_NextToken
(
tl
);
vcc_NextToken
(
tl
);
if
(
tl
->
t
->
tok
==
'/'
)
{
if
(
strchr
(
ae
->
t_addr
->
dec
,
'/'
)
!=
NULL
)
{
sl
=
strchr
(
ae
->
addr
,
'/'
);
AN
(
sl
);
*
sl
++
=
'\0'
;
e
=
NULL
;
ae
->
mask
=
strtoul
(
sl
,
&
e
,
10
);
if
(
*
e
!=
'\0'
)
{
VSB_printf
(
tl
->
sb
,
".../mask is not numeric.
\n
"
);
vcc_ErrWhere
(
tl
,
ae
->
t_addr
);
return
;
}
ae
->
t_mask
=
ae
->
t_addr
;
if
(
tl
->
t
->
tok
==
'/'
)
{
VSB_printf
(
tl
->
sb
,
"/mask only allowed once.
\n
"
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
;
}
}
else
if
(
tl
->
t
->
tok
==
'/'
)
{
vcc_NextToken
(
tl
);
vcc_NextToken
(
tl
);
ae
->
t_mask
=
tl
->
t
;
ae
->
t_mask
=
tl
->
t
;
ExpectErr
(
tl
,
CNUM
);
ExpectErr
(
tl
,
CNUM
);
...
@@ -327,6 +349,7 @@ vcc_acl_emit(const struct vcc *tl, const char *acln, int anon)
...
@@ -327,6 +349,7 @@ vcc_acl_emit(const struct vcc *tl, const char *acln, int anon)
int
depth
,
l
,
m
,
i
;
int
depth
,
l
,
m
,
i
;
unsigned
at
[
VRT_ACL_MAXADDR
+
1
];
unsigned
at
[
VRT_ACL_MAXADDR
+
1
];
const
char
*
oc
;
const
char
*
oc
;
struct
token
*
t
;
Fh
(
tl
,
0
,
"
\n
static int
\n
"
);
Fh
(
tl
,
0
,
"
\n
static int
\n
"
);
Fh
(
tl
,
0
,
"match_acl_%s_%s(const struct vrt_ctx *ctx, const VCL_IP p)
\n
"
,
Fh
(
tl
,
0
,
"match_acl_%s_%s(const struct vrt_ctx *ctx, const VCL_IP p)
\n
"
,
...
@@ -391,9 +414,19 @@ vcc_acl_emit(const struct vcc *tl, const char *acln, int anon)
...
@@ -391,9 +414,19 @@ vcc_acl_emit(const struct vcc *tl, const char *acln, int anon)
if
(
!
anon
)
{
if
(
!
anon
)
{
Fh
(
tl
,
0
,
"
\t
%*sVRT_acl_log(ctx,
\"
%sMATCH %s
\"
"
,
Fh
(
tl
,
0
,
"
\t
%*sVRT_acl_log(ctx,
\"
%sMATCH %s
\"
"
,
-
i
,
""
,
ae
->
not
?
"NEG_"
:
""
,
acln
);
-
i
,
""
,
ae
->
not
?
"NEG_"
:
""
,
acln
);
EncToken
(
tl
->
fh
,
ae
->
t_addr
);
t
=
ae
->
t_addr
;
if
(
ae
->
t_mask
!=
NULL
)
do
{
Fh
(
tl
,
0
,
"
\"
/%.*s
\"
"
,
PF
(
ae
->
t_mask
));
if
(
t
->
tok
==
CSTR
)
{
Fh
(
tl
,
0
,
"
\"\\\"\"
"
);
EncToken
(
tl
->
fh
,
t
);
Fh
(
tl
,
0
,
"
\"\\\"\"
"
);
}
else
Fh
(
tl
,
0
,
"
\"
%.*s
\"
"
,
PF
(
t
));
if
(
t
==
ae
->
t_mask
)
break
;
t
=
VTAILQ_NEXT
(
t
,
list
);
AN
(
t
);
}
while
(
ae
->
t_mask
!=
NULL
);
Fh
(
tl
,
0
,
");
\n
"
);
Fh
(
tl
,
0
,
");
\n
"
);
}
}
...
...
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