summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorAvra Sengupta <asengupt@redhat.com>2015-04-06 14:13:09 +0530
committerVijay Bellur <vbellur@redhat.com>2015-04-07 06:37:32 -0700
commit6816c7d46630747dd76cdd9ff90eab77e1e4f95c (patch)
tree833cbf8f29155259506b662f32a925c2ef42b9c1 /extras
parentaa0befea352402922839dd846c798c0da2afd271 (diff)
snapshot/scheduler: Check the correctness of Jobname and Volname
Check for the correctness of Jobname and Volname. They should not be empty, and should contain only one word. If this condition is met, the rest of the whitespaces are also striped, before processing the command. Change-Id: I2c9503ab86456e0f4b37e31d483ee8b2d0b0e1af BUG: 1209120 Signed-off-by: Avra Sengupta <asengupt@redhat.com> Reviewed-on: http://review.gluster.org/10137 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Aravinda VK <avishwan@redhat.com> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/snap_scheduler/snap_scheduler.py27
1 files changed, 27 insertions, 0 deletions
diff --git a/extras/snap_scheduler/snap_scheduler.py b/extras/snap_scheduler/snap_scheduler.py
index fda0fd3310f..65c89f1ee5b 100755
--- a/extras/snap_scheduler/snap_scheduler.py
+++ b/extras/snap_scheduler/snap_scheduler.py
@@ -373,6 +373,24 @@ def initialise_scheduler():
return ret
+def syntax_checker(args):
+ ret = False
+
+ if (len(args.jobname.split()) != 1):
+ output("Invalid Jobname. Jobname should not be empty and should not contain \" \" character.")
+ return ret
+
+ if (len(args.volname.split()) != 1):
+ output("Invalid Volname. Volname should not be empty and should not contain \" \" character.")
+ return ret
+
+ args.jobname=args.jobname.strip()
+ args.volname=args.volname.strip()
+
+ ret = True
+ return ret
+
+
def perform_operation(args):
ret = False
@@ -433,6 +451,9 @@ def perform_operation(args):
# Add snapshot schedules
if args.action == "add":
+ ret = syntax_checker(args)
+ if not ret:
+ return ret
ret = add_schedules(args.jobname, args.schedule, args.volname)
if not ret:
output("Failed to add snapshot schedule")
@@ -442,6 +463,9 @@ def perform_operation(args):
# Delete snapshot schedules
if args.action == "delete":
+ ret = syntax_checker(args)
+ if not ret:
+ return ret
ret = delete_schedules(args.jobname)
if not ret:
output("Failed to delete snapshot schedule")
@@ -451,6 +475,9 @@ def perform_operation(args):
# Edit snapshot schedules
if args.action == "edit":
+ ret = syntax_checker(args)
+ if not ret:
+ return ret
ret = edit_schedules(args.jobname, args.schedule, args.volname)
if not ret:
output("Failed to edit snapshot schedule")