mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
http server implemented, pcre support for hostnames in acls implemented
This commit is contained in:
1 parent
7bc34002df
commit
927b011bd4
27 files changed
+2325
-148
No files matched your search
+141
-19
@@ -9,7 +9,7 @@
|
||||
#include "proxy.h"
|
||||
|
||||
#ifdef WITH_HTTPSRV
|
||||
static int addhttprule(char *host, char *url, char *op, char *params);
|
||||
static int addhttprule(char *op, char *host, char *url, char *params);
|
||||
#endif
|
||||
#include "mdhash.h"
|
||||
#ifdef WITH_SSL
|
||||
@@ -264,10 +264,10 @@ static int h_proxy(int argc, unsigned char ** argv){
|
||||
else if(!strcmp((char *)argv[0], "admin")) {
|
||||
/* The same service as httpsrv, with the administration pages
|
||||
declared for it. */
|
||||
if(addhttprule("*", "/C*", "admin_counters", NULL) ||
|
||||
addhttprule("*", "/R", "admin_reload", NULL) ||
|
||||
addhttprule("*", "/S*", "admin_services", NULL) ||
|
||||
addhttprule("*", "*", "admin", NULL)){
|
||||
if(addhttprule("admin_counters", "*", "/C*", NULL) ||
|
||||
addhttprule("admin_reload", "*", "/R", NULL) ||
|
||||
addhttprule("admin_services", "*", "/S*", NULL) ||
|
||||
addhttprule("admin", "*", "**", NULL)){
|
||||
fprintf(stderr, "Failed to declare the admin pages, line %d\n", linenum);
|
||||
return 1;
|
||||
}
|
||||
@@ -802,8 +802,57 @@ struct redirdesc redirs[] = {
|
||||
};
|
||||
|
||||
#ifdef WITH_HTTPSRV
|
||||
/* Headers a rule adds are written as one argument, the lines separated by a
|
||||
backslash and an n, because a configuration line cannot hold a line ending.
|
||||
Those two characters become a real one here. A line ending which reached the
|
||||
argument as itself is dropped: what goes on the wire is decided here and not
|
||||
by whatever produced the string. */
|
||||
static unsigned char * parsehdrs(const unsigned char *arg)
|
||||
{
|
||||
unsigned char *out, *o;
|
||||
const unsigned char *p;
|
||||
size_t len = strlen((char *)arg);
|
||||
|
||||
out = malloc(len * 2 + 3);
|
||||
if(!out) return NULL;
|
||||
for(p = arg, o = out; *p; p++){
|
||||
if(*p == '\\' && p[1] == 'n'){
|
||||
*o++ = '\r';
|
||||
*o++ = '\n';
|
||||
p++;
|
||||
continue;
|
||||
}
|
||||
if(*p == '\r' || *p == '\n') continue;
|
||||
*o++ = *p;
|
||||
}
|
||||
if(o == out || o[-1] != '\n'){
|
||||
*o++ = '\r';
|
||||
*o++ = '\n';
|
||||
}
|
||||
*o = 0;
|
||||
return out;
|
||||
}
|
||||
|
||||
/* An optional argument which a star, or nothing at all, leaves at its
|
||||
default. */
|
||||
static int optnum(int argc, unsigned char **argv, int at, int def)
|
||||
{
|
||||
if(argc <= at || !strcmp((char *)argv[at], "*")) return def;
|
||||
return atoi((char *)argv[at]);
|
||||
}
|
||||
|
||||
static void freehttprule(struct httprule *rule)
|
||||
{
|
||||
if(rule->host.name) free(rule->host.name);
|
||||
if(rule->url.name) free(rule->url.name);
|
||||
if(rule->params) free(rule->params);
|
||||
if(rule->ctype) free(rule->ctype);
|
||||
if(rule->hdrs) free(rule->hdrs);
|
||||
free(rule);
|
||||
}
|
||||
|
||||
/* Installs one rule from code, for the pages a service predefines. */
|
||||
static int addhttprule(char *host, char *url, char *op, char *params)
|
||||
static int addhttprule(char *op, char *host, char *url, char *params)
|
||||
{
|
||||
struct httprule *rule, *tail;
|
||||
unsigned char hostbuf[64], urlbuf[128];
|
||||
@@ -811,6 +860,7 @@ static int addhttprule(char *host, char *url, char *op, char *params)
|
||||
rule = malloc(sizeof(struct httprule));
|
||||
if(!rule) return 1;
|
||||
memset(rule, 0, sizeof(struct httprule));
|
||||
rule->maxage = -1;
|
||||
|
||||
rule->op = httpopbyname((unsigned char *)op);
|
||||
if(rule->op < 0){
|
||||
@@ -820,7 +870,7 @@ static int addhttprule(char *host, char *url, char *op, char *params)
|
||||
|
||||
strcpy((char *)hostbuf, host);
|
||||
strcpy((char *)urlbuf, url);
|
||||
if(parsepattern(&rule->host, hostbuf) || parsepattern(&rule->url, urlbuf)){
|
||||
if(parsepattern(&rule->host, hostbuf) || parsepathpattern(&rule->url, urlbuf)){
|
||||
free(rule->host.name);
|
||||
free(rule);
|
||||
return 1;
|
||||
@@ -973,9 +1023,10 @@ static int h_http(int argc, unsigned char **argv){
|
||||
struct httprule *rule, *tail;
|
||||
int op;
|
||||
|
||||
op = httpopbyname(argv[3]);
|
||||
/* http OPERATION HOST URL [PARAMETERS] */
|
||||
op = httpopbyname(argv[1]);
|
||||
if(op < 0){
|
||||
fprintf(stderr, "Unknown http operation: %s line %d\n", argv[3], linenum);
|
||||
fprintf(stderr, "Unknown http operation: %s line %d\n", argv[1], linenum);
|
||||
return(1);
|
||||
}
|
||||
|
||||
@@ -983,23 +1034,75 @@ static int h_http(int argc, unsigned char **argv){
|
||||
if(!rule) return(21);
|
||||
memset(rule, 0, sizeof(struct httprule));
|
||||
rule->op = op;
|
||||
rule->maxage = -1;
|
||||
|
||||
if(parsepattern(&rule->host, argv[1]) || parsepattern(&rule->url, argv[2])){
|
||||
if(parsepattern(&rule->host, argv[2]) || parsepathpattern(&rule->url, argv[3])){
|
||||
fprintf(stderr, "No memory for http rule, line %d\n", linenum);
|
||||
free(rule->host.name);
|
||||
free(rule);
|
||||
return(21);
|
||||
}
|
||||
|
||||
if(argc > 4){
|
||||
if(argc > 4 && (!strcmp((char *)argv[1], "file") || !strcmp((char *)argv[1], "cache"))){
|
||||
/* PATH [TYPE [MAX-AGE [HEADERS [CODE]]]]. A star, or nothing,
|
||||
leaves each of them out: the type is worked out from the name,
|
||||
nothing is said about caching, no headers are added and the
|
||||
answer is the usual 200. */
|
||||
rule->params = (unsigned char *)strdup((char *)argv[4]);
|
||||
if(!rule->params){
|
||||
free(rule->host.name);
|
||||
free(rule->url.name);
|
||||
free(rule);
|
||||
if(argc > 5 && strcmp((char *)argv[5], "*"))
|
||||
rule->ctype = (unsigned char *)strdup((char *)argv[5]);
|
||||
rule->maxage = optnum(argc, argv, 6, -1);
|
||||
if(argc > 7 && strcmp((char *)argv[7], "*"))
|
||||
rule->hdrs = parsehdrs(argv[7]);
|
||||
rule->code = optnum(argc, argv, 8, 0);
|
||||
if(!rule->params
|
||||
|| (argc > 5 && strcmp((char *)argv[5], "*") && !rule->ctype)
|
||||
|| (argc > 7 && strcmp((char *)argv[7], "*") && !rule->hdrs)){
|
||||
freehttprule(rule);
|
||||
return(21);
|
||||
}
|
||||
}
|
||||
else if(!strcmp((char *)argv[1], "reply")){
|
||||
/* CODE [HEADERS], and no body at all. */
|
||||
rule->code = optnum(argc, argv, 4, 200);
|
||||
if(argc > 5 && strcmp((char *)argv[5], "*")){
|
||||
rule->hdrs = parsehdrs(argv[5]);
|
||||
if(!rule->hdrs){
|
||||
freehttprule(rule);
|
||||
return(21);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(argc > 4){
|
||||
/* What follows the URL belongs to the operation, and an operation
|
||||
such as redir reads more than one word of it. */
|
||||
int i, len = 0;
|
||||
|
||||
for(i = 4; i < argc; i++) len += (int)strlen((char *)argv[i]) + 1;
|
||||
rule->params = malloc(len);
|
||||
if(rule->params){
|
||||
int at = 0;
|
||||
|
||||
for(i = 4; i < argc; i++)
|
||||
at += sprintf((char *)rule->params + at, "%s%s",
|
||||
i > 4? " " : "", argv[i]);
|
||||
}
|
||||
if(!rule->params){
|
||||
freehttprule(rule);
|
||||
return(21);
|
||||
}
|
||||
}
|
||||
|
||||
if(rule->code && (rule->code < 100 || rule->code > 599)){
|
||||
fprintf(stderr, "Wrong http status: %d line %d\n", rule->code, linenum);
|
||||
freehttprule(rule);
|
||||
return(1);
|
||||
}
|
||||
if(rule->maxage < -1){
|
||||
fprintf(stderr, "Wrong max-age, line %d\n", linenum);
|
||||
freehttprule(rule);
|
||||
return(1);
|
||||
}
|
||||
|
||||
if(!conf.httprules) conf.httprules = rule;
|
||||
else {
|
||||
@@ -1495,7 +1598,7 @@ static int h_ace(int argc, unsigned char **argv){
|
||||
tl->ace = acl;
|
||||
|
||||
if((acl->action == COUNTIN)||(acl->action == COUNTOUT)||(acl->action == COUNTALL)) {
|
||||
unsigned long lim;
|
||||
uint64_t lim = 0;
|
||||
|
||||
tl->comment = ( char *)argv[1];
|
||||
while(isdigit(*tl->comment))tl->comment++;
|
||||
@@ -1503,9 +1606,9 @@ static int h_ace(int argc, unsigned char **argv){
|
||||
tl->comment = strdup(tl->comment);
|
||||
|
||||
sscanf((char *)argv[1], "%u", &tl->number);
|
||||
sscanf((char *)argv[3], "%lu", &lim);
|
||||
if(sscanf((char *)argv[3], "%"SCNu64"", &lim) != 1) lim = 0;
|
||||
tl->type = getrotate(*argv[2]);
|
||||
tl->traflim64 = ((uint64_t)lim)*(1024*1024);
|
||||
tl->traflim64 = lim*(1024*1024);
|
||||
if(!tl->traflim64) {
|
||||
free(tl);
|
||||
freeacl(acl);
|
||||
@@ -1801,6 +1904,9 @@ int h_server_verify(int argc, unsigned char **argv);
|
||||
int h_no_server_verify(int argc, unsigned char **argv);
|
||||
int h_client_mode(int argc, unsigned char **argv);
|
||||
#endif
|
||||
#ifdef WITH_HTTPSRV
|
||||
int h_http_content_type(int argc, unsigned char **argv);
|
||||
#endif
|
||||
#ifdef WITH_TRANSPARENT
|
||||
int h_transparent(int argc, unsigned char **argv);
|
||||
int h_notransparent(int argc, unsigned char **argv);
|
||||
@@ -1826,7 +1932,8 @@ struct commands commandhandlers[]={
|
||||
#endif
|
||||
#ifdef WITH_HTTPSRV
|
||||
{NULL, "httpsrv", h_proxy, 1, 0},
|
||||
{NULL, "http", h_http, 4, 5},
|
||||
{NULL, "http", h_http, 4, 0},
|
||||
{NULL, "http_content_type", h_http_content_type, 3, 3},
|
||||
#endif
|
||||
{NULL, "dnspr", h_proxy, 1, 0},
|
||||
{NULL, "internal", h_internal, 2, 2},
|
||||
@@ -1982,6 +2089,21 @@ int parsestr (unsigned char *str, unsigned char **argm, int nitems, unsigned cha
|
||||
argm[argc] = 0;
|
||||
return argc;
|
||||
case '$':
|
||||
/* Two dollars stand for one. That is how a literal dollar is
|
||||
written where a file to include would otherwise be read, and
|
||||
the second one is dropped here as a quote character is. */
|
||||
if(str[1] == '$'){
|
||||
str1 = str;
|
||||
do {
|
||||
*str1 = *(str1 + 1);
|
||||
}while(*(str1++));
|
||||
if(space){
|
||||
argm[argc++] = str;
|
||||
if(argc >= nitems) return argc;
|
||||
space = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if(comment){
|
||||
if(space){
|
||||
argm[argc++] = str;
|
||||
|
||||
Reference in new issue
Block a user