X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=8b1b1a8d7ce98624b41b0e0ae8edf22eaa195a06;hb=321a0107c48da7b3fbf895a2b32244174c1ff39c;hp=96188688d88e899eb2adfd4bc774e1fb6772f4a7;hpb=dd07aea71f86aa97f05db188c49e0a3c035ee41c;p=netatalk.git diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 96188688..8b1b1a8d 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -24,21 +24,31 @@ #include #endif /* HAVE_SYS_STAT_H */ #include +#include #include -#include #include +#include +#include #include #include #include -#include +#include +#include +#include +#include +#include +#include -#include "globals.h" #include "switch.h" #include "auth.h" #include "fork.h" #include "dircache.h" +#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 @@ -65,8 +75,9 @@ static rc_elem_t replaycache[REPLAYCACHE_SIZE]; static sigjmp_buf recon_jmp; static void afp_dsi_close(AFPObj *obj) { - DSI *dsi = obj->handle; - + DSI *dsi = obj->dsi; + sigset_t sigs; + close(obj->ipc_fd); obj->ipc_fd = -1; @@ -82,9 +93,13 @@ static void afp_dsi_close(AFPObj *obj) } } - close_all_vol(); - if (obj->logout) + close_all_vol(obj); + 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); @@ -99,7 +114,7 @@ static void afp_dsi_close(AFPObj *obj) */ static void afp_dsi_die(int sig) { - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; if (dsi->flags & DSI_RECONINPROG) { /* Primary reconnect succeeded, got SIGTERM from afpd parent */ @@ -112,7 +127,7 @@ static void afp_dsi_die(int sig) exit(0); } - dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN); + dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN); afp_dsi_close(AFPobj); if (sig) /* if no signal, assume dieing because logins are disabled & don't log it (maintenance mode)*/ @@ -125,12 +140,31 @@ static void afp_dsi_die(int sig) } } +/* SIGQUIT handler */ +static void ipc_reconnect_handler(int sig _U_) +{ + DSI *dsi = (DSI *)AFPobj->dsi; + + 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; + DSI *dsi = (DSI *)AFPobj->dsi; LOG(log_debug, logtype_afpd, "afp_dsi_transfer_session: got SIGURG, trying to receive session"); @@ -181,13 +215,13 @@ static void afp_dsi_timedown(int sig _U_) { struct sigaction sv; struct itimerval it; - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->flags |= DSI_DIE; /* shutdown and don't reconnect. server going down in 5 minutes. */ setmessage("The server is going down for maintenance."); - if (dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | + if (dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | AFPATTN_MESG | AFPATTN_TIME(5)) < 0) { - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->down_request = 1; } @@ -244,17 +278,17 @@ static void afp_dsi_debug(int sig _U_) /* ---------------------- */ static void afp_dsi_getmesg (int sig _U_) { - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->msg_request = 1; - if (dsi_attention(AFPobj->handle, AFPATTN_MESG | AFPATTN_TIME(5)) < 0) + if (dsi_attention(AFPobj->dsi, AFPATTN_MESG | AFPATTN_TIME(5)) < 0) dsi->msg_request = 2; } static void alarm_handler(int sig _U_) { int err; - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; /* we have to restart the timer because some libraries may use alarm() */ setitimer(ITIMER_REAL, &dsi->timer, NULL); @@ -287,6 +321,10 @@ static void alarm_handler(int sig _U_) } 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: reconnect timer expired, goodbye"); afp_dsi_die(EXITERR_CLNT); @@ -295,20 +333,24 @@ static void alarm_handler(int sig _U_) } /* 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->proto_close(dsi); - 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); + err = dsi_tickle(AFPobj->dsi); 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->proto_close(dsi); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } } @@ -324,14 +366,14 @@ static void pending_request(DSI *dsi) if (dsi->msg_request) { if (dsi->msg_request == 2) { /* didn't send it in signal handler */ - dsi_attention(AFPobj->handle, AFPATTN_MESG | AFPATTN_TIME(5)); + dsi_attention(AFPobj->dsi, AFPATTN_MESG | AFPATTN_TIME(5)); } dsi->msg_request = 0; readmessage(AFPobj); } if (dsi->down_request) { dsi->down_request = 0; - dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | + dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | AFPATTN_MESG | AFPATTN_TIME(5)); } } @@ -341,10 +383,10 @@ static void pending_request(DSI *dsi) */ void afp_over_dsi(AFPObj *obj) { - DSI *dsi = (DSI *) obj->handle; + DSI *dsi = (DSI *) obj->dsi; int rc_idx; - u_int32_t err, cmd; - u_int8_t function; + uint32_t err, cmd; + uint8_t function; struct sigaction action; AFPobj = obj; @@ -354,16 +396,11 @@ void afp_over_dsi(AFPObj *obj) 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); @@ -371,13 +408,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); @@ -385,27 +415,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); @@ -413,12 +436,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) ); @@ -427,23 +444,14 @@ 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); @@ -473,6 +481,10 @@ void afp_over_dsi(AFPObj *obj) } } + /* 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) @@ -480,7 +492,7 @@ void afp_over_dsi(AFPObj *obj) continue; /* Blocking read on the network socket */ - cmd = dsi_receive(dsi); + cmd = dsi_stream_receive(dsi); if (cmd == 0) { /* cmd == 0 is the error condition */ @@ -489,16 +501,35 @@ void afp_over_dsi(AFPObj *obj) dsi->flags &= ~DSI_RECONSOCKET; continue; } - /* Some error on the client connection, enter disconnected state */ - dsi->flags |= DSI_DISCONNECTED; /* 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 - pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ + 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 */ + 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 */ } @@ -511,9 +542,7 @@ void afp_over_dsi(AFPObj *obj) if (reload_request) { reload_request = 0; - load_volumes(AFPobj); - dircache_dump(); - log_dircache_stat(); + load_volumes(AFPobj, closevol); } /* The first SIGINT enables debugging, the next restores the config */ @@ -521,17 +550,20 @@ 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); + setuplog(obj->options.logconfig, obj->options.logfile); else - setuplog("default log_note"); + setuplog("default:note", NULL); debugging = 0; } else { char logstr[50]; debugging = 1; - sprintf(logstr, "default log_maxdebug /tmp/afpd.%u.XXXXXX", getpid()); - setuplog(logstr); + sprintf(logstr, "/tmp/afpd.%u.XXXXXX", getpid()); + setuplog("default:maxdebug", logstr); } } @@ -569,7 +601,7 @@ void afp_over_dsi(AFPObj *obj) /* AFP replay cache */ rc_idx = dsi->clientID % REPLAYCACHE_SIZE; - LOG(log_debug, logtype_afpd, "DSI request ID: %u", dsi->clientID); + LOG(log_debug, logtype_dsi, "DSI request ID: %u", dsi->clientID); if (replaycache[rc_idx].DSIreqID == dsi->clientID && replaycache[rc_idx].AFPcommand == function) { @@ -612,11 +644,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; @@ -644,7 +675,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; @@ -661,6 +693,8 @@ void afp_over_dsi(AFPObj *obj) break; } pending_request(dsi); + + fce_pending_events(obj); } /* error */