Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2024-11-06 00:10:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

crypto: use secret directly instead of deriving key

Browse source
This commit is contained in:
dumbmoron 2024-03-05 16:49:00 +00:00
parent fc39ac76b6
commit 7fab5a37ff
No known key found for this signature in database
GPG key ID: C59997C76C6A8E5F
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/api.js
View file

@ -128,7 +128,7 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
const q = req.query; const q = req.query;
const checkQueries = q.t && q.e && q.h && q.s && q.i; const checkQueries = q.t && q.e && q.h && q.s && q.i;
const checkBaseLength = q.t.length === 21 && q.e.length === 13; const checkBaseLength = q.t.length === 21 && q.e.length === 13;
const checkSafeLength = q.h.length === 43 && q.s.length === 342 && q.i.length === 22; const checkSafeLength = q.h.length === 43 && q.s.length === 43 && q.i.length === 22;
if (checkQueries && checkBaseLength && checkSafeLength) { if (checkQueries && checkBaseLength && checkSafeLength) {
let streamInfo = verifyStream(q.t, q.h, q.e, q.s, q.i); let streamInfo = verifyStream(q.t, q.h, q.e, q.s, q.i);

2
src/modules/stream/manage.js
View file

@ -20,7 +20,7 @@ const hmacSalt = randomBytes(64).toString('hex');
export function createStream(obj) { export function createStream(obj) {
const streamID = nanoid(), const streamID = nanoid(),
iv = randomBytes(16).toString('base64url'), iv = randomBytes(16).toString('base64url'),
secret = randomBytes(256).toString('base64url'), secret = randomBytes(32).toString('base64url'),
exp = new Date().getTime() + streamLifespan, exp = new Date().getTime() + streamLifespan,
hmac = generateHmac(`${streamID},${exp},${iv},${secret}`, hmacSalt), hmac = generateHmac(`${streamID},${exp},${iv},${secret}`, hmacSalt),
streamData = { streamData = {

11
src/modules/sub/crypto.js
View file

@ -1,25 +1,22 @@
import { createHmac, createCipheriv, createDecipheriv, scryptSync } from "crypto"; import { createHmac, createCipheriv, createDecipheriv, scryptSync } from "crypto";
const algorithm = "aes256" const algorithm = "aes256"
const keyLength = 32;
export function generateHmac(str, salt) { export function generateHmac(str, salt) {
return createHmac("sha256", salt).update(str).digest("base64url"); return createHmac("sha256", salt).update(str).digest("base64url");
} }
export function encryptStream(plaintext, iv, secret) { export function encryptStream(plaintext, iv, secret) {
const buff = Buffer.from(JSON.stringify(plaintext), "utf-8"); const buff = Buffer.from(JSON.stringify(plaintext));
const key = Buffer.from(secret, "base64url");
const key = scryptSync(Buffer.from(secret, "base64url"), "salt", keyLength);
const cipher = createCipheriv(algorithm, key, Buffer.from(iv, "base64url")); const cipher = createCipheriv(algorithm, key, Buffer.from(iv, "base64url"));
return Buffer.concat([ cipher.update(buff), cipher.final() ]) return Buffer.concat([ cipher.update(buff), cipher.final() ])
} }
export function decryptStream(ciphertext, iv, secret) { export function decryptStream(ciphertext, iv, secret) {
const buff = Buffer.from(ciphertext, "binary"); const buff = Buffer.from(ciphertext);
const key = Buffer.from(secret, "base64url");
const key = scryptSync(Buffer.from(secret, "base64url"), "salt", keyLength);
const decipher = createDecipheriv(algorithm, key, Buffer.from(iv, "base64url")); const decipher = createDecipheriv(algorithm, key, Buffer.from(iv, "base64url"));
return Buffer.concat([ decipher.update(buff), decipher.final() ]) return Buffer.concat([ decipher.update(buff), decipher.final() ])