3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-28 23:49:44 +08:00
Code Issues Projects Releases Wiki Activity

fixed check_acl() to return -1 for malformed ACL

Browse Source
This commit is contained in:
valenok 2010-09-06 21:36:54 +01:00
parent 58c89bb862
commit de5aff7f10
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mongoose.c
View File

@ -3351,18 +3351,18 @@ static int check_acl(struct mg_context *ctx, const struct usa *usa) {
if (sscanf(vec.ptr, "%c%d.%d.%d.%d%n", &flag, &a, &b, &c, &d, &n) != 5) { if (sscanf(vec.ptr, "%c%d.%d.%d.%d%n", &flag, &a, &b, &c, &d, &n) != 5) {
cry(fc(ctx), "%s: subnet must be [+|-]x.x.x.x[/x]", __func__); cry(fc(ctx), "%s: subnet must be [+|-]x.x.x.x[/x]", __func__);
return 0; return -1;
} else if (flag != '+' && flag != '-') { } else if (flag != '+' && flag != '-') {
cry(fc(ctx), "%s: flag must be + or -: [%s]", __func__, vec.ptr); cry(fc(ctx), "%s: flag must be + or -: [%s]", __func__, vec.ptr);
return 0; return -1;
} else if (!isbyte(a)||!isbyte(b)||!isbyte(c)||!isbyte(d)) { } else if (!isbyte(a)||!isbyte(b)||!isbyte(c)||!isbyte(d)) {
cry(fc(ctx), "%s: bad ip address: [%s]", __func__, vec.ptr); cry(fc(ctx), "%s: bad ip address: [%s]", __func__, vec.ptr);
return 0; return -1;
} else if (sscanf(vec.ptr + n, "/%d", &mask) == 0) { } else if (sscanf(vec.ptr + n, "/%d", &mask) == 0) {
// Do nothing, no mask specified // Do nothing, no mask specified
} else if (mask < 0 || mask > 32) { } else if (mask < 0 || mask > 32) {
cry(fc(ctx), "%s: bad subnet mask: %d [%s]", __func__, n, vec.ptr); cry(fc(ctx), "%s: bad subnet mask: %d [%s]", __func__, n, vec.ptr);
return 0; return -1;
} }
acl_subnet = (a << 24) | (b << 16) | (c << 8) | d; acl_subnet = (a << 24) | (b << 16) | (c << 8) | d;
@ -3533,7 +3533,7 @@ static int set_gpass_option(struct mg_context *ctx) {
static int set_acl_option(struct mg_context *ctx) { static int set_acl_option(struct mg_context *ctx) {
struct usa fake; struct usa fake;
return check_acl(ctx, &fake); return check_acl(ctx, &fake) != -1;
} }
static void reset_per_request_attributes(struct mg_connection *conn) { static void reset_per_request_attributes(struct mg_connection *conn) {