Sanitize getParameterValues task before saving

This commit is contained in:
Zaid Abdulla committed 2013-03-26 09:36:35 +03:00
1 parent 0934831fa1
commit b470c3273c
1 file changed
+31 -6
+31 -6
View File
@@ -58,10 +58,36 @@ watchTask = (taskId, timeout, callback) ->
, 500)
sanitizeTask = (device, task) ->
task.device = device
expandParam = (param) ->
params = [param]
for a,aa of config.ALIASES
if a == param or common.startsWith(a, "#{param}.")
for p in aa
params.push(p) if p[p.lastIndexOf('.') + 1] != '_'
return params
sanitizeTask = (deviceId, task, callback) ->
task.device = deviceId
task.timestamp = new Date()
return task
switch task.name
when 'getParameterValues'
projection = {}
for p in task.parameterNames
for pp in expandParam(p)
projection[pp] = 1
db.devicesCollection.findOne({_id : deviceId}, projection, (err, device) ->
parameterNames = []
for k of projection
if common.getParamValueFromPath(device, k)?
parameterNames.push(k)
task.parameterNames = parameterNames
callback(task)
)
else
# TODO implement setParameterValues
callback(task)
addAliases = (device) ->
@@ -179,12 +205,10 @@ else
deviceId = querystring.unescape(DEVICE_TASKS_REGEX.exec(urlParts.pathname)[1])
if body
# queue given task
task = sanitizeTask(deviceId, JSON.parse(body))
sanitizeTask(deviceId, JSON.parse(body), (task) ->
if task.uniqueKey?
db.tasksCollection.remove({device : deviceId, uniqueKey : task.uniqueKey}, (err, removed) ->
)
db.tasksCollection.save(task, (err) ->
if err
response.writeHead(500)
@@ -210,6 +234,7 @@ else
response.writeHead(202)
response.end()
)
)
else if urlParts.query.connection_request?
# no task, send connection request only
connectionRequest(deviceId, (err) ->