X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=polypath.c;h=cea465e18bbd8801e80340813d5760633021a71c;hp=82492077e9620e827bdfad014d23855bda308631;hb=60cb91a95c71273eb3bd67517464d8ed501c8f70;hpb=83e03cacb4b2380e610b3e86a11b95a295776037 diff --git a/polypath.c b/polypath.c index 8249207..cea465e 100644 --- a/polypath.c +++ b/polypath.c @@ -1,6 +1,24 @@ /* polypath * send/receive module for secnet * for multi-route setups */ +/* + * This file is part of secnet. + * See README for full list of copyright holders. + * + * secnet is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version d of the License, or + * (at your option) any later version. + * + * secnet is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * version 3 along with secnet; if not, see + * https://www.gnu.org/licenses/gpl.html. + */ #include "secnet.h" #include "util.h" @@ -31,8 +49,12 @@ struct polypath { struct buffer_if lbuf; int monitor_fd; pid_t monitor_pid; + int privsep_incoming_fd; + int privsep_ipcsock_fd; }; +static void polypath_phase_shutdown(void *sst, uint32_t newphase); + #define LG 0, st->uc.cc.cl.description, &st->uc.cc.loc static const char *const default_loopback_ifname_pats[] = { @@ -123,10 +145,10 @@ static inline bool_t matches32(uint32_t word, uint32_t prefix, int prefixlen) * and * out: */ -#define BAD(m) do{ bad(st,badctx,m,0); goto out; }while(0) -#define BADE(m,ev) do{ bad(st,badctx,m,ev); goto out; }while(0) +#define BAD(m) do{ bad(st,badctx,M_WARNING,m,0); goto out; }while(0) +#define BADE(m,ev) do{ bad(st,badctx,M_WARNING,m,ev); goto out; }while(0) typedef void bad_fn_type(struct polypath *st, void *badctx, - const char* m, int ev); + int mclass, const char* m, int ev); typedef void polypath_ppml_callback_type(struct polypath *st, bad_fn_type *bad, void *badctx, @@ -138,12 +160,13 @@ struct ppml_bad_ctx { char *undospace; }; -static void ppml_bad(struct polypath *st, void *badctx, const char *m, int ev) +static void ppml_bad(struct polypath *st, void *badctx, + int mclass, const char *m, int ev) { struct ppml_bad_ctx *bc=badctx; if (bc->undospace) *(bc->undospace)=' '; - lg_perror(LG,M_WARNING,ev, + lg_perror(LG,mclass,ev, "error processing polypath state change: %s" " (while processing `%s')", m,bc->orgl); @@ -221,6 +244,7 @@ static void polypath_process_monitor_line(struct polypath *st, char *orgl, DONT("IPv6 address is " m) DONTMASK( 100, 0, 8, "Discard-Only (RFC6666)"); DONTMASK(2001, 0, 23, "in IETF protocol block (RFC2928)"); + DONTMASK(fc00, 0, 7, "Uniqe Local unicast (RFC4193)"); #undef DONTMASK break; } @@ -317,8 +341,8 @@ static void polypath_record_ifaddr(struct polypath *st, interf->socks.n_socks=0; FILLZERO(interf->experienced_xmit_noaf); LIST_INSERT_HEAD(&st->interfs,interf,entry); - udp_socks_register(&st->uc,&interf->socks); interf->name=strdup(ifname); + udp_socks_register(&st->uc,&interf->socks,interf->name); if (!interf->name) BADE("strdup interface name",errno); found_interf: @@ -332,21 +356,24 @@ static void polypath_record_ifaddr(struct polypath *st, bool_t ok=polypath_make_socket(st,bad,badctx, us,ifname); if (!ok) goto out; } else { - FILLZERO(us->experienced); - us->fd=fd; + bool_t ok=udp_import_socket(uc,us,M_WARNING,fd); + if (!ok) goto out; fd=-1; } interf->socks.n_socks++; + lg_perror(LG,M_INFO,0,"using %s %s",ifname, + iaddr_to_string(&us->addr)); us=0; /* do not destroy this socket during `out' */ - lg_perror(LG,M_INFO,0,"using %s %s",ifname,ifaddr); } else { int i; for (i=0; isocks.n_socks; i++) - if (!memcmp(&interf->socks.socks[i].addr,ia,sizeof(*ia))) + if (iaddr_equal(&interf->socks.socks[i].addr,ia,True)) goto address_remove_found; - BAD("address to remove not found"); + bad(st,badctx,M_DEBUG,"address to remove not found",0); + goto out; address_remove_found: - lg_perror(LG,M_INFO,0,"removed %s %s",ifname,ifaddr); + lg_perror(LG,M_INFO,0,"removed %s %s",ifname, + iaddr_to_string(&interf->socks.socks[i].addr)); udp_destroy_socket(&st->uc,&interf->socks.socks[i]); interf->socks.socks[i]= interf->socks.socks[--interf->socks.n_socks]; @@ -389,6 +416,7 @@ static void subproc_problem(struct polypath *st, assert(!"not reached"); } +/* Used in non-privsep case, and in privsep child */ static void afterpoll_monitor(struct polypath *st, struct pollfd *fd, polypath_ppml_callback_type *callback) { @@ -404,6 +432,7 @@ static void afterpoll_monitor(struct polypath *st, struct pollfd *fd, subproc_problem(st,alr,emsg); } +/* Used in non-privsep case only - glue for secnet main loop */ static void polypath_afterpoll_monitor(void *state, struct pollfd *fds, int nfds) { @@ -431,8 +460,8 @@ static bool_t polypath_sendmsg(void *commst, struct buffer_if *buf, attempted=True; int r=sendto(us->fd,buf->start,buf->size, 0,&dest->ia.sa,iaddr_socklen(&dest->ia)); - udp_sock_experienced(0,&st->uc, interf->name,us, - 1,af, r,errno); + udp_sock_experienced(0,&st->uc,&interf->socks,us, + &dest->ia,af, r,errno); if (r>=0) { reasonable=True; break; @@ -453,6 +482,7 @@ static bool_t polypath_sendmsg(void *commst, struct buffer_if *buf, return allreasonable; } +/* Non-privsep: called in (sole) child. Privsep: in grandchild. */ static void child_monitor(struct polypath *st, int childfd) { dup2(childfd,1); @@ -462,6 +492,7 @@ static void child_monitor(struct polypath *st, int childfd) exit(-1); } +/* General utility function. */ static void start_subproc(struct polypath *st, void (*make_fdpair)(int[2]), void (*child)(struct polypath *st, int childfd), const char *desc) @@ -493,14 +524,276 @@ static void start_subproc(struct polypath *st, void (*make_fdpair)(int[2]), st->uc.cc.cl.description, desc, (long)st->monitor_pid); } +/* Non-privsep only: glue for forking the monitor, from the main loop */ static void polypath_phase_startmonitor(void *sst, uint32_t newphase) { struct polypath *st=sst; - start_subproc(st,pipe_cloexec,child_monitor,"interface monitor"); + start_subproc(st,pipe_cloexec,child_monitor, + "interface monitor (no privsep)"); register_for_poll(st,polypath_beforepoll, polypath_afterpoll_monitor,"polypath"); } +/*----- Privsep-only: -----*/ + +/* + * We use two subprocesses, a child and a grandchild. These are + * forked before secnet drops privilege. + * + * The grandchild is the same interface monitor helper script as used + * in the non-privsep case. But its lines are read by the child + * instead of by the main secnet. The child is responsible for + * creating the actual socket (binding it, etc.). Each socket is + * passed to secnet proper via fd passing, along with a data message + * describing the interface name and address. The child does not + * retain a list of current interfaces and addresses - it trusts the + * interface monitor to get that right. secnet proper still maintains + * that data structure. + * + * The result is that much of the non-privsep code can be reused, but + * just plumbed together differently. + * + * The child does not retain the socket after passing it on. + * Interface removals are handled similarly but without any fd. + * + * The result is that the configuration's limits on which interfaces + * and ports secnet may use are enforced by the privileged child. + */ + +struct privsep_mdata { + bool_t add; + char ifname[100]; + union iaddr ia; +}; + +static void papp_bad(struct polypath *st, void *badctx, + int mclass, const char *m, int ev) +{ + const struct privsep_mdata *mdata=(const void*)st->lbuf.start; + const char *addr_str=badctx; + + lg_perror(LG,mclass,ev, + "error processing polypath address change %s %s [%s]: %s", + mdata->add ? "+" : "-", + mdata->ifname, addr_str, m); +} + +static void polypath_afterpoll_privsep(void *state, struct pollfd *fds, + int nfds) +/* In secnet proper; receives messages from child. */ +{ + struct polypath *st=state; + + if (nfds<1) return; + + int revents=fds[0].revents; + + const char *badbit=pollbadbit(revents); + if (badbit) subproc_problem(st,async_linebuf_broken,badbit); + + if (!(revents & POLLIN)) return; + + for (;;) { + if (st->lbuf.size==sizeof(struct privsep_mdata)) { + const struct privsep_mdata *mdata=(const void*)st->lbuf.start; + if (mdata->add && st->privsep_incoming_fd<0) + fatal("polypath (privsep): got add message data but no fd"); + if (!mdata->add && st->privsep_incoming_fd>=0) + fatal("polypath (privsep): got remove message data with fd"); + if (!memchr(mdata->ifname,0,sizeof(mdata->ifname))) + fatal("polypath (privsep): got ifname with no terminating nul"); + int af=mdata->ia.sa.sa_family; + if (!(af==AF_INET6 || af==AF_INET)) + fatal("polypath (privsep): got message data but bad AF %d",af); + const char *addr_str=iaddr_to_string(&mdata->ia); + polypath_record_ifaddr(st,papp_bad,(void*)addr_str, + mdata->add,mdata->ifname,addr_str, + &mdata->ia, st->privsep_incoming_fd); + st->privsep_incoming_fd=-1; + st->lbuf.size=0; + } + struct msghdr msg; + int fd; + size_t cmsgdatalen=sizeof(fd); + char cmsg_control_buf[CMSG_SPACE(cmsgdatalen)]; + struct iovec iov; + + FILLZERO(msg); + msg.msg_iov=&iov; + msg.msg_iovlen=1; + + iov.iov_base=st->lbuf.start+st->lbuf.size; + iov.iov_len=sizeof(struct privsep_mdata)-st->lbuf.size; + + if (st->privsep_incoming_fd<0) { + msg.msg_control=cmsg_control_buf; + msg.msg_controllen=sizeof(cmsg_control_buf); + } + + ssize_t got=recvmsg(st->monitor_fd,&msg,0); + if (got<0) { + if (errno==EINTR) continue; + if (iswouldblock(errno)) break; + fatal_perror("polypath (privsep): recvmsg failed"); + } + if (got==0) + subproc_problem(st,async_linebuf_eof,0); + + st->lbuf.size+=got; + + if (msg.msg_controllen) { + size_t cmsgdatalen=sizeof(st->privsep_incoming_fd); + struct cmsghdr *h=CMSG_FIRSTHDR(&msg); + if (!(st->privsep_incoming_fd==-1 && + h && + h->cmsg_level==SOL_SOCKET && + h->cmsg_type==SCM_RIGHTS && + h->cmsg_len==CMSG_LEN(cmsgdatalen) && + !CMSG_NXTHDR(&msg,h))) + subproc_problem(st,async_linebuf_broken,"bad cmsg"); + memcpy(&st->privsep_incoming_fd,CMSG_DATA(h),cmsgdatalen); + assert(st->privsep_incoming_fd>=0); + } + + } +} + +static void privsep_handle_ifaddr(struct polypath *st, + bad_fn_type *bad, void *badctx, + bool_t add, const char *ifname, + const char *ifaddr, + const union iaddr *ia, int fd_dummy) +/* In child: handles discovered wanted interfaces, making sockets + and sending them to secnet proper. */ +{ + struct msghdr msg; + struct iovec iov; + struct udpsock us={ .fd=-1 }; + size_t cmsgdatalen=sizeof(us.fd); + char cmsg_control_buf[CMSG_SPACE(cmsgdatalen)]; + + assert(fd_dummy==-1); + + struct privsep_mdata mdata; + FILLZERO(mdata); + mdata.add=add; + + size_t l=strlen(ifname); + if (l>=sizeof(mdata.ifname)) BAD("interface name too long"); + strcpy(mdata.ifname,ifname); + + COPY_OBJ(mdata.ia,*ia); + + iov.iov_base=&mdata; + iov.iov_len =sizeof(mdata); + + FILLZERO(msg); + msg.msg_iov=&iov; + msg.msg_iovlen=1; + + if (add) { + COPY_OBJ(us.addr,*ia); + bool_t ok=polypath_make_socket(st,bad,badctx,&us,ifname); + if (!ok) goto out; + + msg.msg_control=cmsg_control_buf; + msg.msg_controllen=sizeof(cmsg_control_buf); + + struct cmsghdr *h=CMSG_FIRSTHDR(&msg); + h->cmsg_level=SOL_SOCKET; + h->cmsg_type =SCM_RIGHTS; + h->cmsg_len =CMSG_LEN(cmsgdatalen); + memcpy(CMSG_DATA(h),&us.fd,cmsgdatalen); + } + + while (iov.iov_len) { + ssize_t got=sendmsg(st->privsep_ipcsock_fd,&msg,0); + if (got<0) { + if (errno!=EINTR) fatal_perror("polypath privsep sendmsg"); + got=0; + } else { + assert(got>0); + assert((size_t)got<=iov.iov_len); + } + iov.iov_base=(char*)iov.iov_base+got; + iov.iov_len-=got; + msg.msg_control=0; + msg.msg_controllen=0; + } + + out: + if (us.fd>=0) close(us.fd); +} + +static void child_privsep(struct polypath *st, int ipcsockfd) +/* Privsep child main loop. */ +{ + struct pollfd fds[2]; + + enter_phase(PHASE_CHILDPERSIST); + + st->privsep_ipcsock_fd=ipcsockfd; + start_subproc(st,pipe_cloexec,child_monitor, + "interface monitor (grandchild)"); + for (;;) { + int nfds=1; + int r=polypath_beforepoll(st,fds,&nfds,0); + assert(nfds==1); + assert(!r); + + fds[1].fd=st->privsep_ipcsock_fd; + fds[1].events=POLLIN; + + r=poll(fds,ARRAY_SIZE(fds),-1); + + if (r<0) { + if (errno==EINTR) continue; + fatal_perror("polypath privsep poll"); + } + if (fds[1].revents) { + if (fds[1].revents & (POLLHUP|POLLIN)) { + polypath_phase_shutdown(st,PHASE_SHUTDOWN); + exit(0); + } + fatal("polypath privsep poll parent socket revents=%#x", + fds[1].revents); + } + if (fds[0].revents & POLLNVAL) + fatal("polypath privsep poll child socket POLLNVAL"); + afterpoll_monitor(st,fds,privsep_handle_ifaddr); + } +} + +static void privsep_socketpair(int *fd) +{ + int r=socketpair(AF_UNIX,SOCK_STREAM,0,fd); + if (r) fatal_perror("socketpair(AF_UNIX,SOCK_STREAM,,)"); + setcloexec(fd[0]); + setcloexec(fd[1]); +} + +static void polypath_phase_startprivsep(void *sst, uint32_t newphase) +{ + struct polypath *st=sst; + + if (!will_droppriv()) { + add_hook(PHASE_RUN, polypath_phase_startmonitor,st); + return; + } + + start_subproc(st,privsep_socketpair,child_privsep, + "socket generator (privsep interface handler)"); + + BUF_FREE(&st->lbuf); + buffer_destroy(&st->lbuf); + buffer_new(&st->lbuf,sizeof(struct privsep_mdata)); + BUF_ALLOC(&st->lbuf,"polypath mdata buf"); + st->privsep_incoming_fd=-1; + + register_for_poll(st,polypath_beforepoll, + polypath_afterpoll_privsep,"polypath"); +} + static void polypath_phase_shutdown(void *sst, uint32_t newphase) { struct polypath *st=sst; @@ -522,6 +815,8 @@ static void polypath_phase_childpersist(void *sst, uint32_t newphase) #undef BAD #undef BADE +/*----- generic closure and module setup -----*/ + static list_t *polypath_apply(closure_t *self, struct cloc loc, dict_t *context, list_t *args) { @@ -557,7 +852,8 @@ static list_t *polypath_apply(closure_t *self, struct cloc loc, st->monitor_fd=-1; st->monitor_pid=0; - add_hook(PHASE_RUN, polypath_phase_startmonitor,st); + add_hook(PHASE_GETRESOURCES, polypath_phase_startprivsep,st); + add_hook(PHASE_SHUTDOWN, polypath_phase_shutdown, st); add_hook(PHASE_CHILDPERSIST,polypath_phase_childpersist,st);