lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add nil UUID to match new machine pairing logic

Browse source
This commit is contained in:
Sérgio Salgado 2021-10-05 14:46:21 +01:00
parent eb18440320
commit 16513a8238
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/new-admin/services/pairing.js
View file

@ -3,6 +3,7 @@ const pify = require('pify')
const readFile = pify(fs.readFile) const readFile = pify(fs.readFile)
const crypto = require('crypto') const crypto = require('crypto')
const baseX = require('base-x') const baseX = require('base-x')
const { NIL } = require('uuid')
const options = require('../../options') const options = require('../../options')
const db = require('../../db') const db = require('../../db')
@ -19,7 +20,7 @@ function totem (name) {
return readFile(caPath) return readFile(caPath)
.then(data => { .then(data => {
const caHash = crypto.createHash('sha256').update(data).digest() const caHash = crypto.createHash('sha256').update(data).digest()
const token = crypto.randomBytes(32) const token = Buffer.concat([crypto.randomBytes(32), NIL])
const hexToken = token.toString('hex') const hexToken = token.toString('hex')
const caHexToken = crypto.createHash('sha256').update(hexToken).digest('hex') const caHexToken = crypto.createHash('sha256').update(hexToken).digest('hex')
const buf = Buffer.concat([caHash, token, Buffer.from(options.hostname)]) const buf = Buffer.concat([caHash, token, Buffer.from(options.hostname)])

2
lib/routes.js
View file

@ -25,7 +25,7 @@ const phoneCodeRoutes = require('./routes/phoneCodeRoutes')
const pollingRoutes = require('./routes/pollingRoutes') const pollingRoutes = require('./routes/pollingRoutes')
const stateRoutes = require('./routes/stateRoutes') const stateRoutes = require('./routes/stateRoutes')
const termsAndConditionsRoutes = require('./routes/termsAndConditionsRoutes') const termsAndConditionsRoutes = require('./routes/termsAndConditionsRoutes')
const txRoutes = require('./routes/txRoutes') const { router: txRoutes } = require('./routes/txRoutes')
const verifyUserRoutes = require('./routes/verifyUserRoutes') const verifyUserRoutes = require('./routes/verifyUserRoutes')
const verifyTxRoutes = require('./routes/verifyTxRoutes') const verifyTxRoutes = require('./routes/verifyTxRoutes')
const verifyPromoCodeRoutes = require('./routes/verifyPromoCodeRoutes') const verifyPromoCodeRoutes = require('./routes/verifyPromoCodeRoutes')

2
lib/routes/txRoutes.js
View file

@ -66,4 +66,4 @@ router.post('/', postTx)
router.get('/:id', getTx) router.get('/:id', getTx)
router.get('/', getPhoneTx) router.get('/', getPhoneTx)
module.exports = router module.exports = { postTx, getTx, getPhoneTx, router }