]> git.decadent.org.uk Git - nfs-utils.git/blobdiff - utils/mountd/cache.c
statd: Replace note() with xlog() in rpc.statd
[nfs-utils.git] / utils / mountd / cache.c
index 734ddd8f5ea5d50d5493ec90c212462b5ef7480a..e4e2f228f848a458a9d6e30a3c6e02ef8b43bec1 100644 (file)
@@ -14,6 +14,7 @@
 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/stat.h>
+#include <sys/vfs.h>
 #include <time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>
+#include <mntent.h>
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
 #include "mountd.h"
 #include "xmalloc.h"
 #include "fsloc.h"
+#include "pseudoflavors.h"
 
+#ifdef USE_BLKID
 #include "blkid/blkid.h"
+#endif
 
 
 enum nfsd_fsid {
@@ -57,6 +62,7 @@ int cache_export_ent(char *domain, struct exportent *exp, char *p);
 
 char *lbuf  = NULL;
 int lbuflen = 0;
+extern int use_ipaddr;
 
 void auth_unix_ip(FILE *f)
 {
@@ -70,11 +76,14 @@ void auth_unix_ip(FILE *f)
        char *cp;
        char class[20];
        char ipaddr[20];
-       char *client;
+       char *client = NULL;
        struct in_addr addr;
+       struct hostent *he = NULL;
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
+       xlog(D_CALL, "auth_unix_ip: inbuf '%s'", lbuf);
+
        cp = lbuf;
 
        if (qword_get(&cp, class, 20) <= 0 ||
@@ -90,18 +99,23 @@ void auth_unix_ip(FILE *f)
        auth_reload();
 
        /* addr is a valid, interesting address, find the domain name... */
-       client = client_compose(addr);
-
+       if (!use_ipaddr) {
+               he = client_resolve(addr);
+               client = client_compose(he);
+       }
        
        qword_print(f, "nfsd");
        qword_print(f, ipaddr);
        qword_printint(f, time(0)+30*60);
-       if (client)
+       if (use_ipaddr)
+               qword_print(f, ipaddr);
+       else if (client)
                qword_print(f, *client?client:"DEFAULT");
        qword_eol(f);
+       xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
        if (client) free(client);
-       
+       free(he);
 }
 
 void auth_unix_gid(FILE *f)
@@ -145,12 +159,50 @@ void auth_unix_gid(FILE *f)
                qword_printint(f, ngroups);
                for (i=0; i<ngroups; i++)
                        qword_printint(f, groups[i]);
-       }
+       } else
+               qword_printint(f, 0);
        qword_eol(f);
+
        if (groups != glist)
                free(groups);
 }
 
+#if USE_BLKID
+static const char *get_uuid_blkdev(char *path)
+{
+       static blkid_cache cache = NULL;
+       struct stat stb;
+       char *devname;
+       blkid_tag_iterate iter;
+       blkid_dev dev;
+       const char *type;
+       const char *val = NULL;
+
+       if (cache == NULL)
+               blkid_get_cache(&cache, NULL);
+
+       if (stat(path, &stb) != 0)
+               return NULL;
+       devname = blkid_devno_to_devname(stb.st_dev);
+       if (!devname)
+               return NULL;
+       dev = blkid_get_dev(cache, devname, BLKID_DEV_NORMAL);
+       free(devname);
+       if (!dev)
+               return NULL;
+       iter = blkid_tag_iterate_begin(dev);
+       if (!iter)
+               return NULL;
+       while (blkid_tag_next(iter, &type, &val) == 0)
+               if (strcmp(type, "UUID") == 0)
+                       break;
+       blkid_tag_iterate_end(iter);
+       return val;
+}
+#else
+#define get_uuid_blkdev(path) (NULL)
+#endif
+
 int get_uuid(char *path, char *uuid, int uuidlen, char *u)
 {
        /* extract hex digits from uuidstr and compose a uuid
@@ -158,38 +210,22 @@ int get_uuid(char *path, char *uuid, int uuidlen, char *u)
         * a smaller uuid.  Then compare with uuid
         */
        int i = 0;
-       const char *val;
+       const char *val = NULL;
+       char fsid_val[17];
 
        if (path) {
-               static blkid_cache cache = NULL;
-               struct stat stb;
-               char *devname;
-               blkid_tag_iterate iter;
-               blkid_dev dev;
-               const char *type;
-               if (cache == NULL)
-                       blkid_get_cache(&cache, NULL);
-
-               blkid_probe_all_new(cache);
-
-               if (stat(path, &stb) != 0)
-                       return 0;
-               devname = blkid_devno_to_devname(stb.st_dev);
-               if (!devname)
-                       return 0;
-               dev = blkid_get_dev(cache, devname, BLKID_DEV_NORMAL);
-               free(devname);
-               if (!dev)
-                       return 0;
-               iter = blkid_tag_iterate_begin(dev);
-               if (!iter)
-                       return 0;
-               while (blkid_tag_next(iter, &type, &val) == 0)
-                       if (strcmp(type, "UUID") == 0)
-                               break;
-               blkid_tag_iterate_end(iter);
-               if (!type)
-                       return 0;
+               val = get_uuid_blkdev(path);
+               if (!val) {
+                       struct statfs64 st;
+
+                       if (statfs64(path, &st))
+                               return 0;
+                       if (!st.f_fsid.__val[0] && !st.f_fsid.__val[1])
+                               return 0;
+                       snprintf(fsid_val, 17, "%08x%08x",
+                                st.f_fsid.__val[0], st.f_fsid.__val[1]);
+                       val = fsid_val;
+               }
        } else {
                val = uuid;
        }
@@ -215,7 +251,31 @@ int get_uuid(char *path, char *uuid, int uuidlen, char *u)
        }
        return 1;
 }
