retropilot
/
retropilot-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'florianbrede-ayet:main' into main

pull/4/head
Adam Black 2021-09-30 19:22:47 +01:00 committed by GitHub
parent bfc3f6806e 3ddd73ea45
commit 5ca26f7b19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/authentication.js
View File

@ -6,9 +6,9 @@ let logger;
async function validateJWT(token, key) {
try {
return jwt.verify(token.replace("JWT ", ""), key, {algorithms: ['RS256']});
return jwt.verify(token.replace("JWT ", ""), key, {algorithms: ['RS256'], ignoreNotBefore: true});
} catch (exception) {
//logger.warn(exception)
logger.warn(exception)
}
return null;
}

6
routes/api.js
View File

@ -357,7 +357,7 @@ router.post('/v2/pilotauth/', bodyParser.urlencoded({extended: true}), async (re
var public_key = req.query.public_key;
var register_token = req.query.register_token;
if (imei1 == null || imei1.length < 5 || serial == null || serial.length < 5 || public_key == null || public_key.length < 5 || register_token == null || register_token.length < 5) {
if (serial == null || serial.length < 5 || public_key == null || public_key.length < 5 || register_token == null || register_token.length < 5) {
logger.error(`HTTP.V2.PILOTAUTH a required parameter is missing or empty ${JSON.stringify(req.query)}`);
res.status(400);
res.send('Malformed Request.');
@ -373,12 +373,12 @@ router.post('/v2/pilotauth/', bodyParser.urlencoded({extended: true}), async (re
return;
}
const device = await models.__db.get('SELECT * FROM devices WHERE imei = ? AND serial = ?', imei1, serial);
const device = await models.__db.get('SELECT * FROM devices WHERE serial = ?', serial);
if (device == null) {
logger.info("HTTP.V2.PILOTAUTH REGISTERING NEW DEVICE (" + imei1 + ", " + serial + ")");
while (true) {
var dongleId = crypto.randomBytes(4).toString('hex');
const isDongleIdTaken = await models.__db.get('SELECT * FROM devices WHERE imei = ? AND serial = ?', imei1, serial);
const isDongleIdTaken = await models.__db.get('SELECT * FROM devices WHERE serial = ?', serial);
if (isDongleIdTaken == null) {
const resultingDevice = await models.__db.run(
'INSERT INTO devices (dongle_id, account_id, imei, serial, device_type, public_key, created, last_ping, storage_used) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',