X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=8529177d6cf85588270148e1cca524cbcb64d54a;hp=7bb4bbc6fd18c658cf45fd83aea38fb26dda52dd;hb=a49b66d98f3de80884b15f68285f4b602db19885;hpb=3bba3fd737937b3975ae720b3d2710910214ec80 diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 7bb4bbc6..8529177d 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -24,15 +24,21 @@ #include #endif /* HAVE_SYS_STAT_H */ #include +#include #include -#include #include +#include +#include #include #include #include +#include +#include +#include +#include -#include "globals.h" +#include #include "switch.h" #include "auth.h" #include "fork.h" @@ -43,6 +49,10 @@ #include "uid.h" #endif /* FORCE_UIDGID */ +#ifndef SOL_TCP +#define SOL_TCP IPPROTO_TCP +#endif + /* * We generally pass this from afp_over_dsi to all afp_* funcs, so it should already be * available everywhere. Unfortunately some funcs (eg acltoownermode) need acces to it @@ -67,11 +77,11 @@ typedef struct { static rc_elem_t replaycache[REPLAYCACHE_SIZE]; static sigjmp_buf recon_jmp; -static int oldsock = -1; static void afp_dsi_close(AFPObj *obj) { DSI *dsi = obj->handle; - + sigset_t sigs; + close(obj->ipc_fd); obj->ipc_fd = -1; @@ -88,8 +98,13 @@ static void afp_dsi_close(AFPObj *obj) } close_all_vol(); - if (obj->logout) + + if (obj->logout) { + /* Block sigs, PAM/systemd/whoever might send us a SIG??? in (*obj->logout)() -> pam_close_session() */ + sigfillset(&sigs); + pthread_sigmask(SIG_BLOCK, &sigs, NULL); (*obj->logout)(); + } LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", dsi->read_count/1024.0, dsi->write_count/1024.0); @@ -105,16 +120,6 @@ static void afp_dsi_close(AFPObj *obj) static void afp_dsi_die(int sig) { DSI *dsi = (DSI *)AFPobj->handle; - static volatile int in_handler; - - if (in_handler) { - return; - } - /* it's not atomic but we don't care because it's an exit function - * ie if a signal is received here, between the test and the affectation, - * it will not return. - */ - in_handler = 1; if (dsi->flags & DSI_RECONINPROG) { /* Primary reconnect succeeded, got SIGTERM from afpd parent */ @@ -122,9 +127,14 @@ static void afp_dsi_die(int sig) return; /* this returns to afp_disconnect */ } + if (dsi->flags & DSI_DISCONNECTED) { + LOG(log_note, logtype_afpd, "Disconnected session terminating"); + exit(0); + } + dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN); afp_dsi_close(AFPobj); - if (sig) /* if no signal, assume dieing because logins are disabled & + if (sig) /* if no signal, assume dieing because logins are disabled & don't log it (maintenance mode)*/ LOG(log_info, logtype_afpd, "Connection terminated"); if (sig == SIGTERM || sig == SIGALRM) { @@ -135,13 +145,33 @@ static void afp_dsi_die(int sig) } } +/* SIGQUIT handler */ +static void ipc_reconnect_handler(int sig _U_) +{ + DSI *dsi = (DSI *)AFPobj->handle; + + if (reconnect_ipc(AFPobj) != 0) { + LOG(log_error, logtype_afpd, "ipc_reconnect_handler: failed IPC reconnect"); + afp_dsi_close(AFPobj); + exit(EXITERR_SYS); + } + + if (ipc_child_write(AFPobj->ipc_fd, IPC_GETSESSION, AFPobj->sinfo.clientid_len, AFPobj->sinfo.clientid) != 0) { + LOG(log_error, logtype_afpd, "ipc_reconnect_handler: failed IPC ID resend"); + afp_dsi_close(AFPobj); + exit(EXITERR_SYS); + } + LOG(log_note, logtype_afpd, "ipc_reconnect_handler: IPC reconnect done"); +} + +/* SIGURG handler (primary reconnect) */ static void afp_dsi_transfer_session(int sig _U_) { uint16_t dsiID; int socket; DSI *dsi = (DSI *)AFPobj->handle; - LOG(log_note, logtype_afpd, "afp_dsi_transfer_session: got SIGURG, trying to receive session"); + LOG(log_debug, logtype_afpd, "afp_dsi_transfer_session: got SIGURG, trying to receive session"); if (readt(AFPobj->ipc_fd, &dsiID, 2, 0, 2) != 2) { LOG(log_error, logtype_afpd, "afp_dsi_transfer_session: couldn't receive DSI id, goodbye"); @@ -155,12 +185,14 @@ static void afp_dsi_transfer_session(int sig _U_) exit(EXITERR_SYS); } - LOG(log_note, logtype_afpd, "afp_dsi_transfer_session: received socket fd: %i", socket); + LOG(log_debug, logtype_afpd, "afp_dsi_transfer_session: received socket fd: %i", socket); + dsi->proto_close(dsi); dsi->socket = socket; - dsi->flags |= DSI_RECONSOCKET; - dsi->flags &= ~DSI_DISCONNECTED; + dsi->flags = DSI_RECONSOCKET; dsi->datalen = 0; + dsi->eof = dsi->start = dsi->buffer; + dsi->in_write = 0; dsi->header.dsi_requestID = dsiID; dsi->header.dsi_command = DSIFUNC_CMD; @@ -183,12 +215,6 @@ static void afp_dsi_transfer_session(int sig _U_) siglongjmp(recon_jmp, 1); } -/* */ -static void afp_dsi_sleep(void) -{ - dsi_sleep(AFPobj->handle, 1); -} - /* ------------------- */ static void afp_dsi_timedown(int sig _U_) { @@ -275,40 +301,61 @@ static void alarm_handler(int sig _U_) /* we got some traffic from the client since the previous timer tick. */ if ((dsi->flags & DSI_DATA)) { dsi->flags &= ~DSI_DATA; - dsi->flags &= ~DSI_DISCONNECTED; - return; + return; } dsi->tickle++; + LOG(log_maxdebug, logtype_afpd, "alarm: tickles: %u, flags: %s|%s|%s|%s|%s|%s|%s|%s|%s", + dsi->tickle, + (dsi->flags & DSI_DATA) ? "DSI_DATA" : "-", + (dsi->flags & DSI_RUNNING) ? "DSI_RUNNING" : "-", + (dsi->flags & DSI_SLEEPING) ? "DSI_SLEEPING" : "-", + (dsi->flags & DSI_EXTSLEEP) ? "DSI_EXTSLEEP" : "-", + (dsi->flags & DSI_DISCONNECTED) ? "DSI_DISCONNECTED" : "-", + (dsi->flags & DSI_DIE) ? "DSI_DIE" : "-", + (dsi->flags & DSI_NOREPLY) ? "DSI_NOREPLY" : "-", + (dsi->flags & DSI_RECONSOCKET) ? "DSI_RECONSOCKET" : "-", + (dsi->flags & DSI_RECONINPROG) ? "DSI_RECONINPROG" : "-"); if (dsi->flags & DSI_SLEEPING) { if (dsi->tickle > AFPobj->options.sleep) { - LOG(log_error, logtype_afpd, "afp_alarm: sleep time ended"); + LOG(log_note, logtype_afpd, "afp_alarm: sleep time ended"); afp_dsi_die(EXITERR_CLNT); } return; } if (dsi->flags & DSI_DISCONNECTED) { + if (geteuid() == 0) { + LOG(log_note, logtype_afpd, "afp_alarm: unauthenticated user, connection problem"); + afp_dsi_die(EXITERR_CLNT); + } if (dsi->tickle > AFPobj->options.disconnected) { - LOG(log_error, logtype_afpd, "afp_alarm: no reconnect within 10 minutes, goodbye"); + LOG(log_error, logtype_afpd, "afp_alarm: reconnect timer expired, goodbye"); afp_dsi_die(EXITERR_CLNT); } return; } /* if we're in the midst of processing something, don't die. */ - if ( !(dsi->flags & DSI_RUNNING) && (dsi->tickle > AFPobj->options.timeout)) { + if (dsi->tickle >= AFPobj->options.timeout) { LOG(log_error, logtype_afpd, "afp_alarm: child timed out, entering disconnected state"); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); return; } if ((err = pollvoltime(AFPobj)) == 0) + LOG(log_debug, logtype_afpd, "afp_alarm: sending DSI tickle"); err = dsi_tickle(AFPobj->handle); if (err <= 0) { + if (geteuid() == 0) { + LOG(log_note, logtype_afpd, "afp_alarm: unauthenticated user, connection problem"); + afp_dsi_die(EXITERR_CLNT); + } LOG(log_error, logtype_afpd, "afp_alarm: connection problem, entering disconnected state"); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } } @@ -336,35 +383,17 @@ static void pending_request(DSI *dsi) } } -/* ------------------------------------------- - afp over dsi. this never returns. -*/ -void afp_over_dsi(AFPObj *obj) +void afp_over_dsi_sighandlers(AFPObj *obj) { DSI *dsi = (DSI *) obj->handle; - int rc_idx; - u_int32_t err, cmd; - u_int8_t function; struct sigaction action; - AFPobj = obj; - obj->exit = afp_dsi_die; - obj->reply = (int (*)()) dsi_cmdreply; - obj->attention = (int (*)(void *, AFPUserBytes)) dsi_attention; - obj->sleep = afp_dsi_sleep; - dsi->tickle = 0; - memset(&action, 0, sizeof(action)); + sigfillset(&action.sa_mask); + action.sa_flags = SA_RESTART; /* install SIGHUP */ action.sa_handler = afp_dsi_reload; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); - sigaddset(&action.sa_mask, SIGUSR2); - action.sa_flags = SA_RESTART; if ( sigaction( SIGHUP, &action, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); @@ -372,13 +401,6 @@ void afp_over_dsi(AFPObj *obj) /* install SIGURG */ action.sa_handler = afp_dsi_transfer_session; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); - sigaddset(&action.sa_mask, SIGUSR2); - action.sa_flags = SA_RESTART; if ( sigaction( SIGURG, &action, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); @@ -386,27 +408,20 @@ void afp_over_dsi(AFPObj *obj) /* install SIGTERM */ action.sa_handler = afp_dsi_die; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); - sigaddset(&action.sa_mask, SIGUSR2); - action.sa_flags = SA_RESTART; if ( sigaction( SIGTERM, &action, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); } - /* Added for server message support */ + /* install SIGQUIT */ + action.sa_handler = ipc_reconnect_handler; + if ( sigaction(SIGQUIT, &action, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); + afp_dsi_die(EXITERR_SYS); + } + + /* SIGUSR2 - server message support */ action.sa_handler = afp_dsi_getmesg; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGINT); - action.sa_flags = SA_RESTART; if ( sigaction( SIGUSR2, &action, NULL) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); @@ -414,12 +429,6 @@ void afp_over_dsi(AFPObj *obj) /* SIGUSR1 - set down in 5 minutes */ action.sa_handler = afp_dsi_timedown; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGINT); - sigaddset(&action.sa_mask, SIGUSR2); action.sa_flags = SA_RESTART; if ( sigaction( SIGUSR1, &action, NULL) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); @@ -428,70 +437,124 @@ void afp_over_dsi(AFPObj *obj) /* SIGINT - enable max_debug LOGging to /tmp/afpd.PID.XXXXXX */ action.sa_handler = afp_dsi_debug; - sigfillset( &action.sa_mask ); - action.sa_flags = SA_RESTART; if ( sigaction( SIGINT, &action, NULL) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); } #ifndef DEBUGGING - /* tickle handler */ + /* SIGALRM - tickle handler */ action.sa_handler = alarm_handler; - sigemptyset(&action.sa_mask); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); - sigaddset(&action.sa_mask, SIGUSR2); - action.sa_flags = SA_RESTART; if ((sigaction(SIGALRM, &action, NULL) < 0) || (setitimer(ITIMER_REAL, &dsi->timer, NULL) < 0)) { afp_dsi_die(EXITERR_SYS); } #endif /* DEBUGGING */ +} + +/* ------------------------------------------- + afp over dsi. this never returns. +*/ +void afp_over_dsi(AFPObj *obj) +{ + DSI *dsi = (DSI *) obj->handle; + int rc_idx; + u_int32_t err, cmd; + u_int8_t function; + + AFPobj = obj; + obj->exit = afp_dsi_die; + obj->reply = (int (*)()) dsi_cmdreply; + obj->attention = (int (*)(void *, AFPUserBytes)) dsi_attention; + dsi->tickle = 0; + + afp_over_dsi_sighandlers(obj); if (dircache_init(obj->options.dircachesize) != 0) afp_dsi_die(EXITERR_SYS); + /* set TCP snd/rcv buf */ + if (obj->options.tcp_rcvbuf) { + if (setsockopt(dsi->socket, + SOL_SOCKET, + SO_RCVBUF, + &obj->options.tcp_rcvbuf, + sizeof(obj->options.tcp_rcvbuf)) != 0) { + LOG(log_error, logtype_dsi, "afp_over_dsi: setsockopt(SO_RCVBUF): %s", strerror(errno)); + } + } + if (obj->options.tcp_sndbuf) { + if (setsockopt(dsi->socket, + SOL_SOCKET, + SO_SNDBUF, + &obj->options.tcp_sndbuf, + sizeof(obj->options.tcp_sndbuf)) != 0) { + LOG(log_error, logtype_dsi, "afp_over_dsi: setsockopt(SO_SNDBUF): %s", strerror(errno)); + } + } + + /* set TCP_NODELAY */ + int flag = 1; + setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag)); + /* get stuck here until the end */ while (1) { - if (sigsetjmp(recon_jmp, 1) != 0) { - LOG(log_note, logtype_afpd, "Resuming operation after succesfull primary reconnect"); - dsi->flags &= ~(DSI_RUNNING | DSI_DATA); - dsi->eof = dsi->start = dsi->buffer; - dsi->in_write = 0; + if (sigsetjmp(recon_jmp, 1) != 0) + /* returning from SIGALARM handler for a primary reconnect */ continue; - } - cmd = dsi_receive(dsi); + + /* Blocking read on the network socket */ + cmd = dsi_stream_receive(dsi); + if (cmd == 0) { + /* cmd == 0 is the error condition */ if (dsi->flags & DSI_RECONSOCKET) { /* we just got a reconnect so we immediately try again to receive on the new fd */ dsi->flags &= ~DSI_RECONSOCKET; continue; } + + /* the client sometimes logs out (afp_logout) but doesn't close the DSI session */ + if (dsi->flags & DSI_AFP_LOGGED_OUT) { + LOG(log_note, logtype_afpd, "afp_over_dsi: client logged out, terminating DSI session"); + afp_dsi_close(obj); + exit(0); + } + +#if 0 + /* got ECONNRESET in read from client => exit*/ + if (dsi->flags & DSI_GOT_ECONNRESET) { + LOG(log_note, logtype_afpd, "afp_over_dsi: client connection reset"); + afp_dsi_close(obj); + exit(0); + } +#endif + + if (dsi->flags & DSI_RECONINPROG) { + LOG(log_note, logtype_afpd, "afp_over_dsi: failed reconnect"); + afp_dsi_close(obj); + exit(0); + } + /* Some error on the client connection, enter disconnected state */ - dsi->flags |= DSI_DISCONNECTED; - pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); + + while (dsi->flags & DSI_DISCONNECTED) + pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ continue; /* continue receiving until disconnect timer expires * or a primary reconnect succeeds */ - } else { - if (oldsock != -1) { - /* Now, after successfully reading from the new socket after a reconnect * - * we can close the old socket without taking the risk of confusing the client */ - close(oldsock); - oldsock = -1; - } } - dsi->tickle = 0; - dsi_sleep(dsi, 0); /* wake up */ + if (!(dsi->flags & DSI_EXTSLEEP) && (dsi->flags & DSI_SLEEPING)) { + LOG(log_debug, logtype_afpd, "afp_over_dsi: got data, ending normal sleep"); + dsi->flags &= ~DSI_SLEEPING; + dsi->tickle = 0; + } if (reload_request) { reload_request = 0; load_volumes(AFPobj); - dircache_dump(); - log_dircache_stat(); } /* The first SIGINT enables debugging, the next restores the config */ @@ -499,6 +562,9 @@ void afp_over_dsi(AFPObj *obj) static int debugging = 0; debug_request = 0; + dircache_dump(); + uuidcache_dump(); + if (debugging) { if (obj->options.logconfig) setuplog(obj->options.logconfig); @@ -513,20 +579,24 @@ void afp_over_dsi(AFPObj *obj) } } - if (cmd == DSIFUNC_TICKLE) { - /* timer is not every 30 seconds anymore, so we don't get killed on the client side. */ - if ((dsi->flags & DSI_DIE)) - dsi_tickle(dsi); - pending_request(dsi); - continue; - } dsi->flags |= DSI_DATA; + dsi->tickle = 0; + switch(cmd) { + case DSIFUNC_CLOSE: + LOG(log_debug, logtype_afpd, "DSI: close session request"); afp_dsi_close(obj); LOG(log_note, logtype_afpd, "done"); - return; + exit(0); + + case DSIFUNC_TICKLE: + dsi->flags &= ~DSI_DATA; /* thats no data in the sense we use it in alarm_handler */ + LOG(log_debug, logtype_afpd, "DSI: client tickle"); + /* timer is not every 30 seconds anymore, so we don't get killed on the client side. */ + if ((dsi->flags & DSI_DIE)) + dsi_tickle(dsi); break; case DSIFUNC_CMD: @@ -542,12 +612,12 @@ void afp_over_dsi(AFPObj *obj) function = (u_char) dsi->commands[0]; /* AFP replay cache */ - rc_idx = REPLAYCACHE_SIZE % dsi->clientID; - LOG(log_debug, logtype_afpd, "DSI request ID: %u", dsi->clientID); + rc_idx = dsi->clientID % REPLAYCACHE_SIZE; + LOG(log_debug, logtype_dsi, "DSI request ID: %u", dsi->clientID); if (replaycache[rc_idx].DSIreqID == dsi->clientID && replaycache[rc_idx].AFPcommand == function) { - LOG(log_debug, logtype_afpd, "AFP Replay Cache match: id: %u / cmd: %s", + LOG(log_note, logtype_afpd, "AFP Replay Cache match: id: %u / cmd: %s", dsi->clientID, AfpNum2name(function)); err = replaycache[rc_idx].result; /* AFP replay cache end */ @@ -591,11 +661,10 @@ void afp_over_dsi(AFPObj *obj) if (dsi->flags & DSI_NOREPLY) { dsi->flags &= ~DSI_NOREPLY; break; - } - - if (!dsi_cmdreply(dsi, err)) { + } else if (!dsi_cmdreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) ); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } break; @@ -628,7 +697,8 @@ void afp_over_dsi(AFPObj *obj) if (!dsi_wrtreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_wrtreply: %s", strerror(errno) ); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } break; @@ -645,6 +715,8 @@ void afp_over_dsi(AFPObj *obj) break; } pending_request(dsi); + + fce_pending_events(obj); } /* error */