X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fmonitor.c;h=98cbf4a5940ba660bda50aa944f01769b0ee9ea4;hp=27c409f97abaf473a148107cf1fa49d89722e10d;hb=3419e37500dfd19cb2c246260dbd2bc0ee4704d4;hpb=2da8f89b798fc5d811fc4b252ca8ad7461d07fbd diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c index 27c409f..98cbf4a 100644 --- a/utils/statd/monitor.c +++ b/utils/statd/monitor.c @@ -7,7 +7,9 @@ * NSM for Linux. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -15,10 +17,12 @@ #include #include #include +#include #include #include "misc.h" #include "statd.h" #include "notlist.h" +#include "ha-callout.h" notify_list * rtnl = NULL; /* Run-time notify list. */ @@ -58,7 +62,7 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) */ caller = svc_getcaller(rqstp->rq_xprt)->sin_addr; if (caller.s_addr != htonl(INADDR_LOOPBACK)) { - log(L_WARNING, + note(N_WARNING, "Call to statd from non-local host %s", inet_ntoa(caller)); goto failure; @@ -77,7 +81,7 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) if (id->my_prog != 100021 || (id->my_proc != 16 && id->my_proc != 24)) { - log(L_WARNING, + note(N_WARNING, "Attempt to register callback to %d/%d", id->my_prog, id->my_proc); goto failure; @@ -87,7 +91,7 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) * Again, specific to the linux kernel lockd. */ if (!inet_aton(mon_name, &mon_addr)) { - log(L_WARNING, + note(N_WARNING, "Attempt to register host %s (not a dotted quad)", mon_name); goto failure; @@ -100,15 +104,15 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) /* must check for /'s in hostname! See CERT's CA-96.09 for details. */ if (strchr(mon_name, '/')) { - log(L_CRIT, "SM_MON request for hostname containing '/': %s", + note(N_CRIT, "SM_MON request for hostname containing '/': %s", mon_name); - log(L_CRIT, "POSSIBLE SPOOF/ATTACK ATTEMPT!"); + note(N_CRIT, "POSSIBLE SPOOF/ATTACK ATTEMPT!"); goto failure; } else if (gethostbyname(mon_name) == NULL) { - log(L_WARNING, "gethostbyname error for %s", mon_name); + note(N_WARNING, "gethostbyname error for %s", mon_name); goto failure; } else if (!(hostinfo = gethostbyname(my_name))) { - log(L_WARNING, "gethostbyname error for %s", my_name); + note(N_WARNING, "gethostbyname error for %s", my_name); goto failure; } else my_addr = *(struct in_addr *) hostinfo->h_addr; @@ -134,7 +138,7 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) NL_MY_PROG(temp) == id->my_prog && NL_MY_VERS(temp) == id->my_vers) { /* Hey! We already know you guys! */ - dprintf(L_DEBUG, + dprintf(N_DEBUG, "Duplicate SM_MON request for %s " "from procedure on %s", mon_name, my_name); @@ -153,7 +157,7 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) * doesn't fail. (I should probably fix this assumption.) */ if (!(clnt = nlist_new(my_name, mon_name, 0))) { - log(L_WARNING, "out of memory"); + note(N_WARNING, "out of memory"); goto failure; } @@ -168,25 +172,27 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) */ path=xmalloc(strlen(SM_DIR)+strlen(mon_name)+2); - sprintf(path, SM_DIR "/%s", mon_name); + sprintf(path, "%s/%s", SM_DIR, mon_name); if ((fd = open(path, O_WRONLY|O_SYNC|O_CREAT, S_IRUSR|S_IWUSR)) < 0) { /* Didn't fly. We won't monitor. */ - log(L_ERROR, "creat(%s) failed: %m", path); + note(N_ERROR, "creat(%s) failed: %s", path, strerror (errno)); nlist_free(NULL, clnt); free(path); goto failure; } free(path); + /* PRC: do the HA callout: */ + ha_callout("add-client", mon_name, my_name, -1); nlist_insert(&rtnl, clnt); close(fd); result.res_stat = STAT_SUCC; result.state = MY_STATE; - dprintf(L_DEBUG, "MONITORING %s for %s", mon_name, my_name); + dprintf(N_DEBUG, "MONITORING %s for %s", mon_name, my_name); return (&result); failure: - log(L_WARNING, "STAT_FAIL to %s for SM_MON of %s", my_name, mon_name); + note(N_WARNING, "STAT_FAIL to %s for SM_MON of %s", my_name, mon_name); return (&result); } @@ -207,12 +213,30 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp) char *mon_name = argp->mon_name, *my_name = argp->my_id.my_name; struct my_id *id = &argp->my_id; +#ifdef RESTRICTED_STATD + struct in_addr caller; +#endif result.state = MY_STATE; +#ifdef RESTRICTED_STATD + /* 1. Reject anyone not calling from 127.0.0.1. + * Ignore the my_name specified by the caller, and + * use "127.0.0.1" instead. + */ + caller = svc_getcaller(rqstp->rq_xprt)->sin_addr; + if (caller.s_addr != htonl(INADDR_LOOPBACK)) { + note(N_WARNING, + "Call to statd from non-local host %s", + inet_ntoa(caller)); + goto failure; + } + my_name = "127.0.0.1"; +#endif + /* Check if we're monitoring anyone. */ if (!(clnt = rtnl)) { - log(L_WARNING, + note(N_WARNING, "Received SM_UNMON request from %s for %s while not " "monitoring any hosts.", my_name, argp->mon_name); return (&result); @@ -230,8 +254,12 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp) NL_MY_PROG(clnt) == id->my_prog && NL_MY_VERS(clnt) == id->my_vers) { /* Match! */ - dprintf(L_DEBUG, "UNMONITORING %s for %s", + dprintf(N_DEBUG, "UNMONITORING %s for %s", mon_name, my_name); + + /* PRC: do the HA callout: */ + ha_callout("del-client", mon_name, my_name, -1); + nlist_free(&rtnl, clnt); xunlink(SM_DIR, mon_name, 1); @@ -240,7 +268,10 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp) clnt = NL_NEXT(clnt); } - log(L_WARNING, "Received erroneous SM_UNMON request from %s for %s", +#ifdef RESTRICTED_STATD + failure: +#endif + note(N_WARNING, "Received erroneous SM_UNMON request from %s for %s", my_name, mon_name); return (&result); } @@ -252,16 +283,33 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp) short int count = 0; static sm_stat result; notify_list *clnt; + char *my_name = argp->my_name; +#ifdef RESTRICTED_STATD + struct in_addr caller; + + /* 1. Reject anyone not calling from 127.0.0.1. + * Ignore the my_name specified by the caller, and + * use "127.0.0.1" instead. + */ + caller = svc_getcaller(rqstp->rq_xprt)->sin_addr; + if (caller.s_addr != htonl(INADDR_LOOPBACK)) { + note(N_WARNING, + "Call to statd from non-local host %s", + inet_ntoa(caller)); + goto failure; + } + my_name = "127.0.0.1"; +#endif result.state = MY_STATE; if (!(clnt = rtnl)) { - log(L_WARNING, "Received SM_UNMON_ALL request from %s " - "while not monitoring any hosts", argp->my_name); + note(N_WARNING, "Received SM_UNMON_ALL request from %s " + "while not monitoring any hosts", my_name); return (&result); } - while ((clnt = nlist_gethost(clnt, argp->my_name, 1))) { + while ((clnt = nlist_gethost(clnt, my_name, 1))) { if (NL_MY_PROC(clnt) == argp->my_proc && NL_MY_PROG(clnt) == argp->my_prog && NL_MY_VERS(clnt) == argp->my_vers) { @@ -269,13 +317,15 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp) char mon_name[SM_MAXSTRLEN + 1]; notify_list *temp; - dprintf(L_DEBUG, + dprintf(N_DEBUG, "UNMONITORING (SM_UNMON_ALL) %s for %s", NL_MON_NAME(clnt), NL_MY_NAME(clnt)); strncpy(mon_name, NL_MON_NAME(clnt), sizeof (mon_name) - 1); mon_name[sizeof (mon_name) - 1] = '\0'; temp = NL_NEXT(clnt); + /* PRC: do the HA callout: */ + ha_callout("del-client", mon_name, my_name, -1); nlist_free(&rtnl, clnt); xunlink(SM_DIR, mon_name, 1); ++count; @@ -285,9 +335,11 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp) } if (!count) { - dprintf(L_DEBUG, "SM_UNMON_ALL request from %s with no " - "SM_MON requests from it.", argp->my_name); + dprintf(N_DEBUG, "SM_UNMON_ALL request from %s with no " + "SM_MON requests from it.", my_name); } - +#ifdef RESTRICTED_STATD + failure: +#endif return (&result); }