X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=8529177d6cf85588270148e1cca524cbcb64d54a;hb=a49b66d98f3de80884b15f68285f4b602db19885;hp=0a735ea4d2ae1a0946b63d0ece3cdea8756547f8;hpb=1a6013c7ecd313e03eee1192d54bee624d4a9293;p=netatalk.git diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 0a735ea4..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 @@ -70,7 +80,8 @@ static sigjmp_buf recon_jmp; static void afp_dsi_close(AFPObj *obj) { DSI *dsi = obj->handle; - + sigset_t sigs; + close(obj->ipc_fd); obj->ipc_fd = -1; @@ -87,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); @@ -129,6 +145,25 @@ 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_) { @@ -291,6 +326,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); @@ -299,10 +338,10 @@ 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; } @@ -310,9 +349,13 @@ static void alarm_handler(int sig _U_) 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->proto_close(dsi); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } } @@ -340,34 +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; - 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); @@ -375,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); @@ -389,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); @@ -417,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) ); @@ -431,28 +437,38 @@ 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); @@ -477,6 +493,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) @@ -484,7 +504,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 */ @@ -493,16 +513,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 + + if (dsi->flags & DSI_RECONINPROG) { + LOG(log_note, logtype_afpd, "afp_over_dsi: failed reconnect"); afp_dsi_close(obj); exit(0); } - pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ + /* 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 */ } @@ -516,8 +555,6 @@ void afp_over_dsi(AFPObj *obj) if (reload_request) { reload_request = 0; load_volumes(AFPobj); - dircache_dump(); - log_dircache_stat(); } /* The first SIGINT enables debugging, the next restores the config */ @@ -525,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); @@ -573,7 +613,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) { @@ -621,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; @@ -658,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; @@ -675,6 +715,8 @@ void afp_over_dsi(AFPObj *obj) break; } pending_request(dsi); + + fce_pending_events(obj); } /* error */