-       
+
+/* Iterate through /etc/mtab, finding mountpoints
+ * at or below a given path
+ */
+static char *next_mnt(void **v, char *p)
+{
+       FILE *f;
+       struct mntent *me;
+       int l = strlen(p);
+       if (*v == NULL) {
+               f = setmntent("/etc/mtab", "r");
+               *v = f;
+       } else
+               f = *v;
+       while ((me = getmntent(f)) != NULL &&
+              (strncmp(me->mnt_dir, p, l) != 0 ||
+               me->mnt_dir[l] != '/'))
+               ;
+       if (me == NULL) {
+               endmntent(f);
+               *v = NULL;
+               return NULL;
+       }
+       return me->mnt_dir;
+}
 
 void nfsd_fh(FILE *f)
 {
@@ -234,6 +294,9 @@ void nfsd_fh(FILE *f)
        unsigned int fsidnum=0;
        char fsid[32];
        struct exportent *found = NULL;
+       struct hostent *he = NULL;
+       struct in_addr addr;
+       char *found_path = NULL;
        nfs_export *exp;
        int i;
        int dev_missing = 0;
@@ -243,8 +306,10 @@ void nfsd_fh(FILE *f)
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
-       cp = lbuf;
+       xlog(D_CALL, "nfsd_fh: inbuf '%s'", lbuf);
 
+       cp = lbuf;
+       
        dom = malloc(strlen(cp));
        if (dom == NULL)
                return;
@@ -328,19 +393,48 @@ void nfsd_fh(FILE *f)
 
        /* Now determine export point for this fsid/domain */
        for (i=0 ; i < MCL_MAXTYPES; i++) {
-               for (exp = exportlist[i]; exp; exp = exp->m_next) {
+               nfs_export *next_exp;
+               for (exp = exportlist[i].p_head; exp; exp = next_exp) {
                        struct stat stb;
-                       char u[16];                     
+                       char u[16];
+                       char *path;
+
+                       if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) {
+                               static nfs_export *prev = NULL;
+                               static void *mnt = NULL;
+                               
+                               if (prev == exp) {
+                                       /* try a submount */
+                                       path = next_mnt(&mnt, exp->m_export.e_path);
+                                       if (!path) {
+                                               next_exp = exp->m_next;
+                                               prev = NULL;
+                                               continue;
+                                       }
+                                       next_exp = exp;
+                               } else {
+                                       prev = exp;
+                                       mnt = NULL;
+                                       path = exp->m_export.e_path;
+                                       next_exp = exp;
+                               }
+                       } else {
+                               path = exp->m_export.e_path;
+                               next_exp = exp->m_next;
+                       }
 
-                       if (!client_member(dom, exp->m_client->m_hostname))
+                       if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname))
                                continue;
                        if (exp->m_export.e_mountpoint &&
                            !is_mountpoint(exp->m_export.e_mountpoint[0]?
                                           exp->m_export.e_mountpoint:
                                           exp->m_export.e_path))
                                dev_missing ++;
-                       if (stat(exp->m_export.e_path, &stb) != 0)
+                       if (stat(path, &stb) != 0)
+                               continue;
+                       if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
                                continue;
+                       }
                        switch(fsidtype){
                        case FSID_DEV:
                        case FSID_MAJOR_MINOR:
@@ -363,27 +457,38 @@ void nfsd_fh(FILE *f)
                                goto check_uuid;
                        case FSID_UUID8:
                        case FSID_UUID16:
-                               if (!is_mountpoint(exp->m_export.e_path))
+                               if (!is_mountpoint(path))
                                        continue;
                        check_uuid:
                                if (exp->m_export.e_uuid)
                                        get_uuid(NULL, exp->m_export.e_uuid,
                                                 uuidlen, u);
-                               else if (get_uuid(exp->m_export.e_path, NULL,
-                                                 uuidlen, u) == 0)
+                               else if (get_uuid(path, NULL, uuidlen, u) == 0)
                                        continue;
 
                                if (memcmp(u, fhuuid, uuidlen) != 0)
                                        continue;
                                break;
                        }
