X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=ipif%2Fservice.c;h=ca02330ec621aa32616a1a746fe5bff08163a990;hb=03e3cd7d0224293624a17af7de6638cdd8659917;hp=7821a463cf84ecbab4d776e829ba8690e1639852;hpb=345c35a6361f9fb30cb4a2f613ec3ff392a0d8be;p=userv-utils.git

diff --git a/ipif/service.c b/ipif/service.c
index 7821a46..ca02330 100644
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -1,14 +1,6 @@
 /*
  * userv service (or standalone program) for per-user IP subranges.
  *
- * When invoked appropriately, it creates a point-to-point network
- * interface with specified parameters.  It arranges for packets sent out
- * via that interface by the kernel to appear on its own stdout in SLIP or
- * CSLIP encoding, and packets injected into its own stdin to be given to
- * the kernel as if received on that interface.  Optionally, additional
- * routes can be set up to arrange for traffic for other address ranges to
- * be routed through the new interface.
- *
  * This is the service program, which is invoked as root from userv (or may
  * be invoked firectly).
  *
@@ -30,7 +22,7 @@
  *
  *  The remaining arguments are supplied by the (untrusted) caller:
  *
- *  <local-addr>,<peer-addr>,<mtu>[,[<proto>]]
+ *  <local-addr>,<peer-addr>,<mtu>[,[<proto>][,[<ifnamepat>]]]
  *
  *      As for slattach.  The only supported protocol is slip.
  *      Alternatively, set to `debug' to print debugging info and
@@ -82,6 +74,9 @@
  *      service program directly (not via userv), without needing to set up
  *      permissions in /etc/userv/ipif-networks.
  *
+ *      Only `*' permits interface name patterns other than the default
+ *      value of `userv%d'.
+ *
  *   #...
  *
  *      Comment.  Blank lines are also ignored.
@@ -148,11 +143,13 @@
 static const unsigned long gidmaxval= (unsigned long)((gid_t)-2);
 static const char *const protos_ok[]= { "slip", 0 };
 static const int signals[]= { SIGHUP, SIGINT, SIGTERM, 0 };
+static const char default_ifnamepat[]= "userv%d";
 
 static const char *configstr, *proto;
 static unsigned long localaddr, peeraddr, mtu;
 static int localpming, peerpming;
-static int localallow, peerallow, allallow;
+static int localallow, peerallow, ifnameallow, allallow;
+static char *ifnamepat;
 static int nexroutes;
 static struct exroute {
   unsigned long prefix, mask;
@@ -338,7 +335,7 @@ static char *eat_optionalstr(const char **argp,
       *argp= comma + 1;
     } else {
       len= strlen(start);
-      *argp= start + len;
+      *argp= 0;
     }
   }
   if (!len) {
@@ -476,6 +473,7 @@ static void pconfig(const char *configstr, int truncated) {
   case '*':
     permit_begin();
     permit_range(0UL,0UL,1,0);
+    ifnameallow= 1;
     return;
     
   case '#':
@@ -575,7 +573,7 @@ static void parseargs(int argc, const char *const *argv) {
   mtu= eat_number(&carg,"mtu", 576,65536, ",",0);
   localallow= peerallow= 0;
 
-  char *protostr = eat_optionalstr(&carg,"protocol","slip");
+  char *protostr= eat_optionalstr(&carg,"protocol","slip");
   if (!strcmp(protostr,"debug")) {
     proto= 0;
   } else {
@@ -584,6 +582,8 @@ static void parseargs(int argc, const char *const *argv) {
 	 cprotop++);
     if (!proto) fatal("invalid protocol");
   }
+
+  ifnamepat= eat_optionalstr(&carg,"ifname pattern",default_ifnamepat);
   
   addrnet_mustdiffer("local-addr",localaddr,~0UL, "peer-addr",peeraddr,~0UL);
   
@@ -629,6 +629,14 @@ static void checkpermit(void) {
     sprintf(erwhatbuf, "route#%d", i);
     checkallow(exroutes[i].allow, erwhatbuf, exroutes[i].prefixtxt, exroutes[i].masktxt);
   }
+  if (!strcmp(ifnamepat,default_ifnamepat))
+    ifnameallow= 1;
+  if (!ifnameallow) {
+    fprintf(stderr,
+	    "userv-ipif service: access denied for interface name %s\n",
+	    ifnamepat);
+    allallow= 0;
+  }
   if (!allallow) fatal("access denied");
 }
 
@@ -691,14 +699,13 @@ static int task(const char *desc) {
 }
 
 static void createif(void) {
-  static const char ifnamepat[]= "userv%d";
   struct ifreq ifr;
   int r;
 
   memset(&ifr,0,sizeof(ifr));
   ifr.ifr_flags= IFF_TUN | IFF_NO_PI;
 
-  assert(sizeof(ifr.ifr_name) >= sizeof(ifnamepat));
+  assert(sizeof(ifr.ifr_name) >= strlen(ifnamepat)+1);
   strcpy(ifr.ifr_name, ifnamepat);
 
   tunfd= open("/dev/net/tun", O_RDWR);