X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=bde1818bd7a1598ceedb48626671b45de674e9e6;hb=b0bcb8f6b0571592a50ce039882c9319e012a270;hp=a1c7b1d0244446899fbc80c611ba2527711e76f1;hpb=ede901ab9cc82dcfe4c7c2de5212b12b2a87d270;p=netatalk.git diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index a1c7b1d0..bde1818b 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -25,25 +25,25 @@ #endif /* HAVE_SYS_STAT_H */ #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" -#ifdef FORCE_UIDGID -#warning UIDGID -#include "uid.h" -#endif /* FORCE_UIDGID */ - /* * 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 @@ -130,6 +130,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_) { @@ -292,6 +311,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); @@ -302,7 +325,8 @@ 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)) { LOG(log_error, logtype_afpd, "afp_alarm: child timed out, entering disconnected state"); - (void)dsi_disconnect(dsi); + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); return; } @@ -315,7 +339,8 @@ static void alarm_handler(int sig _U_) afp_dsi_die(EXITERR_CLNT); } LOG(log_error, logtype_afpd, "afp_alarm: connection problem, entering disconnected state"); - (void)dsi_disconnect(dsi); + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } } @@ -355,22 +380,18 @@ void afp_over_dsi(AFPObj *obj) struct sigaction action; AFPobj = obj; + dsi->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); @@ -378,13 +399,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); @@ -392,27 +406,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); @@ -420,12 +427,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) ); @@ -434,23 +435,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); @@ -496,15 +488,25 @@ void afp_over_dsi(AFPObj *obj) dsi->flags &= ~DSI_RECONSOCKET; continue; } - /* Some error on the client connection, enter disconnected state */ - (void)dsi_disconnect(dsi); /* 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); } + /* 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); + } + + /* Some error on the client connection, enter disconnected state */ + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); + pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ continue; /* continue receiving until disconnect timer expires * or a primary reconnect succeeds */ @@ -603,11 +605,6 @@ void afp_over_dsi(AFPObj *obj) dir_free_invalid_q(); -#ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - if (obj->force_uid) - restore_uidgid ( &obj->uidgid ); -#endif /* FORCE_UIDGID */ dsi->flags &= ~DSI_RUNNING; /* Add result to the AFP replay cache */ @@ -629,7 +626,8 @@ void afp_over_dsi(AFPObj *obj) if (!dsi_cmdreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) ); - (void)dsi_disconnect(dsi); + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } break; @@ -649,11 +647,6 @@ void afp_over_dsi(AFPObj *obj) AfpNum2name(function), AfpErr2name(err)); dsi->flags &= ~DSI_RUNNING; -#ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - if (obj->force_uid) - restore_uidgid ( &obj->uidgid ); -#endif /* FORCE_UIDGID */ } else { LOG(log_error, logtype_afpd, "(write) bad function %x", function); dsi->datalen = 0; @@ -662,7 +655,8 @@ void afp_over_dsi(AFPObj *obj) if (!dsi_wrtreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_wrtreply: %s", strerror(errno) ); - (void)dsi_disconnect(dsi); + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } break; @@ -679,6 +673,8 @@ void afp_over_dsi(AFPObj *obj) break; } pending_request(dsi); + + vol_fce_tm_event(); } /* error */