Leahnaya/miiverse-api
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/miiverse-api.git synced 2026-08-26 18:44:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

rolled back auth and post to pre-web state

Browse Source
This commit is contained in:
CaramelKat
2020-05-10 05:05:28 -05:00
committed by jay.poff@outlook.com
parent f480ab79a5
commit 9600c24e8e
2 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/services/miiverse-api/routes/post.js
View File

@@ -23,10 +23,8 @@ router.post('/', upload.none(), async function (req, res, next) {
appData = req.body.app_data.replace(/\0/g, "").trim();
}
let painting = "";
let painting_uri = "";
if (req.body.painting) {
painting = req.body.painting.replace(/\0/g, "").trim();
//painting_uri = util.data.processPainting(painting);
}
let screenshot = "";
if (req.body.screenshot) {
@@ -38,7 +36,6 @@ router.post('/', upload.none(), async function (req, res, next) {
body: req.body.body,
app_data: appData,
painting: painting,
painting_uri: painting_uri,
screenshot: screenshot,
url: req.body.url,
search_key: req.body.search_key,

99
src/util/authentication.js
View File

@@ -6,9 +6,6 @@ const xmlParser = require('xml2json');
const request = require("request");
const moment = require('moment');
const { USER } = require('../models/user');
const TGA = require('tga');
const pako = require('pako');
const PNG = require('pngjs').PNG;
let methods = {
processUser: function(pid) {
@@ -47,6 +44,7 @@ let methods = {
});
});
},
decodeParamPack: function (paramPack) {
/* Decode base64 */
let dec = Buffer.from(paramPack, "base64").toString("ascii");
@@ -66,61 +64,62 @@ let methods = {
return PID;
},
decryptToken: function(token) {
// Access and refresh tokens use a different format since they must be much smaller
// Assume a small length means access or refresh token
if (token.length <= 32) {
// Access and refresh tokens use a different format since they must be much smaller
// Assume a small length means access or refresh token
if (token.length <= 32) {
const cryptoPath = `${__dirname}/../certs/access`;
const aesKey = Buffer.from(fs.readFileSync(`${cryptoPath}/aes.key`, { encoding: 'utf8' }), 'hex');
const iv = Buffer.alloc(16);
const decipher = crypto.createDecipheriv('aes-128-cbc', aesKey, iv);
let decryptedBody = decipher.update(token);
decryptedBody = Buffer.concat([decryptedBody, decipher.final()]);
return decryptedBody;
}
const cryptoPath = `${__dirname}/../certs/access`;
const aesKey = Buffer.from(fs.readFileSync(`${cryptoPath}/aes.key`, { encoding: 'utf8' }), 'hex');
const iv = Buffer.alloc(16);
const cryptoOptions = {
private_key: fs.readFileSync(`${cryptoPath}/private.pem`),
hmac_secret: fs.readFileSync(`${cryptoPath}/secret.key`)
};
const decipher = crypto.createDecipheriv('aes-128-cbc', aesKey, iv);
const privateKey = new NodeRSA(cryptoOptions.private_key, 'pkcs1-private-pem', {
environment: 'browser',
encryptionScheme: {
'hash': 'sha256',
}
});
let decryptedBody = decipher.update(token);
const cryptoConfig = token.subarray(0, 0x90);
const signature = token.subarray(0x90, 0xA4);
const encryptedBody = token.subarray(0xA4);
const encryptedAESKey = cryptoConfig.subarray(0, 128);
const iv = cryptoConfig.subarray(128);
const decryptedAESKey = privateKey.decrypt(encryptedAESKey);
const decipher = crypto.createDecipheriv('aes-128-cbc', decryptedAESKey, iv);
let decryptedBody = decipher.update(encryptedBody);
decryptedBody = Buffer.concat([decryptedBody, decipher.final()]);
const hmac = crypto.createHmac('sha1', cryptoOptions.hmac_secret).update(decryptedBody);
const calculatedSignature = hmac.digest();
if (!calculatedSignature.equals(signature)) {
console.log('Token signature did not match');
return null;
}
return decryptedBody;
}
const cryptoPath = `${__dirname}/../certs/access`;
const cryptoOptions = {
private_key: fs.readFileSync(`${cryptoPath}/private.pem`),
hmac_secret: fs.readFileSync(`${cryptoPath}/secret.key`)
};
const privateKey = new NodeRSA(cryptoOptions.private_key, 'pkcs1-private-pem', {
environment: 'browser',
encryptionScheme: {
'hash': 'sha256',
}
});
const cryptoConfig = token.subarray(0, 0x90);
const signature = token.subarray(0x90, 0xA4);
const encryptedBody = token.subarray(0xA4);
const encryptedAESKey = cryptoConfig.subarray(0, 128);
const iv = cryptoConfig.subarray(128);
const decryptedAESKey = privateKey.decrypt(encryptedAESKey);
const decipher = crypto.createDecipheriv('aes-128-cbc', decryptedAESKey, iv);
let decryptedBody = decipher.update(encryptedBody);
decryptedBody = Buffer.concat([decryptedBody, decipher.final()]);
const hmac = crypto.createHmac('sha1', cryptoOptions.hmac_secret).update(decryptedBody);
const calculatedSignature = hmac.digest();
if (!calculatedSignature.equals(signature)) {
console.log('Token signature did not match');
return null;
}
return decryptedBody;
},
};
exports.data = methods;
exports.data = methods;