mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-18 04:53:19 +02:00
Upgrading STF for security reasons (#813)
* Upgrading STF for security reasons Signed-off-by: Denis barbaron <denis.barbaron@orange.com> * update semaphore files Signed-off-by: Denis barbaron <denis.barbaron@orange.com> * upgrading STF for security reasons v2 Signed-off-by: Denis barbaron <denis.barbaron@orange.com> * update yarn.lock file Signed-off-by: Denis barbaron <denis.barbaron@orange.com> --------- Signed-off-by: Denis barbaron <denis.barbaron@orange.com>
This commit is contained in:
@@ -14,6 +14,7 @@ const uuid = require('uuid')
|
||||
const apiutil = require('../util/apiutil')
|
||||
const Promise = require('bluebird')
|
||||
const _ = require('lodash')
|
||||
const timeutil = require('../util/timeutil')
|
||||
|
||||
dbapi.DuplicateSecondaryIndexError = function DuplicateSecondaryIndexError() {
|
||||
Error.call(this)
|
||||
@@ -1174,6 +1175,7 @@ dbapi.saveDeviceInitialState = function(serial, device) {
|
||||
, owner: null
|
||||
, status: device.status
|
||||
, statusChangedAt: r.now()
|
||||
, statusTimeStamp: timeutil.now('nano')
|
||||
, ready: false
|
||||
, reverseForwards: []
|
||||
, remoteConnect: false
|
||||
@@ -1223,10 +1225,26 @@ dbapi.unsetDeviceConnectUrl = function(serial) {
|
||||
}))
|
||||
}
|
||||
|
||||
dbapi.saveDeviceStatus = function(serial, status) {
|
||||
dbapi.saveDeviceStatus = function(serial, status, statusTimeStamp) {
|
||||
return db.run(r.table('devices').get(serial).update({
|
||||
status: status
|
||||
, statusChangedAt: r.now()
|
||||
status:
|
||||
r.branch(
|
||||
r.expr(statusTimeStamp).gt(r.row('statusTimeStamp'))
|
||||
, status
|
||||
, r.row('status')
|
||||
)
|
||||
, statusChangedAt:
|
||||
r.branch(
|
||||
r.expr(statusTimeStamp).gt(r.row('statusTimeStamp'))
|
||||
, r.now()
|
||||
, r.row('statusChangedAt')
|
||||
)
|
||||
, statusTimeStamp:
|
||||
r.branch(
|
||||
r.expr(statusTimeStamp).gt(r.row('statusTimeStamp'))
|
||||
, statusTimeStamp
|
||||
, r.row('statusTimeStamp')
|
||||
)
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user