+                       if (use_ipaddr) {
+                               if (he == NULL) {
+                                       if (!inet_aton(dom, &addr))
+                                               goto out;
+                                       he = client_resolve(addr);
+                               }
+                               if (!client_check(exp->m_client, he))
+                                       continue;
+                       }
                        /* It's a match !! */
-                       if (!found)
+                       if (!found) {
                                found = &exp->m_export;
-                       else if (strcmp(found->e_path, exp->m_export.e_path)!= 0)
+                               found_path = strdup(path);
+                               if (found_path == NULL)
+                                       goto out;
+                       } else if (strcmp(found->e_path, exp->m_export.e_path)!= 0)
                        {
                                xlog(L_WARNING, "%s and %s have same filehandle for %s, using first",
-                                    found->e_path, exp->m_export.e_path, dom);
+                                    found_path, path, dom);
                        }
                }
        }
@@ -408,7 +513,8 @@ void nfsd_fh(FILE *f)
        }
 
        if (found)
-               cache_export_ent(dom, found, found->e_path);
+               if (cache_export_ent(dom, found, found_path) < 0)
+                       found = 0;
 
        qword_print(f, dom);
        qword_printint(f, fsidtype);
@@ -423,10 +529,15 @@ void nfsd_fh(FILE *f)
         */
        qword_printint(f, 0x7fffffff);
        if (found)
-               qword_print(f, found->e_path);
+               qword_print(f, found_path);
        qword_eol(f);
  out:
+       if (found_path)
+               free(found_path);
+       if (he)
+               free(he);
        free(dom);
+       xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL);
        return;         
 }
 
@@ -453,26 +564,51 @@ static void write_fsloc(FILE *f, struct exportent *ep, char *path)
        release_replicas(servers);
 }
 
