dany/ant-http
1
0
Fork 0
mirror of https://github.com/lxsang/ant-http synced 2025-02-24 00:52:48 +01:00
Code Issues Actions Projects Releases Wiki Activity

fix rules orders in config file

Browse Source
This commit is contained in:
Xuan Sang LE 2018-02-23 19:54:16 +01:00
parent 957a9f719f
commit 4b441b3d09
4 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
http_server.c
View File

@ -134,7 +134,7 @@ end:
antd_close(client); antd_close(client);
} }
void rule_check(association it, const char* host, const char* _url, const char* _query, char* buf) int rule_check(const char*k, const char* v, const char* host, const char* _url, const char* _query, char* buf)
{ {
// first perfom rule check on host, if not success, perform on url // first perfom rule check on host, if not success, perform on url
regmatch_t key_matches[10]; regmatch_t key_matches[10];
@ -147,16 +147,16 @@ void rule_check(association it, const char* host, const char* _url, const char*
int idx = 0; int idx = 0;
memset(rep,0,10); memset(rep,0,10);
// 1 group // 1 group
if(!host || !(ret = regex_match(it->key,host, 10, key_matches)) ) if(!host || !(ret = regex_match(k,host, 10, key_matches)) )
{ {
target = url; target = url;
ret = regex_match(it->key,url, 10, key_matches); ret = regex_match(k,url, 10, key_matches);
} }
else else
target = host; target = host;
if(!ret) return; if(!ret) return 0;
tmp = (char*) it->value; tmp = (char*) v;
char * search = "<([a-zA-Z0-9]+)>"; char * search = "<([a-zA-Z0-9]+)>";
//printf("match again %s\n",tmp); //printf("match again %s\n",tmp);
while((ret = regex_match( search,tmp, 2, val_matches))) while((ret = regex_match( search,tmp, 2, val_matches)))
@ -185,9 +185,19 @@ void rule_check(association it, const char* host, const char* _url, const char*
//break; //break;
} }
// now modify the match 2 group // now modify the match 2 group
if(idx > 0) buf[idx] = '\0'; if(idx > 0)
{
if(tmp)
{
// copy the remainning of tmp
memcpy(buf+idx, tmp, strlen(tmp));
idx += strlen(tmp);
}
buf[idx] = '\0';
}
free(url); free(url);
free(query); free(query);
return 1;
} }
/**********************************************************************/ /**********************************************************************/
/* Put the entire contents of a file out on a socket. This function /* Put the entire contents of a file out on a socket. This function
@ -413,11 +423,16 @@ char* apply_rules(const char* host, char*url)
query_string++; query_string++;
} }
//char* oldurl = strdup(url); //char* oldurl = strdup(url);
for_each_assoc(it, server_config.rules) int size = list_size(server_config.rules);
for(int i = 0; i < size; i+= 2)
{ {
char *k, *v;
k = list_at(server_config.rules, i)->value.s;
v = list_at(server_config.rules, i+1)->value.s;
// 1 group // 1 group
rule_check(it,host, url, query_string, url); if(rule_check(k, v,host, url, query_string, url)){
query_string = url; query_string = url;
while ((*query_string != '?') && (*query_string != '\0')) while ((*query_string != '?') && (*query_string != '\0'))
query_string++; query_string++;
if (*query_string == '?') if (*query_string == '?')
@ -426,6 +441,8 @@ char* apply_rules(const char* host, char*url)
query_string++; query_string++;
} }
} }
}
return strdup(query_string); return strdup(query_string);
} }
/** /**
@ -501,13 +518,13 @@ dictionary decode_request(void* client,const char* method, char* url)
} }
} }
//if(line) free(line); //if(line) free(line);
query = apply_rules(host, url);
if(strcmp(method,"GET") == 0) if(strcmp(method,"GET") == 0)
{ {
query = apply_rules(host, url);
if(host) free(host); if(host) free(host);
if(query) if(query)
{ {
LOG("Query: %s\n", query);
request = decode_url_request(query); request = decode_url_request(query);
free(query); free(query);
} }

2
http_server.h
View File

@ -33,7 +33,7 @@ void serve_file(void*, const char *);
int startup(unsigned *); int startup(unsigned *);
void unimplemented(void*); void unimplemented(void*);
void badrequest(void*); void badrequest(void*);
void rule_check(association, const char* , const char* , const char* , char*); int rule_check(const char*, const char*, const char* , const char* , const char* , char*);
void ws_confirm_request(void*, const char*); void ws_confirm_request(void*, const char*);
char* post_url_decode(void* client,int len); char* post_url_decode(void* client,int len);
dictionary decode_url_request(const char* query); dictionary decode_url_request(const char* query);

7
httpd.c
View File

@ -98,7 +98,8 @@ static int config_handler(void* conf, const char* section, const char* name,
#endif #endif
else if (strcmp(section, "RULES") == 0) else if (strcmp(section, "RULES") == 0)
{ {
dput( pconfig->rules, strdup(name),strdup(value)); list_put_s(&pconfig->rules, strdup(name));
list_put_s(&pconfig->rules, strdup(value));
} }
else if (strcmp(section, "FILEHANDLER") == 0) else if (strcmp(section, "FILEHANDLER") == 0)
{ {
@ -139,7 +140,7 @@ void load_config(const char* file)
server_config.htdocs = "htdocs"; server_config.htdocs = "htdocs";
server_config.tmpdir = "tmp"; server_config.tmpdir = "tmp";
server_config.backlog = 100; server_config.backlog = 100;
server_config.rules = dict(); server_config.rules = list_init();
server_config.handlers = dict(); server_config.handlers = dict();
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
server_config.usessl = 0; server_config.usessl = 0;
@ -161,7 +162,7 @@ void load_config(const char* file)
init_file_system(); init_file_system();
} }
void stop_serve(int dummy) { void stop_serve(int dummy) {
free(server_config.rules); list_free(&server_config.rules);
free(server_config.handlers); free(server_config.handlers);
unload_all_plugin(); unload_all_plugin();
} }

2
libs/handle.h
View File

@ -36,7 +36,7 @@ typedef struct {
char *db_path; char *db_path;
char* htdocs; char* htdocs;
char* tmpdir; char* tmpdir;
dictionary rules; list rules;
dictionary handlers; dictionary handlers;
int backlog; int backlog;
#ifdef USE_OPENSSL #ifdef USE_OPENSSL