From 0bd58241143e91b683a3e5c4335aabf9eed537fe Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Mon, 20 Mar 2017 05:15:25 +0530 Subject: 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. Change-Id: I007c4c6d78620a896b8858a29459a77de8b52412 BUG: 1433815 Signed-off-by: Atin Mukherjee Reviewed-on: https://review.gluster.org/16920 Tested-by: Jeff Darcy Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: MOHIT AGRAWAL --- xlators/protocol/server/src/server-handshake.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'xlators/protocol/server/src/server-handshake.c') 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) { -- cgit