bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 17:50:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

added auth support to pilergetd

Browse Source
This commit is contained in:
SJ 2013-04-09 15:15:59 +02:00
parent 8cf4a1b759
commit 163ebb7c46
5 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cfg.c
View File

@ -92,6 +92,7 @@ struct _parse_rule config_parse_rules[] =
{ "piler_header_field", "string", (void*) string_parser, offsetof(struct __config, piler_header_field), "", MAXVAL-1}, { "piler_header_field", "string", (void*) string_parser, offsetof(struct __config, piler_header_field), "", MAXVAL-1},
{ "pilergetd_listen_addr", "string", (void*) string_parser, offsetof(struct __config, pilergetd_listen_addr), "127.0.0.1", MAXVAL-1}, { "pilergetd_listen_addr", "string", (void*) string_parser, offsetof(struct __config, pilergetd_listen_addr), "127.0.0.1", MAXVAL-1},
{ "pilergetd_listen_port", "integer", (void*) int_parser, offsetof(struct __config, pilergetd_listen_port), "10091", sizeof(int)}, { "pilergetd_listen_port", "integer", (void*) int_parser, offsetof(struct __config, pilergetd_listen_port), "10091", sizeof(int)},
{ "pilergetd_password", "string", (void*) string_parser, offsetof(struct __config, pilergetd_password), "xxxxxxxxxx", MAXVAL-1},
{ "pilergetd_pidfile", "string", (void*) string_parser, offsetof(struct __config, pilergetd_pidfile), PILERGETD_PIDFILE, MAXVAL-1}, { "pilergetd_pidfile", "string", (void*) string_parser, offsetof(struct __config, pilergetd_pidfile), PILERGETD_PIDFILE, MAXVAL-1},
{ "queuedir", "string", (void*) string_parser, offsetof(struct __config, queuedir), QUEUE_DIR, MAXVAL-1}, { "queuedir", "string", (void*) string_parser, offsetof(struct __config, queuedir), QUEUE_DIR, MAXVAL-1},
{ "server_id", "integer", (void*) int_parser, offsetof(struct __config, server_id), "0", sizeof(int)}, { "server_id", "integer", (void*) int_parser, offsetof(struct __config, server_id), "0", sizeof(int)},

2
src/cfg.h
View File

@ -21,6 +21,8 @@ struct __config {
char pilergetd_listen_addr[MAXVAL]; char pilergetd_listen_addr[MAXVAL];
int pilergetd_listen_port; int pilergetd_listen_port;
char pilergetd_password[MAXVAL];
char clamd_addr[MAXVAL]; char clamd_addr[MAXVAL];
int clamd_port; int clamd_port;
char clamd_socket[MAXVAL]; char clamd_socket[MAXVAL];

28
src/retr.c
View File

@ -65,7 +65,7 @@ int stat_message(struct session_data *sdata, struct __data *data, char **buf, in
int handle_pilerget_request(int new_sd, struct __data *data, struct __config *cfg){ int handle_pilerget_request(int new_sd, struct __data *data, struct __config *cfg){
int len, n, ssl_ok=0, n_files=0; int len, n, ssl_ok=0, auth_ok=0, n_files=0;
char *q, buf[MAXBUFSIZE], puf[MAXBUFSIZE], muf[TINYBUFSIZE], resp[MAXBUFSIZE]; char *q, buf[MAXBUFSIZE], puf[MAXBUFSIZE], muf[TINYBUFSIZE], resp[MAXBUFSIZE];
char ssl_error[SMALLBUFSIZE]; char ssl_error[SMALLBUFSIZE];
struct session_data sdata; struct session_data sdata;
@ -169,7 +169,7 @@ int handle_pilerget_request(int new_sd, struct __data *data, struct __config *cf
while((n = recvtimeoutssl(new_sd, puf, MAXBUFSIZE, TIMEOUT, sdata.tls, data->ssl)) > 0){ while((n = recvtimeoutssl(new_sd, puf, MAXBUFSIZE, TIMEOUT, sdata.tls, data->ssl)) > 0){
if(strncasecmp(puf, "MESSAGE ", strlen("MESSAGE ")) == 0){ if(strncasecmp(puf, "MESSAGE ", strlen("MESSAGE ")) == 0 && auth_ok == 1){
trimBuffer(puf); trimBuffer(puf);
q = &resp[0]; q = &resp[0];
@ -184,7 +184,25 @@ int handle_pilerget_request(int new_sd, struct __data *data, struct __config *cf
} }
if(strncasecmp(puf, "STAT ", strlen("STAT ")) == 0){ if(strncasecmp(puf, "AUTH ", strlen("AUTH ")) == 0){
trimBuffer(puf);
q = &muf[0];
if(strcmp(&puf[5], cfg->pilergetd_password))
snprintf(resp, sizeof(resp)-1, "550 AUTH FAILED\r\n");
}
else {
snprintf(resp, sizeof(resp)-1, "250 AUTH\r\n");
auth_ok = 1;
}
write1(new_sd, resp, strlen(resp), sdata.tls, data->ssl);
continue;
}
if(strncasecmp(puf, "STAT ", strlen("STAT ")) == 0 && auth_ok == 1){
trimBuffer(puf); trimBuffer(puf);
q = &muf[0]; q = &muf[0];
@ -198,7 +216,7 @@ int handle_pilerget_request(int new_sd, struct __data *data, struct __config *cf
} }
if(strncasecmp(puf, "RETR ", strlen("RETR ")) == 0){ if(strncasecmp(puf, "RETR ", strlen("RETR ")) == 0 && auth_ok == 1){
trimBuffer(puf); trimBuffer(puf);
q = &muf[0]; q = &muf[0];
@ -226,7 +244,7 @@ int handle_pilerget_request(int new_sd, struct __data *data, struct __config *cf
break; break;
} }
snprintf(resp, sizeof(resp)-1, "ERR\r\n"); snprintf(resp, sizeof(resp)-1, "550 ERR INVALID COMMAND\r\n");
write1(new_sd, resp, strlen(resp), sdata.tls, data->ssl); write1(new_sd, resp, strlen(resp), sdata.tls, data->ssl);
} }

1
webui/config.php
View File

@ -12,6 +12,7 @@ $config['PILERGETD_HOST'] = '';
$config['PILERGETD_PORT'] = 10091; $config['PILERGETD_PORT'] = 10091;
$config['PILERGETD_READ_LENGTH'] = 8192; $config['PILERGETD_READ_LENGTH'] = 8192;
$config['PILERGETD_TIMEOUT'] = 5; $config['PILERGETD_TIMEOUT'] = 5;
$config['PILERGETD_PASSWORD'] = '';
$config['BRANDING_TEXT'] = ''; $config['BRANDING_TEXT'] = '';
$config['BRANDING_URL'] = ''; $config['BRANDING_URL'] = '';

4
webui/model/search/message.php
View File

@ -64,6 +64,10 @@ class ModelSearchMessage extends Model {
$l = fgets($sd, 4096); $l = fgets($sd, 4096);
fputs($sd, "AUTH " . PILERGETD_PASSWORD . "\r\n");
$l = fgets($sd, 4096);
Registry::set('sd', $sd); Registry::set('sd', $sd);
} }
} }