+static void write_secinfo(FILE *f, struct exportent *ep, int flag_mask)
+{
+       struct sec_entry *p;
+
+       for (p = ep->e_secinfo; p->flav; p++)
+               ; /* Do nothing */
+       if (p == ep->e_secinfo) {
+               /* There was no sec= option */
+               return;
+       }
+       qword_print(f, "secinfo");
+       qword_printint(f, p - ep->e_secinfo);
+       for (p = ep->e_secinfo; p->flav; p++) {
+               qword_printint(f, p->flav->fnum);
+               qword_printint(f, p->flags & flag_mask);
+       }
+
+}
+
 static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *exp)
 {
        qword_print(f, domain);
        qword_print(f, path);
        qword_printint(f, time(0)+30*60);
        if (exp) {
-               qword_printint(f, exp->e_flags);
+               int different_fs = strcmp(path, exp->e_path) != 0;
+               int flag_mask = different_fs ? ~NFSEXP_FSID : ~0;
+
+               qword_printint(f, exp->e_flags & flag_mask);
                qword_printint(f, exp->e_anonuid);
                qword_printint(f, exp->e_anongid);
                qword_printint(f, exp->e_fsid);
                write_fsloc(f, exp, path);
-               if (exp->e_uuid == NULL) {
+               write_secinfo(f, exp, flag_mask);
+               if (exp->e_uuid == NULL || different_fs) {
                        char u[16];
                        if (get_uuid(path, NULL, 16, u)) {
                                qword_print(f, "uuid");
                                qword_printhex(f, u, 16);
                        }
-               } else if (exp->e_uuid) {
+               } else {
+                       char u[16];
+                       get_uuid(NULL, exp->e_uuid, 16, u);
                        qword_print(f, "uuid");
-                       qword_printhex(f, exp->e_uuid, 16);
+                       qword_printhex(f, u, 16);
                }
        }
        return qword_eol(f);
@@ -491,11 +627,15 @@ void nfsd_export(FILE *f)
        char *dom, *path;
        nfs_export *exp, *found = NULL;
        int found_type = 0;
+       struct in_addr addr;
+       struct hostent *he = NULL;
 
 
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
+       xlog(D_CALL, "nfsd_export: inbuf '%s'", lbuf);
+
        cp = lbuf;
        dom = malloc(strlen(cp));
        path = malloc(strlen(cp));
@@ -512,14 +652,48 @@ void nfsd_export(FILE *f)
 
        /* now find flags for this export point in this domain */
        for (i=0 ; i < MCL_MAXTYPES; i++) {
-               for (exp = exportlist[i]; exp; exp = exp->m_next) {
-                       if (!client_member(dom, exp->m_client->m_hostname))
+               for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
+                       if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname))
                                continue;
-                       if (strcmp(path, exp->m_export.e_path))
+                       if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) {
+                               /* if path is a mountpoint below e_path, then OK */
+                               int l = strlen(exp->m_export.e_path);
+                               if (strcmp(path, exp->m_export.e_path) == 0 ||
+                                   (strncmp(path, exp->m_export.e_path, l) == 0 &&
+                                    path[l] == '/' &&
+                                    is_mountpoint(path)))
+                                       /* ok */;
+                               else
+                                       continue;
+                       } else if (strcmp(path, exp->m_export.e_path) != 0)
                                continue;
+                       if (use_ipaddr) {
+                               if (he == NULL) {
+                                       if (!inet_aton(dom, &addr))
+                                               goto out;
+                                       he = client_resolve(addr);
+                               }
+                               if (!client_check(exp->m_client, he))
+                                       continue;
+                       }
                        if (!found) {
                                found = exp;
                                found_type = i;
+                               continue;
+                       }
+                       /* If one is a CROSSMOUNT, then prefer the longest path */
+                       if (((found->m_export.e_flags & NFSEXP_CROSSMOUNT) ||
+                            (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
+                           strlen(found->m_export.e_path) !=
+                           strlen(exp->m_export.e_path)) {
+
+                               if (strlen(exp->m_export.e_path) >
+                                   strlen(found->m_export.e_path)) {
+                                       found = exp;
+                                       found_type = i;
+                               }
+                               continue;
+
                        } else if (found_type == i && found->m_warned == 0) {
                                xlog(L_WARNING, "%s exported to both %s and %s, "
                                     "arbitrarily choosing options from first",
@@ -531,14 +705,20 @@ void nfsd_export(FILE *f)
        }
 
        if (found) {
-               dump_to_cache(f, dom, path, &found->m_export);
-               mountlist_add(dom, path);
+               if (dump_to_cache(f, dom, path, &found->m_export) < 0) {
+                       xlog(L_WARNING,
+                            "Cannot export %s, possibly unsupported filesystem"
+                            " or fsid= required", path);
+                       dump_to_cache(f, dom, path, NULL);
+               }
        } else {
                dump_to_cache(f, dom, path, NULL);
        }
  out:
+       xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
        if (dom) free(dom);
        if (path) free(path);
+       if (he) free(he);
 }
 
 
@@ -606,9 +786,13 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
                return -1;
 
        err = dump_to_cache(f, domain, exp->e_path, exp);
-       mountlist_add(domain, exp->e_path);
+       if (err) {
+               xlog(L_WARNING,
+                    "Cannot export %s, possibly unsupported filesystem or"
+                    " fsid= required", exp->e_path);
+       }
 
-       while ((exp->e_flags & NFSEXP_CROSSMOUNT) && path) {
+       while (err == 0 && (exp->e_flags & NFSEXP_CROSSMOUNT) && path) {
                /* really an 'if', but we can break out of
                 * a 'while' more easily */
                /* Look along 'path' for other filesystems
@@ -626,16 +810,17 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
                dev = stb.st_dev;
                while(path[l] == '/') {
                        char c;
-                       int err;
+                       /* errors for submount should fail whole filesystem */
+                       int err2;
 
                        l++;
                        while (path[l] != '/' && path[l])
                                l++;
                        c = path[l];
                        path[l] = 0;
-                       err = lstat(path, &stb);
+                       err2 = lstat(path, &stb);
                        path[l] = c;
-                       if (err < 0)
+                       if (err2 < 0)
                                break;
                        if (stb.st_dev == dev)
                                continue;