From c9258a08ae25880b99406c13aceac9fbce9d0033 Mon Sep 17 00:00:00 2001 From: Karl Hudgell Date: Tue, 13 Jun 2023 18:11:53 +0100 Subject: [PATCH 1/5] working commit with local code --- src/widgets/jdownloader/proxy.js | 138 ++++++++++++++++++++++++++++-- src/widgets/jdownloader/tools.js | 55 ++++++++++++ src/widgets/jdownloader/widget.js | 3 +- 3 files changed, 188 insertions(+), 8 deletions(-) create mode 100644 src/widgets/jdownloader/tools.js diff --git a/src/widgets/jdownloader/proxy.js b/src/widgets/jdownloader/proxy.js index 6410633c..cecf3af8 100644 --- a/src/widgets/jdownloader/proxy.js +++ b/src/widgets/jdownloader/proxy.js @@ -1,8 +1,10 @@ /* eslint-disable no-underscore-dangle */ +import crypto from 'crypto'; +import querystring from 'querystring'; import getServiceWidget from "utils/config/service-helpers"; +import { httpProxy } from "utils/proxy/http"; import createLogger from "utils/logger"; - -const { JDownloaderClient } = require('jdownloader-client') +import { sha256, uniqueRid, validateRid, createEncryptionToken, decrypt, encrypt } from "./tools" const proxyName = "jdownloaderProxyHandler"; const logger = createLogger(proxyName); @@ -22,6 +24,113 @@ async function getWidget(req) { return widget; } +async function login(loginSecret, deviceSecret, params) { + const rid = uniqueRid(); + const path = '/my/connect' + + '?' + + querystring.stringify(Object.assign({}, params, { rid })); + const signature = crypto + .createHmac('sha256', loginSecret) + .update(path) + .digest('hex'); + const url = `${new URL(`https://api.jdownloader.org${path}&signature=${signature}`)}` + + const [status, contentType, data] = await httpProxy(url, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + }); + + if (status !== 200) { + logger.error("HTTP %d communicating with jdownloader. Data: %s", status, data.toString()); + return [status, data]; + } + + try { + const decryptedData = JSON.parse(decrypt(data.toString(), loginSecret)) + const sessionToken = decryptedData.sessiontoken; + validateRid(decryptedData, rid); + const serverEncryptionToken = createEncryptionToken(loginSecret, sessionToken); + const deviceEncryptionToken = createEncryptionToken(deviceSecret, sessionToken); + return [status, decryptedData, contentType, serverEncryptionToken, deviceEncryptionToken, sessionToken]; + } catch (e) { + logger.error("Error decoding jdownloader API data. Data: %s", data.toString()); + return [status, null]; + } +} + + +async function getDevice(serverEncryptionToken, deviceName, params) { + const rid = uniqueRid(); + const path = '/my/listdevices' + + '?' + + querystring.stringify(Object.assign({}, params, { rid })); + const signature = crypto + .createHmac('sha256', serverEncryptionToken) + .update(path) + .digest('hex'); + const url = `${new URL(`https://api.jdownloader.org${path}&signature=${signature}`)}` + + const [status, contentType, data] = await httpProxy(url, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + }); + + if (status !== 200) { + logger.error("HTTP %d communicating with jdownloader. Data: %s", status, data.toString()); + return [status, data]; + } + + try { + const decryptedData = JSON.parse(decrypt(data.toString(), serverEncryptionToken)) + const filteredDevice = decryptedData.list.filter(function (device) { + return device.name == deviceName; + }); + return [status, filteredDevice[0].id]; + } catch (e) { + logger.error("Error decoding jdownloader API data. Data: %s", data.toString()); + return [status, None]; + } + +} + +function createBody(rid, query, params) { + const baseBody = { + apiVer: 1, + rid, + url: query + }; + return params ? Object.assign({}, baseBody, { params: [JSON.stringify(params)] }) : baseBody; +} + +async function queryPackages(deviceEncryptionToken, deviceId, sessionToken, params) { + const rid = uniqueRid(); + const body = encrypt(JSON.stringify(createBody(rid, '/downloadsV2/queryPackages', params)), deviceEncryptionToken); + const url = `${new URL('https://api.jdownloader.org/t_' + encodeURI(sessionToken) + '_' + encodeURI(deviceId) + '/downloadsV2/queryPackages')}` + const [status, contentType, data] = await httpProxy(url, { + method: 'POST', + body, + }); + + if (status !== 200) { + logger.error("HTTP %d communicating with jdownloader. Data: %s", status, data.toString()); + return [status, data]; + } + + try { + const decryptedData = JSON.parse(decrypt(data.toString(), deviceEncryptionToken)) + return decryptedData.data; + } catch (e) { + logger.error("Error decoding JDRss jdownloader data. Data: %s", data.toString()); + return [status, None]; + } + +} + + export default async function jdownloaderProxyHandler(req, res) { const widget = await getWidget(req); @@ -29,10 +138,23 @@ export default async function jdownloaderProxyHandler(req, res) { return res.status(400).json({ error: "Invalid proxy service type" }); } logger.debug("Getting data from JDRss API"); - const client = new JDownloaderClient(widget.username, widget.password) - await client.connect() - const devices = await client.listDevices() - const packageStatus = await client.downloadsQueryPackages(devices[0].id, { + const username = widget.username + const password = widget.password + const appKey = "homepage" + const loginSecret = sha256(username + password + 'server') + const deviceSecret = sha256(username + password + 'device') + const email = username; + + const loginData = await login(loginSecret, deviceSecret, { + appKey, + email + }) + + const deviceData = await getDevice(loginData[3], widget.client, { + sessiontoken: loginData[5] + }) + + const packageStatus = await queryPackages(loginData[4], deviceData[1], loginData[5], { "bytesLoaded": false, "bytesTotal": true, "comment": false, @@ -48,7 +170,9 @@ export default async function jdownloaderProxyHandler(req, res) { "saveTo": false, "maxResults": -1, "startAt": 0, - }) + } + ) + let totalBytes = 0; let totalSpeed = 0; packageStatus.forEach(file => { diff --git a/src/widgets/jdownloader/tools.js b/src/widgets/jdownloader/tools.js new file mode 100644 index 00000000..08bcdf1a --- /dev/null +++ b/src/widgets/jdownloader/tools.js @@ -0,0 +1,55 @@ +import crypto from 'crypto'; + +export function sha256(data) { + return crypto + .createHash('sha256') + .update(data) + .digest(); +} + +export function uniqueRid() { + return Math.floor(Math.random() * 10e12); +} + +export function validateRid(decryptedData, rid) { + if (decryptedData.rid !== rid) { + throw new Error('RequestID mismatch'); + } + return decryptedData; + +} + +export function decrypt(data, ivKey) { + const iv = ivKey.slice(0, ivKey.length / 2); + const key = ivKey.slice(ivKey.length / 2, ivKey.length); + const cipher = crypto.createDecipheriv('aes-128-cbc', key, iv); + return Buffer.concat([ + cipher.update(data, 'base64'), + cipher.final() + ]).toString(); +} + +export function createEncryptionToken(oldTokenBuff, updateToken) { + const updateTokenBuff = Buffer.from(updateToken, 'hex'); + const mergedBuffer = Buffer.concat([oldTokenBuff, updateTokenBuff], oldTokenBuff.length + updateTokenBuff.length); + return sha256(mergedBuffer); +} + +export function encrypt(data, ivKey) { + if (typeof data !== 'string') { + throw new Error('data no es un string'); + } + if (!(ivKey instanceof Buffer)) { + throw new Error('ivKey no es un buffer'); + } + if (ivKey.length !== 32) { + throw new Error('ivKey tiene que tener tamaño 32'); + } + const stringIVKey = ivKey.toString('hex'); + const stringIV = stringIVKey.substring(0, stringIVKey.length / 2); + const stringKey = stringIVKey.substring(stringIVKey.length / 2, stringIVKey.length); + const iv = new Buffer(stringIV, 'hex'); + const key = new Buffer(stringKey, 'hex'); + const cipher = crypto.createCipheriv('aes-128-cbc', key, iv); + return cipher.update(data, 'utf8', 'base64') + cipher.final('base64'); +} \ No newline at end of file diff --git a/src/widgets/jdownloader/widget.js b/src/widgets/jdownloader/widget.js index 2685b571..d3213740 100644 --- a/src/widgets/jdownloader/widget.js +++ b/src/widgets/jdownloader/widget.js @@ -1,12 +1,13 @@ import jdownloaderProxyHandler from "./proxy"; const widget = { - api: "{url}/api/{endpoint}", + api: "https://api.jdownloader.org/{endpoint}/&signature={signature}", proxyHandler: jdownloaderProxyHandler, mappings: { unified: { endpoint: "/", + signature: "", }, }, }; From 6a854ce66c25789697076490645fdb9de168196b Mon Sep 17 00:00:00 2001 From: Karl Hudgell Date: Tue, 13 Jun 2023 18:23:48 +0100 Subject: [PATCH 2/5] initial lint fixes --- src/widgets/jdownloader/proxy.js | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/widgets/jdownloader/proxy.js b/src/widgets/jdownloader/proxy.js index cecf3af8..445f1e2e 100644 --- a/src/widgets/jdownloader/proxy.js +++ b/src/widgets/jdownloader/proxy.js @@ -1,10 +1,12 @@ /* eslint-disable no-underscore-dangle */ import crypto from 'crypto'; import querystring from 'querystring'; +import { sha256, uniqueRid, validateRid, createEncryptionToken, decrypt, encrypt } from "./tools" + import getServiceWidget from "utils/config/service-helpers"; import { httpProxy } from "utils/proxy/http"; import createLogger from "utils/logger"; -import { sha256, uniqueRid, validateRid, createEncryptionToken, decrypt, encrypt } from "./tools" + const proxyName = "jdownloaderProxyHandler"; const logger = createLogger(proxyName); @@ -26,9 +28,7 @@ async function getWidget(req) { async function login(loginSecret, deviceSecret, params) { const rid = uniqueRid(); - const path = '/my/connect' + - '?' + - querystring.stringify(Object.assign({}, params, { rid })); + const path = `/my/connect?${querystring.stringify(Object.assign({}, params, { rid }))}`; const signature = crypto .createHmac('sha256', loginSecret) .update(path) @@ -63,16 +63,14 @@ async function login(loginSecret, deviceSecret, params) { async function getDevice(serverEncryptionToken, deviceName, params) { const rid = uniqueRid(); - const path = '/my/listdevices' + - '?' + - querystring.stringify(Object.assign({}, params, { rid })); + const path = `/my/listdevices?${querystring.stringify(Object.assign({}, params, { rid }))}`; const signature = crypto .createHmac('sha256', serverEncryptionToken) .update(path) .digest('hex'); const url = `${new URL(`https://api.jdownloader.org${path}&signature=${signature}`)}` - const [status, contentType, data] = await httpProxy(url, { + const [status, , data] = await httpProxy(url, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -86,13 +84,11 @@ async function getDevice(serverEncryptionToken, deviceName, params) { try { const decryptedData = JSON.parse(decrypt(data.toString(), serverEncryptionToken)) - const filteredDevice = decryptedData.list.filter(function (device) { - return device.name == deviceName; - }); + const filteredDevice = decryptedData.list.filter(device => device.name === deviceName); return [status, filteredDevice[0].id]; } catch (e) { logger.error("Error decoding jdownloader API data. Data: %s", data.toString()); - return [status, None]; + return [status, null]; } } @@ -109,8 +105,8 @@ function createBody(rid, query, params) { async function queryPackages(deviceEncryptionToken, deviceId, sessionToken, params) { const rid = uniqueRid(); const body = encrypt(JSON.stringify(createBody(rid, '/downloadsV2/queryPackages', params)), deviceEncryptionToken); - const url = `${new URL('https://api.jdownloader.org/t_' + encodeURI(sessionToken) + '_' + encodeURI(deviceId) + '/downloadsV2/queryPackages')}` - const [status, contentType, data] = await httpProxy(url, { + const url = `${new URL(`https://api.jdownloader.org/t_${encodeURI(sessionToken)}_${encodeURI(deviceId)}/downloadsV2/queryPackages`)}` + const [status, , data] = await httpProxy(url, { method: 'POST', body, }); @@ -125,7 +121,7 @@ async function queryPackages(deviceEncryptionToken, deviceId, sessionToken, para return decryptedData.data; } catch (e) { logger.error("Error decoding JDRss jdownloader data. Data: %s", data.toString()); - return [status, None]; + return [status, null]; } } @@ -141,8 +137,8 @@ export default async function jdownloaderProxyHandler(req, res) { const username = widget.username const password = widget.password const appKey = "homepage" - const loginSecret = sha256(username + password + 'server') - const deviceSecret = sha256(username + password + 'device') + const loginSecret = sha256(`${username}${password}server`) + const deviceSecret = sha256(`${username}${password}device`) const email = username; const loginData = await login(loginSecret, deviceSecret, { From c692eb700f280216069e32f7e28ad4155d64a4ac Mon Sep 17 00:00:00 2001 From: Karl Hudgell Date: Tue, 13 Jun 2023 19:41:37 +0100 Subject: [PATCH 3/5] more linting --- src/widgets/jdownloader/proxy.js | 5 +++-- src/widgets/jdownloader/tools.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/widgets/jdownloader/proxy.js b/src/widgets/jdownloader/proxy.js index 445f1e2e..40dba1ad 100644 --- a/src/widgets/jdownloader/proxy.js +++ b/src/widgets/jdownloader/proxy.js @@ -134,8 +134,9 @@ export default async function jdownloaderProxyHandler(req, res) { return res.status(400).json({ error: "Invalid proxy service type" }); } logger.debug("Getting data from JDRss API"); - const username = widget.username - const password = widget.password + const {username} = widget + const {password} = widget + const appKey = "homepage" const loginSecret = sha256(`${username}${password}server`) const deviceSecret = sha256(`${username}${password}device`) diff --git a/src/widgets/jdownloader/tools.js b/src/widgets/jdownloader/tools.js index 08bcdf1a..d678b072 100644 --- a/src/widgets/jdownloader/tools.js +++ b/src/widgets/jdownloader/tools.js @@ -48,8 +48,8 @@ export function encrypt(data, ivKey) { const stringIVKey = ivKey.toString('hex'); const stringIV = stringIVKey.substring(0, stringIVKey.length / 2); const stringKey = stringIVKey.substring(stringIVKey.length / 2, stringIVKey.length); - const iv = new Buffer(stringIV, 'hex'); - const key = new Buffer(stringKey, 'hex'); + const iv = Buffer.from(stringIV, 'hex'); + const key = Buffer.from(stringKey, 'hex'); const cipher = crypto.createCipheriv('aes-128-cbc', key, iv); return cipher.update(data, 'utf8', 'base64') + cipher.final('base64'); } \ No newline at end of file From 60dc38e6c4a4f63d6e227da6ae24e3a26327941c Mon Sep 17 00:00:00 2001 From: Karl Hudgell Date: Tue, 13 Jun 2023 20:01:25 +0100 Subject: [PATCH 4/5] finished linting --- src/widgets/jdownloader/proxy.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/widgets/jdownloader/proxy.js b/src/widgets/jdownloader/proxy.js index 40dba1ad..44eadcad 100644 --- a/src/widgets/jdownloader/proxy.js +++ b/src/widgets/jdownloader/proxy.js @@ -1,13 +1,13 @@ /* eslint-disable no-underscore-dangle */ import crypto from 'crypto'; import querystring from 'querystring'; + import { sha256, uniqueRid, validateRid, createEncryptionToken, decrypt, encrypt } from "./tools" import getServiceWidget from "utils/config/service-helpers"; import { httpProxy } from "utils/proxy/http"; import createLogger from "utils/logger"; - const proxyName = "jdownloaderProxyHandler"; const logger = createLogger(proxyName); @@ -28,7 +28,8 @@ async function getWidget(req) { async function login(loginSecret, deviceSecret, params) { const rid = uniqueRid(); - const path = `/my/connect?${querystring.stringify(Object.assign({}, params, { rid }))}`; + const path = `/my/connect?${querystring.stringify({...params, rid})}`; + const signature = crypto .createHmac('sha256', loginSecret) .update(path) @@ -63,7 +64,7 @@ async function login(loginSecret, deviceSecret, params) { async function getDevice(serverEncryptionToken, deviceName, params) { const rid = uniqueRid(); - const path = `/my/listdevices?${querystring.stringify(Object.assign({}, params, { rid }))}`; + const path = `/my/listdevices?${querystring.stringify({...params, rid})}`; const signature = crypto .createHmac('sha256', serverEncryptionToken) .update(path) @@ -99,7 +100,7 @@ function createBody(rid, query, params) { rid, url: query }; - return params ? Object.assign({}, baseBody, { params: [JSON.stringify(params)] }) : baseBody; + return params ? {...baseBody, params: [JSON.stringify(params)] } : baseBody; } async function queryPackages(deviceEncryptionToken, deviceId, sessionToken, params) { From 63e9287e0da29a85fa5b149edcdb254dcfcf759b Mon Sep 17 00:00:00 2001 From: Karl Hudgell Date: Tue, 13 Jun 2023 20:04:01 +0100 Subject: [PATCH 5/5] remove jdownloader-client --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index a08072df..5f486bf7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "next dev", + "dev": "next dev -p 8080", "build": "next build", "start": "next start", "lint": "next lint", @@ -17,7 +17,6 @@ "dockerode": "^3.3.4", "follow-redirects": "^1.15.2", "i18next": "^21.9.2", - "jdownloader-client": "^1.0.0", "js-yaml": "^4.1.0", "json-rpc-2.0": "^1.4.1", "memory-cache": "^0.2.0",