🐛 Better validation of tool parameter on /api/printer/tool

Fixes #3092
OctoPrint · Mar 28, 2019 · df6e94f · df6e94f
1 parent 1a2739c
commit df6e94f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/octoprint/server/api/printer.py b/src/octoprint/server/api/printer.py
@@ -86,7 +86,7 @@ def printerToolCommand():
 	##~~ tool selection
 	if command == "select":
 		tool = data["tool"]
-		if re.match(validation_regex, tool) is None:
+		if not isinstance(tool, basestring) or re.match(validation_regex, tool) is None:
 			return make_response("Invalid tool: %s" % tool, 400)
 		if not tool.startswith("tool"):
 			return make_response("Invalid tool for selection: %s" % tool, 400)