diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2017-03-20 05:15:25 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-03-30 10:06:31 -0400 |
| commit | bbf83e34d78e064befe816edf71a9ee5c2c5c209 (patch) | |
| tree | bdc98f13e2fa65f26bda0c3148af692fcb2c8f99 /xlators/protocol/server/src/server-handshake.c | |
| parent | 061b83ec4101e3ecc188038141212cde75656977 (diff) | |
protocol : fix auth-allow regression
One of the brick multiplexing patches (commit 1a95fc3) had some changes
in gf_auth () & server_setvolume () functions which caused auth-allow
feature to be broken. mount doesn't succeed even if it's part of the
auth-allow list. This fix does the following:
1. Reintroduce the peer-info data back in gf_auth () so that fnmatch has
valid input and it can decide on the result.
2. config-params dict should capture key values pairs for all the bricks
in case brick multiplexing is on. In case brick multiplexing isn't
enabled, then config-params should carry attributes from protocol/server
such that all rpc auth related attributes stay in tact in the
dictionary.
>Reviewed-on: https://review.gluster.org/16920
>Tested-by: Jeff Darcy <jeff@pl.atyp.us>
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
>Reviewed-by: MOHIT AGRAWAL <moagrawa@redhat.com>
>(cherry picked from commit 0bd58241143e91b683a3e5c4335aabf9eed537fe)
Change-Id: I007c4c6d78620a896b8858a29459a77de8b52412
BUG: 1429117
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://review.gluster.org/16967
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'xlators/protocol/server/src/server-handshake.c')
| -rw-r--r-- | xlators/protocol/server/src/server-handshake.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index 249dde7de76..64267f2aef9 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -425,6 +425,10 @@ server_setvolume (rpcsvc_request_t *req) } this = req->svc->xl; + /* this is to ensure config_params is populated with the first brick + * details at first place if brick multiplexing is enabled + */ + config_params = dict_copy_with_ref (this->options, NULL); buf = memdup (args.dict.dict_val, args.dict.dict_len); if (buf == NULL) { @@ -484,7 +488,7 @@ server_setvolume (rpcsvc_request_t *req) goto fail; } - config_params = dict_copy_with_ref (xl->options, NULL); + config_params = dict_copy_with_ref (xl->options, config_params); conf = this->private; if (conf->parent_up == _gf_false) { |