diff options
| author | Rajesh Amaravathi <rajesh@redhat.com> | 2011-12-06 11:35:33 +0530 | 
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2012-01-14 04:57:59 -0800 | 
| commit | 36cedb338ec1d021e189379f30100f0d983e3e01 (patch) | |
| tree | 18f6cf77cb43bccd4f31a683e80341d47c10fa66 /xlators/cluster/afr | |
| parent | 4e76cea78b11e9290b16c2faa85cf81b8e32b7ea (diff) | |
core/setxattr: prevent users from setting glusterfs xattrs
* Each xlator prevents the user from setting glusterfs-internal
xattrs like trusted.gfid by handling it in respective setxattr
functions. The speacial case of trusted.gfid is handled in
fuse (Not in posix because posix_setxattr is used to set gfid).
* For xlators which did not define setxattr and/or fsetxattr,
the functions have been implemented with appropriate checks.
xlator         |     fops-added
_______________|__________________________
               |
1. afr         |     fsetxattr
2. stripe      |     setxatrr and fsetxattr
3. quota       |     setxattr and fsetxattr
Change-Id: Ib62abb7067415b23a708002f884d30e8866fbf48
BUG: 765487
Signed-off-by: Rajesh Amaravathi <rajesh@redhat.com>
Reviewed-on: http://review.gluster.com/685
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amar@gluster.com>
Diffstat (limited to 'xlators/cluster/afr')
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 5 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-inode-write.c | 227 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-inode-write.h | 6 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.c | 1 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 5 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/pump.c | 7 | 
6 files changed, 233 insertions, 18 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 22b30fdfa..c247d56b7 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -940,6 +940,11 @@ afr_local_cleanup (afr_local_t *local, xlator_t *this)                          dict_unref (local->cont.setxattr.dict);          } +        { /* fsetxattr */ +                if (local->cont.fsetxattr.dict) +                        dict_unref (local->cont.fsetxattr.dict); +        } +          { /* removexattr */                  GF_FREE (local->cont.removexattr.name);          } diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c index 48094931f..cd6ba5e7d 100644 --- a/xlators/cluster/afr/src/afr-inode-write.c +++ b/xlators/cluster/afr/src/afr-inode-write.c @@ -1355,8 +1355,8 @@ afr_setxattr_unwind (call_frame_t *frame, xlator_t *this)          if (main_frame) {                  AFR_STACK_UNWIND (setxattr, main_frame, -                                  local->op_ret, local->op_errno) -                        } +                                  local->op_ret, local->op_errno); +        }          return 0;  } @@ -1365,10 +1365,10 @@ int  afr_setxattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                         int32_t op_ret, int32_t op_errno)  { -        afr_local_t *   local = NULL; -        afr_private_t * priv  = NULL; -        int call_count  = -1; -        int need_unwind = 0; +        afr_local_t      *local         = NULL; +        afr_private_t    *priv          = NULL; +        int               call_count    = -1; +        int               need_unwind   = 0;          local = frame->local;          priv = this->private; @@ -1406,10 +1406,10 @@ afr_setxattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,  int  afr_setxattr_wind (call_frame_t *frame, xlator_t *this)  { -        afr_local_t *local = NULL; -        afr_private_t *priv = NULL; -        int call_count = -1; -        int i = 0; +        afr_local_t      *local         = NULL; +        afr_private_t    *priv          = NULL; +        int               call_count    = -1; +        int               i             = 0;          local = frame->local;          priv = this->private; @@ -1446,7 +1446,7 @@ afr_setxattr_wind (call_frame_t *frame, xlator_t *this)  int  afr_setxattr_done (call_frame_t *frame, xlator_t *this)  { -        afr_local_t * local = frame->local; +        afr_local_t   *local    = frame->local;          local->transaction.unwind (frame, this); @@ -1459,16 +1459,23 @@ int  afr_setxattr (call_frame_t *frame, xlator_t *this,                loc_t *loc, dict_t *dict, int32_t flags)  { -        afr_private_t * priv  = NULL; -        afr_local_t   * local = NULL; +        afr_private_t  *priv              = NULL; +        afr_local_t    *local             = NULL;          call_frame_t   *transaction_frame = NULL; -        int ret = -1; -        int op_errno = 0; +        data_pair_t    *trav              = NULL; +        int             ret               = -1; +        int             op_errno          = EINVAL;          VALIDATE_OR_GOTO (frame, out);          VALIDATE_OR_GOTO (this, out);          VALIDATE_OR_GOTO (this->private, out); +        GF_IF_INTERNAL_XATTR_GOTO ("trusted.afr.*", dict, +                                   trav, op_errno, out); + +        GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.afr.*", dict, +                                   trav, op_errno, out); +          priv = this->private;          QUORUM_CHECK(setxattr,out); @@ -1511,6 +1518,196 @@ out:          return 0;  } +/* {{{ fsetxattr */ + + +int +afr_fsetxattr_unwind (call_frame_t *frame, xlator_t *this) +{ +        afr_local_t    *local         = NULL; +        call_frame_t   *main_frame    = NULL; + +        local = frame->local; + +        LOCK (&frame->lock); +        { +                if (local->transaction.main_frame) +                        main_frame = local->transaction.main_frame; +                local->transaction.main_frame = NULL; +        } +        UNLOCK (&frame->lock); + +        if (main_frame) { +                AFR_STACK_UNWIND (fsetxattr, main_frame, +                                  local->op_ret, local->op_errno); +        } +        return 0; +} + + +int +afr_fsetxattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this, +                        int32_t op_ret, int32_t op_errno) +{ +        afr_local_t     *local       = NULL; +        afr_private_t   *priv        = NULL; +        int              call_count  = -1; +        int              need_unwind = 0; + +        local = frame->local; +        priv = this->private; + +        LOCK (&frame->lock); +        { +                if (op_ret != -1) { +                        if (local->success_count == 0) { +                                local->op_ret = op_ret; +                        } +                        local->success_count++; + +                        if (local->success_count == priv->child_count) { +                                need_unwind = 1; +                        } +                } + +                local->op_errno = op_errno; +        } +        UNLOCK (&frame->lock); + +        if (need_unwind) +                local->transaction.unwind (frame, this); + +        call_count = afr_frame_return (frame); + +        if (call_count == 0) { +                local->transaction.resume (frame, this); +        } + +        return 0; +} + + +int +afr_fsetxattr_wind (call_frame_t *frame, xlator_t *this) +{ +        afr_local_t        *local       = NULL; +        afr_private_t      *priv        = NULL; +        int                 call_count  = -1; +        int                 i           = 0; + +        local = frame->local; +        priv = this->private; + +        call_count = afr_pre_op_done_children_count (local->transaction.pre_op, +                                                     priv->child_count); + +        if (call_count == 0) { +                local->transaction.resume (frame, this); +                return 0; +        } + +        local->call_count = call_count; + +        for (i = 0; i < priv->child_count; i++) { +                if (local->transaction.pre_op[i]) { +                        STACK_WIND_COOKIE (frame, afr_fsetxattr_wind_cbk, +                                           (void *) (long) i, +                                           priv->children[i], +                                           priv->children[i]->fops->fsetxattr, +                                           local->fd, +                                           local->cont.fsetxattr.dict, +                                           local->cont.fsetxattr.flags); + +                        if (!--call_count) +                                break; +                } +        } + +        return 0; +} + + +int +afr_fsetxattr_done (call_frame_t *frame, xlator_t *this) +{ +        afr_local_t   *local   = frame->local; + +        local->transaction.unwind (frame, this); + +        AFR_STACK_DESTROY (frame); + +        return 0; +} + +int +afr_fsetxattr (call_frame_t *frame, xlator_t *this, +               fd_t *fd, dict_t *dict, int32_t flags) +{ +        afr_private_t    *priv              = NULL; +        afr_local_t      *local             = NULL; +        call_frame_t     *transaction_frame = NULL; +        int               ret               = -1; +        int               op_errno          = EINVAL; +        data_pair_t      *trav              = NULL; + +        VALIDATE_OR_GOTO (frame, out); +        VALIDATE_OR_GOTO (this, out); +        VALIDATE_OR_GOTO (this->private, out); + +        GF_IF_INTERNAL_XATTR_GOTO ("trusted.afr.*", dict, +                                   trav, op_errno, out); + +        GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.afr.*", dict, +                                   trav, op_errno, out); + +        if (ret) +                goto out; + +        priv = this->private; + +        QUORUM_CHECK(fsetxattr,out); + +        ALLOC_OR_GOTO (local, afr_local_t, out); + +        ret = afr_local_init (local, priv, &op_errno); +        if (ret < 0) +                goto out; + +        transaction_frame = copy_frame (frame); +        if (!transaction_frame) { +                goto out; +        } + +        transaction_frame->local = local; + +        local->op_ret = -1; + +        local->cont.fsetxattr.dict  = dict_ref (dict); +        local->cont.fsetxattr.flags = flags; + +        local->transaction.fop    = afr_fsetxattr_wind; +        local->transaction.done   = afr_fsetxattr_done; +        local->transaction.unwind = afr_fsetxattr_unwind; + +        local->fd                 = fd_ref (fd); + +        local->transaction.main_frame = frame; +        local->transaction.start  = LLONG_MAX - 1; +        local->transaction.len    = 0; + +        afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION); + +        ret = 0; +out: +        if (ret < 0) { +                if (transaction_frame) +                        AFR_STACK_DESTROY (transaction_frame); +                AFR_STACK_UNWIND (fsetxattr, frame, -1, op_errno); +        } + +        return 0; +} +  /* }}} */  /* {{{ removexattr */ diff --git a/xlators/cluster/afr/src/afr-inode-write.h b/xlators/cluster/afr/src/afr-inode-write.h index f9aa7bd36..a2c3520f9 100644 --- a/xlators/cluster/afr/src/afr-inode-write.h +++ b/xlators/cluster/afr/src/afr-inode-write.h @@ -63,7 +63,11 @@ afr_fsetattr (call_frame_t *frame, xlator_t *this,  int32_t  afr_setxattr (call_frame_t *frame, xlator_t *this, -	      loc_t *loc, dict_t *dict, int32_t flags); +              loc_t *loc, dict_t *dict, int32_t flags); + +int32_t +afr_fsetxattr (call_frame_t *frame, xlator_t *this, +               fd_t *fd, dict_t *dict, int32_t flags);  int32_t  afr_removexattr (call_frame_t *frame, xlator_t *this, diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index f3c3e7e7a..22be68a65 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -396,6 +396,7 @@ struct xlator_fops fops = {          .truncate    = afr_truncate,          .ftruncate   = afr_ftruncate,          .setxattr    = afr_setxattr, +        .fsetxattr   = afr_fsetxattr,          .setattr     = afr_setattr,          .fsetattr    = afr_fsetattr,          .removexattr = afr_removexattr, diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 8568f1fd8..544c91424 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -550,6 +550,11 @@ typedef struct _afr_local {                  } setxattr;                  struct { +                        dict_t *dict; +                        int32_t flags; +                } fsetxattr; + +                struct {                          char *name;                  } removexattr; diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c index 1814c8b9d..8044fb85b 100644 --- a/xlators/cluster/afr/src/pump.c +++ b/xlators/cluster/afr/src/pump.c @@ -20,6 +20,7 @@  #include <unistd.h>  #include <sys/time.h>  #include <stdlib.h> +#include <fnmatch.h>  #ifndef _CONFIG_H  #define _CONFIG_H @@ -1642,15 +1643,17 @@ pump_setxattr (call_frame_t *frame, xlator_t *this,  	afr_private_t * priv  = NULL;  	afr_local_t   * local = NULL;  	call_frame_t   *transaction_frame = NULL; - +        data_pair_t   * trav  = NULL;  	int ret = -1; -  	int op_errno = 0;  	VALIDATE_OR_GOTO (frame, out);  	VALIDATE_OR_GOTO (this, out);  	VALIDATE_OR_GOTO (this->private, out); +        GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.pump*", dict, +                                   trav, op_errno, out); +  	priv = this->private;          if (!priv->use_afr_in_pump) {                  STACK_WIND (frame, default_setxattr_cbk,  | 
