diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2018-03-26 20:27:34 +0530 | 
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-04-24 12:52:25 +0000 | 
| commit | fa8e792ac3ee4b30768a3b4b1e303d8fb083eb7a (patch) | |
| tree | fda7bae1e6f17b1ba2df789acd4c244ef61a1bdb | |
| parent | 755f6e986b55a6d9e11630ef70deae125660e9eb (diff) | |
shared storage: Prevent mounting shared storage from non-trusted client
gluster shared storage is a volume used for internal storage for
various features including ganesha, geo-rep, snapshot.
So this volume should not be exposed to the client, as it is
a special volume for internal use.
This fix wont't generate non trusted volfile for shared storage volume.
Change-Id: I8ffe30ae99ec05196d75466210b84db311611a4c
updates: bz#1570432
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 21 | 
1 files changed, 21 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index f2c102e7c0b..9fe3b4e16ce 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -6055,6 +6055,7 @@ generate_client_volfiles (glusterd_volinfo_t *volinfo,          int                i                  = 0;          int                ret                = -1;          char               filepath[PATH_MAX] = {0,}; +        char               *volname           = NULL;          char               *types[]           = {NULL, NULL, NULL};          dict_t             *dict              = NULL;          xlator_t           *this              = NULL; @@ -6062,6 +6063,26 @@ generate_client_volfiles (glusterd_volinfo_t *volinfo,          this = THIS; +        volname = volinfo->is_snap_volume ? +                  volinfo->parent_volname : volinfo->volname; + + +        if (volname && !strcmp (volname, GLUSTER_SHARED_STORAGE) && +             client_type != GF_CLIENT_TRUSTED) { +                /* +                 * shared storage volume cannot be mounted from non trusted +                 * nodes. So we are not creating volfiles for non-trusted +                 * clients for shared volumes as well as snapshot of shared +                 * volumes. +                 */ + +                ret = 0; +                gf_msg_debug ("glusterd", 0, "Skipping the non-trusted volfile" +                               "creation for shared storage volume. Volume %s", +                               volname); +                goto out; +        } +          enumerate_transport_reqs (volinfo->transport_type, types);          dict = dict_new ();          if (!dict)  | 
