bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:37:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

src: refactoring

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2017-08-08 15:34:45 +02:00
parent 5bb52be2fd
commit 950211687f
56 changed files with 1039 additions and 1524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unit_tests/check_digest.c
View File

@ -64,12 +64,12 @@ static void test_digest_file(){
}
static void test_make_digests(struct __config *cfg){
static void test_make_digests(struct config *cfg){
unsigned int i;
int j;
struct session_data sdata;
struct parser_state state;
struct __data data;
struct data data;
struct stat st;
@ -120,7 +120,7 @@ static void test_make_digests(struct __config *cfg){
int main(){
struct __config cfg;
struct config cfg;
(void) openlog("digest_test", LOG_PID, LOG_MAIL);

10
unit_tests/check_mydomains.c
View File

@ -28,7 +28,7 @@ struct emails {
};
static void fill_domain_table(struct __config *cfg){
static void fill_domain_table(struct config *cfg){
unsigned int i;
char buf[SMALLBUFSIZE];
struct session_data sdata;
@ -49,7 +49,7 @@ static void fill_domain_table(struct __config *cfg){
}
static void restore_domain_table(struct __config *cfg){
static void restore_domain_table(struct config *cfg){
unsigned int i;
char buf[SMALLBUFSIZE];
struct session_data sdata;
@ -70,10 +70,10 @@ static void restore_domain_table(struct __config *cfg){
}
static void test_mydomains(struct __config *cfg){
static void test_mydomains(struct config *cfg){
unsigned int i;
struct session_data sdata;
struct __data data;
struct data data;
struct emails emails[] = {
{"ajaja@aaaa.fu ", 1},
{"ajahahah@aaa.fu ", 0},
@ -113,7 +113,7 @@ static void test_mydomains(struct __config *cfg){
int main(){
struct __config cfg;
struct config cfg;
if(!can_i_write_directory(NULL)) __fatal("cannot write current directory!");

6
unit_tests/check_parser.c
View File

@ -25,13 +25,13 @@ struct parser_test {
};
static void test_parser(struct __config *cfg){
static void test_parser(struct config *cfg){
unsigned int i;
int j;
struct stat st;
struct session_data sdata;
struct parser_state state;
struct __data data;
struct data data;
struct parser_test tests[] = {
{"1.eml", "<ajahhdddhjdhddh@jatekokbirodalma.hu>", "játékok birodalma játékbolt hirlevel@jatekokbirodalma.hu hirlevel jatekokbirodalma hu ", "jatekokbirodalma.hu", "architerv m sj@acts.hu sj acts hu ", "acts.hu ", "", "BLACK FRIDAY - Hihetetlen kedvezmények csak 1 napig november 27-én", 2},
@ -103,7 +103,7 @@ static void test_parser(struct __config *cfg){
int main(){
struct __config cfg;
struct config cfg;
if(!can_i_write_directory(NULL)) __fatal("cannot write current directory!");

2
unit_tests/check_parser_utils.c
View File

@ -32,7 +32,7 @@ static void test_parse_date_header(){
int dst_fix = 0;
time_t t = time(NULL);
struct tm lt = {0};
struct __config cfg;
struct config cfg;
struct date_test date_test[] = {
{"Date: Mon, 02 Nov 2015 09:39:31 -0000", 1446457171},
{"Date: Mon, 2 Nov 2015 10:39:45 +0100", 1446457185},

10
unit_tests/check_rules.c
View File

@ -35,7 +35,7 @@ struct rule_query rules[] = {
};
static void fill_rule_table(struct __config *cfg){
static void fill_rule_table(struct config *cfg){
unsigned int i;
struct session_data sdata;
@ -55,7 +55,7 @@ static void fill_rule_table(struct __config *cfg){
}
static void restore_rule_table(struct __config *cfg){
static void restore_rule_table(struct config *cfg){
unsigned int i;
char buf[SMALLBUFSIZE];
struct session_data sdata;
@ -77,13 +77,13 @@ static void restore_rule_table(struct __config *cfg){
static void test_archiving_rule(struct __config *cfg){
static void test_archiving_rule(struct config *cfg){
unsigned int i;
int j;
char *rule;
struct session_data sdata;
struct parser_state state;
struct __data data;
struct data data;
struct stat st;
struct rule_test rule_test[] = {
{"1.eml", "domain=,from=hirlevel@jatekokbirodalma.hu,to=,subject=,body=,size0,att.name=,att.type=,att.size0,spam=-1", 0},
@ -157,7 +157,7 @@ static void test_archiving_rule(struct __config *cfg){
int main(){
struct __config cfg;
struct config cfg;
if(!can_i_write_directory(NULL)) __fatal("cannot write current directory!");

330
unit_tests/smtp.c
View File

@ -26,9 +26,6 @@ extern int optind;
char *testmessage = "From: aaa@aaa.fu\nTo: bela@aaa.fu\nMessage-Id: ajajajaja\nSubject: this is a test\n\nAaaaaa.";
int connect_to_smtp_server(char *server, int port, int timeout, int use_ssl, struct __data *data);
void usage(){
printf("\nusage: smtp\n\n");
printf(" -s <smtp server> SMTP server\n");
@ -39,156 +36,14 @@ void usage(){
}
void send_smtp_command(int sd, char *cmd, char *buf, int buflen, int timeout, int use_ssl, struct __data *data){
if(data == NULL || cmd == NULL) return;
printf("sent: %s", cmd);
write1(sd, cmd, strlen(cmd), use_ssl, data->ssl);
recvtimeoutssl(sd, buf, buflen, timeout, use_ssl, data->ssl);
printf("rcvd: %s", buf);
}
static void test_smtp_commands_one_at_a_time(char *server, int port, int timeout, int use_ssl, struct __data *data){
int sd;
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
sd = connect_to_smtp_server(server, port, timeout, use_ssl, data);
send_smtp_command(sd, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
send_smtp_command(sd, "MAIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
send_smtp_command(sd, "RCPT TO: <archive@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "RCPT");
send_smtp_command(sd, "DATA\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "354 ", 4) == 0 && "DATA");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\n", testmessage);
send_smtp_command(sd, sendbuf, recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "PERIOD");
send_smtp_command(sd, "QUIT\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "221 ", 4) == 0 && "QUIT");
close(sd);
}
static void test_smtp_commands_pipelining(char *server, int port, int timeout, int use_ssl, struct __data *data){
int sd;
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
sd = connect_to_smtp_server(server, port, timeout, use_ssl, data);
send_smtp_command(sd, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
send_smtp_command(sd, "MAIL FROM: <sender@aaa.fu>\r\nRCPT TO: <archive@aaa.fu>\r\nDATA\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\nQUIT\r\n", testmessage);
send_smtp_command(sd, sendbuf, recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "QUIT");
close(sd);
}
static void test_smtp_commands_with_reset_command(char *server, int port, int timeout, int use_ssl, struct __data *data){
int sd;
char recvbuf[MAXBUFSIZE];
sd = connect_to_smtp_server(server, port, timeout, use_ssl, data);
send_smtp_command(sd, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
send_smtp_command(sd, "MAIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
send_smtp_command(sd, "RSET\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "RSET");
send_smtp_command(sd, "RCPT TO: <archive@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "503 ", 4) == 0 && "RCPT");
send_smtp_command(sd, "QUIT\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "221 ", 4) == 0 && "QUIT");
close(sd);
}
static void test_smtp_commands_partial_command(char *server, int port, int timeout, int use_ssl, struct __data *data){
int sd;
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
sd = connect_to_smtp_server(server, port, timeout, use_ssl, data);
send_smtp_command(sd, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
write1(sd, "M", 1, use_ssl, data->ssl);
printf("sent: M\n");
send_smtp_command(sd, "AIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
send_smtp_command(sd, "RCPT TO: <archive@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "RCPT");
send_smtp_command(sd, "DATA\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "354 ", 4) == 0 && "DATA");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\n", testmessage);
send_smtp_command(sd, sendbuf, recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "PERIOD");
send_smtp_command(sd, "QUIT\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "221 ", 4) == 0 && "QUIT");
close(sd);
}
static void test_smtp_commands_partial_command_pipelining(char *server, int port, int timeout, int use_ssl, struct __data *data){
int sd;
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
sd = connect_to_smtp_server(server, port, timeout, use_ssl, data);
send_smtp_command(sd, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
write1(sd, "M", 1, use_ssl, data->ssl);
printf("sent: M\n");
send_smtp_command(sd, "AIL FROM: <sender@aaa.fu>\r\nRCPT TO: <archive@aaa.fu>\r\nDATA\r\n", recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\nQUIT\r\n", testmessage);
send_smtp_command(sd, sendbuf, recvbuf, sizeof(recvbuf)-1, timeout, use_ssl, data);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "QUIT");
close(sd);
}
int connect_to_smtp_server(char *server, int port, int timeout, int use_ssl, struct __data *data){
int rc, sd = -1;
void connect_to_smtp_server(char *server, int port, struct data *data){
int rc;
char port_string[8], buf[MAXBUFSIZE];
struct addrinfo hints, *res;
if(data == NULL) return sd;
data->net->socket = -1;
if(data == NULL) return;
snprintf(port_string, sizeof(port_string)-1, "%d", port);
@ -198,33 +53,179 @@ int connect_to_smtp_server(char *server, int port, int timeout, int use_ssl, str
if((rc = getaddrinfo(server, port_string, &hints, &res)) != 0){
printf("getaddrinfo for '%s': %s\n", server, gai_strerror(rc));
return sd;
return;
}
if((sd = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) == -1){
if((data->net->socket = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) == -1){
printf("cannot create socket\n");
goto ENDE;
}
if(connect(sd, res->ai_addr, res->ai_addrlen) == -1){
if(connect(data->net->socket, res->ai_addr, res->ai_addrlen) == -1){
printf("connect()\n");
goto ENDE;
}
recvtimeoutssl(sd, buf, sizeof(buf), timeout, use_ssl, data->ssl);
recvtimeoutssl(data->net, buf, sizeof(buf));
printf("rcvd: %s", buf);
ENDE:
freeaddrinfo(res);
}
return sd;
void send_smtp_command(struct net *net, char *cmd, char *buf, int buflen){
if(net == NULL || cmd == NULL) return;
if(net->socket == -1){
printf("not connected to remote host\n");
return;
}
printf("sent: %s", cmd);
write1(net, cmd, strlen(cmd));
recvtimeoutssl(net, buf, buflen);
printf("rcvd: %s", buf);
}
static void test_smtp_commands_one_at_a_time(char *server, int port, struct data *data){
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
connect_to_smtp_server(server, port, data);
send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
send_smtp_command(data->net, "MAIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
send_smtp_command(data->net, "RCPT TO: <archive@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "RCPT");
send_smtp_command(data->net, "DATA\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "354 ", 4) == 0 && "DATA");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\n", testmessage);
send_smtp_command(data->net, sendbuf, recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "PERIOD");
send_smtp_command(data->net, "QUIT\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "221 ", 4) == 0 && "QUIT");
close(data->net->socket);
}
static void test_smtp_commands_pipelining(char *server, int port, struct data *data){
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
connect_to_smtp_server(server, port, data);
send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
send_smtp_command(data->net, "MAIL FROM: <sender@aaa.fu>\r\nRCPT TO: <archive@aaa.fu>\r\nDATA\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\nQUIT\r\n", testmessage);
send_smtp_command(data->net, sendbuf, recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "QUIT");
close(data->net->socket);
}
static void test_smtp_commands_with_reset_command(char *server, int port, struct data *data){
char recvbuf[MAXBUFSIZE];
connect_to_smtp_server(server, port, data);
send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
send_smtp_command(data->net, "MAIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
send_smtp_command(data->net, "RSET\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "RSET");
send_smtp_command(data->net, "RCPT TO: <archive@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "503 ", 4) == 0 && "RCPT");
send_smtp_command(data->net, "QUIT\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "221 ", 4) == 0 && "QUIT");
close(data->net->socket);
}
static void test_smtp_commands_partial_command(char *server, int port, struct data *data){
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
connect_to_smtp_server(server, port, data);
send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
write1(data->net, "M", 1);
printf("sent: M\n");
send_smtp_command(data->net, "AIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
send_smtp_command(data->net, "RCPT TO: <archive@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "RCPT");
send_smtp_command(data->net, "DATA\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "354 ", 4) == 0 && "DATA");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\n", testmessage);
send_smtp_command(data->net, sendbuf, recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "PERIOD");
send_smtp_command(data->net, "QUIT\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "221 ", 4) == 0 && "QUIT");
close(data->net->socket);
}
static void test_smtp_commands_partial_command_pipelining(char *server, int port, struct data *data){
char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
connect_to_smtp_server(server, port, data);
send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
write1(data->net, "M", 1);
printf("sent: M\n");
send_smtp_command(data->net, "AIL FROM: <sender@aaa.fu>\r\nRCPT TO: <archive@aaa.fu>\r\nDATA\r\n", recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
snprintf(sendbuf, sizeof(sendbuf)-1, "%s\r\n.\r\nQUIT\r\n", testmessage);
send_smtp_command(data->net, sendbuf, recvbuf, sizeof(recvbuf)-1);
assert(strncmp(recvbuf, "250 ", 4) == 0 && "QUIT");
close(data->net->socket);
}
int main(int argc, char **argv){
int c, port=25, timeout=10, use_ssl;
int c, port=25;
char *server=NULL;
struct __data data;
struct data data;
struct net net;
net.timeout = 10;
net.use_ssl = 0;
net.ssl = NULL;
while(1){
@ -259,7 +260,7 @@ int main(int argc, char **argv){
break;
case 't' :
timeout = atoi(optarg);
net.timeout = atoi(optarg);
break;
case 'h' :
@ -275,14 +276,13 @@ int main(int argc, char **argv){
if(!server) usage();
use_ssl = 0;
data.ssl = NULL;
data.net = &net;
test_smtp_commands_one_at_a_time(server, port, timeout, use_ssl, &data);
test_smtp_commands_pipelining(server, port, timeout, use_ssl, &data);
test_smtp_commands_with_reset_command(server, port, timeout, use_ssl, &data);
test_smtp_commands_partial_command(server, port, timeout, use_ssl, &data);
test_smtp_commands_partial_command_pipelining(server, port, timeout, use_ssl, &data);
test_smtp_commands_one_at_a_time(server, port, &data);
test_smtp_commands_pipelining(server, port, &data);
test_smtp_commands_with_reset_command(server, port, &data);
test_smtp_commands_partial_command(server, port, &data);
test_smtp_commands_partial_command_pipelining(server, port, &data);