diff options
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handshake.c | 49 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 14 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.h | 3 |
3 files changed, 66 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index da3a01c99f8..7971f12bdac 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -881,6 +881,43 @@ out: return ret; } +/* Validate if glusterd can serve the management handshake request + * + * Requests are allowed if, + * - glusterd has no peers, or + * - the request came from a known peer + */ +gf_boolean_t +gd_validate_mgmt_hndsk_req (rpcsvc_request_t *req) +{ + int ret = -1; + char hostname[UNIX_PATH_MAX + 1] = {0,}; + glusterd_peerinfo_t *peer = NULL; + xlator_t *this = NULL; + + this = THIS; + GF_ASSERT (this); + + if (!glusterd_have_peers ()) + return _gf_true; + + /* If you cannot get the hostname, you cannot authenticate */ + ret = glusterd_remote_hostname_get (req, hostname, sizeof (hostname)); + if (ret) + return _gf_false; + + peer = glusterd_peerinfo_find (NULL, hostname); + if (peer == NULL) { + ret = -1; + gf_log (this->name, GF_LOG_ERROR, "Rejecting management " + "handshake request from unknown peer %s", + req->trans->peerinfo.identifier); + return _gf_false; + } + + return _gf_true; +} + int __glusterd_mgmt_hndsk_versions (rpcsvc_request_t *req) { @@ -895,6 +932,12 @@ __glusterd_mgmt_hndsk_versions (rpcsvc_request_t *req) this = THIS; conf = this->private; + /* Check if we can service the request */ + if (!gd_validate_mgmt_hndsk_req (req)) { + ret = -1; + goto out; + } + ret = xdr_to_generic (req->msg[0], &args, (xdrproc_t)xdr_gf_mgmt_hndsk_req); if (ret < 0) { @@ -979,6 +1022,12 @@ __glusterd_mgmt_hndsk_versions_ack (rpcsvc_request_t *req) this = THIS; conf = this->private; + /* Check if we can service the request */ + if (!gd_validate_mgmt_hndsk_req (req)) { + ret = -1; + goto out; + } + ret = xdr_to_generic (req->msg[0], &args, (xdrproc_t)xdr_gf_mgmt_hndsk_req); if (ret < 0) { diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 375e58e3e87..34d59e1d225 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -13944,3 +13944,17 @@ glusterd_check_client_op_version_support (char *volname, uint32_t op_version, } return 0; } + +gf_boolean_t +glusterd_have_peers () +{ + xlator_t *this = NULL; + glusterd_conf_t *conf = NULL; + + this = THIS; + GF_ASSERT (this); + conf = this->private; + GF_ASSERT (conf); + + return !list_empty (&conf->peers); +} diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 887e89661f4..605d7e05124 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -912,4 +912,7 @@ glusterd_get_default_val_for_volopt (dict_t *dict, gf_boolean_t all_opts, int glusterd_check_client_op_version_support (char *volname, uint32_t op_version, char **op_errstr); + +gf_boolean_t +glusterd_have_peers (); #endif |