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

smtp acl fixes

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2020-12-28 20:31:11 +01:00
parent ed8fc2a6e8
commit 1e6a4b22c1
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/defs.h
View File

@ -398,7 +398,7 @@ struct smtp_session {
char mailfrom[SMALLBUFSIZE]; char mailfrom[SMALLBUFSIZE];
char rcptto[MAX_RCPT_TO][SMALLBUFSIZE]; char rcptto[MAX_RCPT_TO][SMALLBUFSIZE];
char buf[MAXBUFSIZE]; char buf[MAXBUFSIZE];
char remote_host[INET6_ADDRSTRLEN]; char remote_host[INET6_ADDRSTRLEN+1];
time_t lasttime; time_t lasttime;
int protocol_state; int protocol_state;
int slot; int slot;

2
src/screen.c
View File

@ -227,7 +227,7 @@ void load_smtp_acl(struct smtp_acl *smtp_acl[]){
} }
int is_blocked_by_pilerscreen(struct smtp_acl *smtp_acl[], char *ipaddr, struct config *cfg){ int is_blocked_by_pilerscreen(struct smtp_acl *smtp_acl[], char *ipaddr){
struct smtp_acl *q=smtp_acl[0]; struct smtp_acl *q=smtp_acl[0];
in_addr_t addr = 0; in_addr_t addr = 0;

2
src/screen.h
View File

@ -11,6 +11,6 @@ void init_smtp_acl(struct smtp_acl *smtp_acl[]);
void clear_smtp_acl(struct smtp_acl *smtp_acl[]); void clear_smtp_acl(struct smtp_acl *smtp_acl[]);
int add_smtp_acl(struct smtp_acl *smtp_acl[], char *network_str, struct smtp_acl *acl); int add_smtp_acl(struct smtp_acl *smtp_acl[], char *network_str, struct smtp_acl *acl);
void load_smtp_acl(struct smtp_acl *smtp_acl[]); void load_smtp_acl(struct smtp_acl *smtp_acl[]);
int is_blocked_by_pilerscreen(struct smtp_acl *smtp_acl[], char *ipaddr, struct config *cfg); int is_blocked_by_pilerscreen(struct smtp_acl *smtp_acl[], char *ipaddr);
#endif /* _SCREEN_H */ #endif /* _SCREEN_H */

18
src/session.c
View File

@ -7,7 +7,7 @@
int get_session_slot(struct smtp_session **sessions, int max_connections); int get_session_slot(struct smtp_session **sessions, int max_connections);
void init_smtp_session(struct smtp_session *session, int slot, int sd, struct config *cfg); void init_smtp_session(struct smtp_session *session, int slot, int sd, char *client_addr, struct config *cfg);
int start_new_session(struct smtp_session **sessions, int socket, int *num_connections, struct smtp_acl *smtp_acl[], char *client_addr, struct config *cfg){ int start_new_session(struct smtp_session **sessions, int socket, int *num_connections, struct smtp_acl *smtp_acl[], char *client_addr, struct config *cfg){
@ -25,7 +25,7 @@ int start_new_session(struct smtp_session **sessions, int socket, int *num_conne
} }
// Check remote client against the allowed network ranges // Check remote client against the allowed network ranges
if(cfg->smtp_access_list && is_blocked_by_pilerscreen(smtp_acl, client_addr, cfg)){ if(cfg->smtp_access_list && is_blocked_by_pilerscreen(smtp_acl, client_addr)){
send(socket, SMTP_RESP_550_ERR, strlen(SMTP_RESP_550_ERR), 0); send(socket, SMTP_RESP_550_ERR, strlen(SMTP_RESP_550_ERR), 0);
close(socket); close(socket);
return -1; return -1;
@ -36,7 +36,7 @@ int start_new_session(struct smtp_session **sessions, int socket, int *num_conne
if(slot >= 0 && sessions[slot] == NULL){ if(slot >= 0 && sessions[slot] == NULL){
sessions[slot] = malloc(sizeof(struct smtp_session)); sessions[slot] = malloc(sizeof(struct smtp_session));
if(sessions[slot]){ if(sessions[slot]){
init_smtp_session(sessions[slot], slot, socket, cfg); init_smtp_session(sessions[slot], slot, socket, client_addr, cfg);
char smtp_banner[SMALLBUFSIZE]; char smtp_banner[SMALLBUFSIZE];
snprintf(smtp_banner, sizeof(smtp_banner)-1, SMTP_RESP_220_BANNER, cfg->hostid); snprintf(smtp_banner, sizeof(smtp_banner)-1, SMTP_RESP_220_BANNER, cfg->hostid);
@ -83,10 +83,7 @@ struct smtp_session *get_session_by_socket(struct smtp_session **sessions, int m
} }
void init_smtp_session(struct smtp_session *session, int slot, int sd, struct config *cfg){ void init_smtp_session(struct smtp_session *session, int slot, int sd, char *client_addr, struct config *cfg){
struct sockaddr_in addr;
socklen_t addr_size = sizeof(struct sockaddr_in);
char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
int i; int i;
session->slot = slot; session->slot = slot;
@ -112,16 +109,11 @@ void init_smtp_session(struct smtp_session *session, int slot, int sd, struct co
for(i=0; i<MAX_RCPT_TO; i++) memset(session->rcptto[i], 0, SMALLBUFSIZE); for(i=0; i<MAX_RCPT_TO; i++) memset(session->rcptto[i], 0, SMALLBUFSIZE);
memset(session->buf, 0, MAXBUFSIZE); memset(session->buf, 0, MAXBUFSIZE);
memset(session->remote_host, 0, INET6_ADDRSTRLEN); snprintf(session->remote_host, sizeof(session->remote_host)-1, "%s", client_addr);
reset_bdat_counters(session); reset_bdat_counters(session);
time(&(session->lasttime)); time(&(session->lasttime));
if(getpeername(session->net.socket, (struct sockaddr *)&addr, &addr_size) == 0 &&
getnameinfo((struct sockaddr *)&addr, addr_size, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV) == 0){
snprintf(session->remote_host, INET6_ADDRSTRLEN-1, "%s", hbuf);
}
} }