From e8caa8c592395161ef3fa40fe41794520294f905 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:33:04 +0200 Subject: [PATCH 01/13] not used --- src/routes/api.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/routes/api.js b/src/routes/api.js index afa945e..0e5fa12 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -22,23 +22,6 @@ const ScheduleManager = require('../models/schedule-manager.js'); const logger = require('../services/logger.js'); const utils = require('../services/utils.js'); -router.use(async (req, res, next) => { - if (req.path === '/api/login' || req.path === '/login' || - req.path === '/api/register' || req.path === '/register' || - req.path === '/config' || req.path === '/log/new') { - return next(); - } - if (!await Migrator.getValueForKey('SETUP')) { - res.redirect('/register'); - return; - } - if (req.session.loggedin) { - next(); - return; - } - res.redirect('/login'); -}); - router.post('/register', async (req, res) => { const isSetup = await Migrator.getValueForKey('SETUP'); if (isSetup) { From 7bd4e9b1532e23f7ba6de0281db11b2128c5cc2b Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:34:08 +0200 Subject: [PATCH 02/13] Add download --- src/routes/api.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/routes/api.js b/src/routes/api.js index 0e5fa12..56b79c0 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -387,6 +387,15 @@ router.get('/configs', async (req, res) => { } }); +router.post('/download/:file', AuthTokenMiddleware, async (req, res) => { + const { uuid } = req.body; + const clientip = ((req.headers['x-forwarded-for'] || '').split(', ')[0]) || (req.connection.remoteAddress || req.connection.localAddress).match('[0-9]+.[0-9].+[0-9]+.[0-9]+$')[0]; + var filePath = 'downloads/' + req.params.file; + var fileName = req.params.file; + logger('dcm').info(`Client ${uuid} at ${clientip} is requesting ` + req.params.file); + res.download(filePath, fileName); +}); + router.post('/config', AuthTokenMiddleware, async (req, res) => { const { uuid, ios_version, ipa_version, model, webserver_port } = req.body; let device = await Device.getByName(uuid); From 051b152daa3de779696c36c0b759fff524efc827 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:35:12 +0200 Subject: [PATCH 03/13] Add api/download to login middleware --- src/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index e998caf..726490e 100644 --- a/src/index.js +++ b/src/index.js @@ -110,6 +110,7 @@ const run = async () => { app.use(async (req, res, next) => { if (req.path === '/api/login' || req.path === '/login' || req.path === '/api/register' || req.path === '/register' || + req.path.includes('/api/download') || req.path === '/api/config' || req.path == '/api/log/new') { return next(); } @@ -159,4 +160,4 @@ run().then(x => { console.log('Initialized'); }).catch(err => { console.error('Error:', err); -}); \ No newline at end of file +}); From 1fe8bf38e4f93492422b40daf7782390a61b310b Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:36:39 +0200 Subject: [PATCH 04/13] Create .gitkeep --- static/files/.gitkeep | 1 + 1 file changed, 1 insertion(+) create mode 100644 static/files/.gitkeep diff --git a/static/files/.gitkeep b/static/files/.gitkeep new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/static/files/.gitkeep @@ -0,0 +1 @@ + From 5484e7f089053469df8700718e4a56cd88e13469 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:37:34 +0200 Subject: [PATCH 05/13] ignore files --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f2d8947..52f3c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -116,4 +116,7 @@ screenshots schedules.json # No docker-compose.yml -docker-compose.yml \ No newline at end of file +docker-compose.yml + +# No files +static/files/* From 2148a61be830d3d4d3e4c2dff5f10fdefe81ce4c Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:38:23 +0200 Subject: [PATCH 06/13] Update download function --- src/routes/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/api.js b/src/routes/api.js index 56b79c0..b9ef062 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -390,7 +390,7 @@ router.get('/configs', async (req, res) => { router.post('/download/:file', AuthTokenMiddleware, async (req, res) => { const { uuid } = req.body; const clientip = ((req.headers['x-forwarded-for'] || '').split(', ')[0]) || (req.connection.remoteAddress || req.connection.localAddress).match('[0-9]+.[0-9].+[0-9]+.[0-9]+$')[0]; - var filePath = 'downloads/' + req.params.file; + var filePath = 'static/file/' + req.params.file; var fileName = req.params.file; logger('dcm').info(`Client ${uuid} at ${clientip} is requesting ` + req.params.file); res.download(filePath, fileName); From 37f1a1029eec0bf7e3205e08217c7b3546f46775 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:49:04 +0200 Subject: [PATCH 07/13] typo --- src/routes/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/api.js b/src/routes/api.js index b9ef062..b556fda 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -390,7 +390,7 @@ router.get('/configs', async (req, res) => { router.post('/download/:file', AuthTokenMiddleware, async (req, res) => { const { uuid } = req.body; const clientip = ((req.headers['x-forwarded-for'] || '').split(', ')[0]) || (req.connection.remoteAddress || req.connection.localAddress).match('[0-9]+.[0-9].+[0-9]+.[0-9]+$')[0]; - var filePath = 'static/file/' + req.params.file; + var filePath = 'static/files/' + req.params.file; var fileName = req.params.file; logger('dcm').info(`Client ${uuid} at ${clientip} is requesting ` + req.params.file); res.download(filePath, fileName); From d378a200d51ca74a2ce09927d40a35b6507f05d9 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:51:28 +0200 Subject: [PATCH 08/13] Update settings.mustache --- src/views/settings.mustache | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/views/settings.mustache b/src/views/settings.mustache index a0023aa..b7f0638 100644 --- a/src/views/settings.mustache +++ b/src/views/settings.mustache @@ -19,6 +19,9 @@
  • {{Logging}}
    • +
  • + {{Jailbreak}} +
    • @@ -158,6 +161,25 @@
    + +
    +
    +
    {{Jailbreak}}
    +
    +
    +
    + {{Pokémon GO version}} + +
    +
    + {{GoCheats version}} + +
    +
    +
    +
    +
    +
    From f7e9df30c3242bbc82f675a3806fba6431cd965a Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:53:10 +0200 Subject: [PATCH 09/13] Add jailbreak variables --- src/routes/api.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/routes/api.js b/src/routes/api.js index b556fda..012b669 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -128,6 +128,10 @@ router.post('/settings/change', (req, res) => { database: data.database, charset: data.charset }; + newConfig.jailbreak = { + pogo_version: data.pogo_version, + gc_version: data.gc_version + }; fs.writeFileSync(path.resolve(__dirname, '../config.json'), JSON.stringify(newConfig, null, 4)); res.redirect('/settings'); }); From 05e0a4406ffd4573de8a489184624dbcd297e3d0 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:53:45 +0200 Subject: [PATCH 10/13] Update config.example.json --- src/config.example.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/config.example.json b/src/config.example.json index 3445070..cae50aa 100644 --- a/src/config.example.json +++ b/src/config.example.json @@ -30,5 +30,9 @@ "database": "dcm", "charset": "utf8mb4" }, + "jailbreak": { + "pogo_version": "0", + "gc_version": "0" + } "autoSyncIP": true -} \ No newline at end of file +} From 5f1fee8b8286cff81ec61aef34cbbb98e189b7c9 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:55:08 +0200 Subject: [PATCH 11/13] Update ui.js --- src/routes/ui.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/routes/ui.js b/src/routes/ui.js index 353e67a..f7389fa 100644 --- a/src/routes/ui.js +++ b/src/routes/ui.js @@ -298,6 +298,8 @@ router.get('/settings', (req, res) => { data.logging = config.logging.enabled ? 'checked' : ''; data.max_size = config.logging.max_size; data.log_format = config.logging.format || 'YYYY-MM-DD hh:mm:ss A'; + data.gc_version = config.jailbreak.gc_version; + data.pogo_version = config.jailbreak.pogo_version; res.render('settings', data); }); From d16d6ee62003cfbaf91298a0aa9b6361e615fae9 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:56:44 +0200 Subject: [PATCH 12/13] Update api.js --- src/routes/api.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/routes/api.js b/src/routes/api.js index 012b669..b4d0919 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -400,6 +400,14 @@ router.post('/download/:file', AuthTokenMiddleware, async (req, res) => { res.download(filePath, fileName); }); +router.get('/version.txt', AuthTokenMiddleware, async (req, res) => { + const clientip = ((req.headers['x-forwarded-for'] || '').split(', ')[0]) || (req.connection.remoteAddress || req.connection.localAddress).match('[0-9]+.[0-9].+[0-9]+.[0-9]+$')[0]; + // TODO: Do better + res.status(200) + .attachment(`version.txt`) + .send('gc: '+ config.jailbreak.gc_version +'\npogo: ' + config.jailbreak.pogo_version) +}); + router.post('/config', AuthTokenMiddleware, async (req, res) => { const { uuid, ios_version, ipa_version, model, webserver_port } = req.body; let device = await Device.getByName(uuid); From e2b7b522ce772a508c198076b403f54ee0635318 Mon Sep 17 00:00:00 2001 From: LordJavi <20624591+LordJavi@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:57:16 +0200 Subject: [PATCH 13/13] Update index.js --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 726490e..dd94479 100644 --- a/src/index.js +++ b/src/index.js @@ -110,7 +110,7 @@ const run = async () => { app.use(async (req, res, next) => { if (req.path === '/api/login' || req.path === '/login' || req.path === '/api/register' || req.path === '/register' || - req.path.includes('/api/download') || + req.path.includes('/api/download') || req.path === '/api/version.txt' || req.path === '/api/config' || req.path == '/api/log/new') { return next(); }