Compare commits

..

No commits in common. "5a2e9d27c3af444f24ebee5616d383a8aa862c04" and "83974cb7ca10a71a8f8797310eefe88bed04af64" have entirely different histories.

2 changed files with 12 additions and 25 deletions

View File

@ -428,12 +428,11 @@ static int targetunsafe(const char *path)
#endif #endif
} }
if(!strncmp(path, "./", 2) || !strncmp(path, "../", 3)) return 1; if(!strncmp(path, "./", 2) || !strncmp(path, "../", 3)) return 1;
/* a dot-dot segment, with either separator, wherever it is in the if(strstr(path, "/./") || strstr(path, "/../")) return 1;
path: a walk out of the tree, or a file named to look like one */ if(strstr(path, "\\.\\") || strstr(path, "\\..\\")) return 1;
if(strstr(path, "/..") || strstr(path, "\\..")) return 1;
if(strstr(path, "/./") || strstr(path, "\\.\\")) return 1;
p = path + strlen(path); p = path + strlen(path);
if(p - path >= 2 && (!strcmp(p - 2, "/.") || !strcmp(p - 2, "\\."))) return 1; if(p - path >= 2 && !strcmp(p - 2, "/.")) return 1;
if(p - path >= 3 && !strcmp(p - 3, "/..")) return 1;
return 0; return 0;
} }
@ -1476,27 +1475,16 @@ static int httpsrv_request(struct clientparam *param, struct httpreq *r)
return 1; return 1;
} }
} }
if(i){ if(i && i != 10){
/* The body goes before the answer, as for any answer this server /* The body goes before the answer, as for any answer this server
gives: left in the stream it would be read as the next request. */ gives: left in the stream it would be read as the next request. */
if(!r->drained){ if(!r->drained){
if(r->contentlen) httpsrv_drain(param, r->contentlen); if(r->contentlen) httpsrv_drain(param, r->contentlen);
r->drained = 1; r->drained = 1;
} }
/* 10: a limit of the service was exceeded, which the other
services answer with 503. */
if(i == 10){
static const char body[] = "exceeded your limits\n";
r->hdrs = NULL;
r->maxage = -1;
r->keepalive = 0;
if(httpsrv_head(r, 503, "text/plain", (int64_t)sizeof(body) - 1, NULL)) return 1;
httpsrv_send(r, body, (int)sizeof(body) - 1);
}
/* 4 no credentials, 5 unknown user, 6 wrong password: all of them /* 4 no credentials, 5 unknown user, 6 wrong password: all of them
should let the client offer credentials again. */ should let the client offer credentials again. */
else if(i >= 4 && i <= 6) op_authrequired(r); if(i >= 4 && i <= 6) op_authrequired(r);
else op_forbidden(r); else op_forbidden(r);
RETURN(i); RETURN(i);
} }

View File

@ -264,14 +264,13 @@ static FILTER_ACTION pcre_filter_client(void *fo, struct clientparam * param, vo
struct pcre_filter_data *rule = (struct pcre_filter_data *)fo; struct pcre_filter_data *rule = (struct pcre_filter_data *)fo;
struct pcre_client_data *pcd; struct pcre_client_data *pcd;
*fc = NULL; *fc = fo;
if(!fo) return PASS; if(!fo) return PASS;
if(rule->acl){ if(!rule->acl) return CONTINUE;
memset (&tmpace, 0, sizeof(struct ace)); memset (&tmpace, 0, sizeof(struct ace));
tmpace.src = rule->acl->src; tmpace.src = rule->acl->src;
res = pl->ACLMatches(&tmpace, param); res = pl->ACLMatches(&tmpace, param);
if(!res) return PASS; if(!res) return PASS;
}
/* the connection goes on with a match data of its own */ /* the connection goes on with a match data of its own */
if(!(pcd = pl->mallocfunc(sizeof(struct pcre_client_data)))){ if(!(pcd = pl->mallocfunc(sizeof(struct pcre_client_data)))){
*fc = NULL; *fc = NULL;