summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volume-set.c
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2016-02-03 14:32:17 +0530
committerRajesh Joseph <rjoseph@redhat.com>2016-02-09 04:34:33 -0800
commit501a31eadbce8cfe9ec0ed149bafc8fa6460ff9a (patch)
treeff9635d6890f513e9becab1832182ef2f4e31bb3 /xlators/mgmt/glusterd/src/glusterd-volume-set.c
parent12fbcd22d80be9cdd7e60341a173741d1d00f711 (diff)
uss: validate USS option features.snapshot-directory
USS option features.snapshot-directory contains only 'alphanum, -, _, .' starts with dot (.) value cannot exceed 255 characters and throws error for any other argument. Change-Id: Iad64635206ddf5599351020d99aafb3dd9d17bc1 BUG: 1168819 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/9209 Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Avra Sengupta <asengupt@redhat.com> Reviewed-by: Manikandan Selvaganesh <mselvaga@redhat.com> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volume-set.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c56
1 files changed, 55 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index ec7a19070ab..1463ef72c71 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -629,6 +629,57 @@ out:
}
static int
+validate_uss_dir (glusterd_volinfo_t *volinfo, dict_t *dict, char *key,
+ char *value, char **op_errstr)
+{
+ char errstr[2048] = "";
+ int ret = -1;
+ int i = 0;
+ xlator_t *this = NULL;
+
+ this = THIS;
+ GF_ASSERT (this);
+
+ i = strlen (value);
+ if (i > NAME_MAX) {
+ snprintf (errstr, sizeof (errstr), "value of %s exceedes %d "
+ "characters", key, NAME_MAX);
+ goto out;
+ } else if (i < 2) {
+ snprintf (errstr, sizeof (errstr), "value of %s too short, "
+ "expects atleast two characters", key);
+ goto out;
+ }
+
+ if (value[0] != '.') {
+ snprintf (errstr, sizeof (errstr), "%s expects value starting "
+ "with '.' ", key);
+ goto out;
+ }
+
+ for (i = 1; value[i]; i++) {
+ if (isalnum (value[i]) || value[i] == '_' || value[i] == '-')
+ continue;
+
+ snprintf (errstr, sizeof (errstr), "%s expects value to"
+ " contain only '0-9a-z-_'", key);
+ goto out;
+ }
+
+ ret = 0;
+out:
+ if (ret) {
+ gf_msg (this->name, GF_LOG_ERROR, EINVAL,
+ GD_MSG_INVALID_ENTRY, "%s", errstr);
+ *op_errstr = gf_strdup (errstr);
+ }
+
+ gf_msg_debug (this->name, 0, "Returning %d", ret);
+
+ return ret;
+}
+
+static int
validate_stripe (glusterd_volinfo_t *volinfo, dict_t *dict, char *key,
char *value, char **op_errstr)
{
@@ -1738,7 +1789,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.op_version = GD_OP_VERSION_3_6_0,
.value = ".snaps",
.flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT,
- .description = "Entry point directory for entering snapshot world"
+ .validate_fn = validate_uss_dir,
+ .description = "Entry point directory for entering snapshot world. "
+ "Value can have only [0-9a-z-_] and starts with "
+ "dot (.) and cannot exceed 255 character"
},
{ .key = "features.show-snapshot-directory",