Merge pull request #73 from sschneid/vm_tagging

Catch improperly-formatted data payloads
This commit is contained in:
Colin 2015-03-20 13:06:53 -07:00
commit 5a7b3c45de

View file

@ -504,7 +504,12 @@ module Vmpooler
params[:hostname] = hostname_shorten(params[:hostname]) params[:hostname] = hostname_shorten(params[:hostname])
if $redis.exists('vmpooler__vm__' + params[:hostname]) if $redis.exists('vmpooler__vm__' + params[:hostname])
jdata = JSON.parse(request.body.read) begin
jdata = JSON.parse(request.body.read)
rescue
status 400
return JSON.pretty_generate(result)
end
# Validate data payload # Validate data payload
jdata.each do |param, arg| jdata.each do |param, arg|