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:
Denis Barbaron
2024-11-22 11:41:20 +01:00
committed by GitHub
parent e204b03661
commit 2f54e40206
48 changed files with 2443 additions and 1167 deletions

View File

@@ -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')
)
}))
}